Skip to content

Commit

Permalink
update versions dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas-Bagnolati committed Jul 12, 2024
1 parent e6a8743 commit abf73f3
Show file tree
Hide file tree
Showing 36 changed files with 323 additions and 325 deletions.
Empty file.
25 changes: 14 additions & 11 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
@file:Suppress("UnstableApiUsage")

import com.bagnolati.learnoflegends.ProjectBuildType
import com.bagnolati.learnoflegends.LolBuildType

plugins {
alias(libs.plugins.learnoflegends.android.application)
alias(libs.plugins.learnoflegends.android.applicationCompose)
alias(libs.plugins.learnoflegends.android.application.compose)
alias(libs.plugins.learnoflegends.android.hilt)
}

Expand All @@ -23,11 +21,11 @@ android {

buildTypes {
debug {
applicationIdSuffix = ProjectBuildType.DEBUG.applicationIdSuffix
applicationIdSuffix = LolBuildType.DEBUG.applicationIdSuffix
signingConfig = signingConfigs.getByName("debug")
}
release {
applicationIdSuffix = ProjectBuildType.RELEASE.applicationIdSuffix
applicationIdSuffix = LolBuildType.RELEASE.applicationIdSuffix
isMinifyEnabled = true
isShrinkResources = true
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
Expand Down Expand Up @@ -57,15 +55,20 @@ dependencies {
implementation(projects.core.ui)

implementation(libs.androidx.activity.compose)
implementation(libs.androidx.appcompat)
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.core.splashscreen)
implementation(libs.androidx.compose.runtime)
implementation(libs.androidx.lifecycle.runtimeCompose)
implementation(libs.androidx.compose.material3.windowSizeClass)
implementation(libs.androidx.hilt.navigation.compose)
implementation(libs.androidx.navigation.compose)
implementation(libs.androidx.window.manager)
implementation(libs.androidx.profileinstaller)
implementation(libs.kotlinx.coroutines.guava)
implementation(libs.coil.kt)

}
ksp(libs.hilt.compiler)

debugImplementation(libs.androidx.compose.ui.testManifest)
}

dependencyGuard {
configuration("prodReleaseRuntimeClasspath")
}
15 changes: 10 additions & 5 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
-dontwarn org.bouncycastle.jsse.BCSSLParameters
-dontwarn org.bouncycastle.jsse.BCSSLSocket
-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
-dontwarn org.conscrypt.Conscrypt$Version
-dontwarn org.conscrypt.Conscrypt
-dontwarn org.conscrypt.ConscryptHostnameVerifier
-dontwarn org.openjsse.javax.net.ssl.SSLParameters
-dontwarn org.openjsse.javax.net.ssl.SSLSocket
-dontwarn org.openjsse.net.ssl.OpenJSSE

# Fix for Retrofit issue https://github.com/square/retrofit/issues/3751
# Keep generic signature of Call, Response (R8 full mode strips signatures from non-kept items).
-keep,allowobfuscation,allowshrinking interface retrofit2.Call
Expand All @@ -7,8 +17,3 @@
# kept. Suspend functions are wrapped in continuations where the type argument
# is used.
-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation

# Keep network models.
-keep class com.bagnolati.learnoflegends.core.network.model.*
# Keep serializers class.
-keep class com.bagnolati.learnoflegends.core.network.serializer.*
51 changes: 27 additions & 24 deletions build-logic/convention/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
Expand All @@ -12,56 +13,58 @@ java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()

kotlin {
compilerOptions {
jvmTarget = JvmTarget.JVM_17
}
}


dependencies {
compileOnly(libs.android.gradlePlugin)
compileOnly(libs.android.tools.common)
compileOnly(libs.compose.gradlePlugin)
compileOnly(libs.kotlin.gradlePlugin)
compileOnly(libs.ksp.gradlePlugin)
compileOnly(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
}

tasks {
validatePlugins {
enableStricterValidation = true
failOnWarning = true
}
}

gradlePlugin {
plugins {

register("androidApplication") {
id = libs.plugins.learnoflegends.android.application.get().pluginId
implementationClass = "AndroidApplicationConventionPlugin"
}

register("androidApplicationCompose") {
id = libs.plugins.learnoflegends.android.applicationCompose.get().pluginId
id = "learnoflegends.android.application.compose"
implementationClass = "AndroidApplicationComposeConventionPlugin"
}

register("androidLibrary") {
id = libs.plugins.learnoflegends.android.library.get().pluginId
implementationClass = "AndroidLibraryConventionPlugin"
register("androidApplication") {
id = "learnoflegends.android.application"
implementationClass = "AndroidApplicationConventionPlugin"
}

register("androidLibraryCompose") {
id = libs.plugins.learnoflegends.android.libraryCompose.get().pluginId
id = "learnoflegends.android.library.compose"
implementationClass = "AndroidLibraryComposeConventionPlugin"
}

register("androidLibrary") {
id = "learnoflegends.android.library"
implementationClass = "AndroidLibraryConventionPlugin"
}
register("androidFeature") {
id = libs.plugins.learnoflegends.android.feature.get().pluginId
id = "learnoflegends.android.feature"
implementationClass = "AndroidFeatureConventionPlugin"
}

register("androidHilt") {
id = libs.plugins.learnoflegends.android.hilt.get().pluginId
id = "learnoflegends.android.hilt"
implementationClass = "AndroidHiltConventionPlugin"
}

register("jvmLibrary") {
id = libs.plugins.learnoflegends.jvm.library.get().pluginId
id = "learnoflegends.jvm.library"
implementationClass = "JvmLibraryConventionPlugin"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import com.android.build.api.dsl.ApplicationExtension
import com.bagnolati.learnoflegends.configureAndroidCompose
import dsl.applyPlugin
import dsl.libs
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.getByType

@Suppress("unused")
class AndroidApplicationComposeConventionPlugin : Plugin<Project> {
override fun apply(target: Project) {
with(target) {
pluginManager.applyPlugin(libs.plugins.android.application)
apply(plugin = "com.android.application")
apply(plugin = "org.jetbrains.kotlin.plugin.compose")

val extension = extensions.getByType<ApplicationExtension>()
configureAndroidCompose(extension)
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,26 +1,22 @@
import com.android.build.api.dsl.ApplicationExtension
import com.bagnolati.learnoflegends.configureKotlinAndroid
import dsl.applyPlugin
import dsl.libs
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.configure

@Suppress("unused")
class AndroidApplicationConventionPlugin : Plugin<Project> {
override fun apply(target: Project) {
with(target) {
with(pluginManager) {
applyPlugin(libs.plugins.android.application)
applyPlugin(libs.plugins.kotlin.android)
apply("com.android.application")
apply("org.jetbrains.kotlin.android")
apply("com.dropbox.dependency-guard")
}

extensions.configure<ApplicationExtension> {
configureKotlinAndroid(this)
defaultConfig.targetSdk = 34
}

}
}

}
}
Original file line number Diff line number Diff line change
@@ -1,37 +1,23 @@
import dsl.applyPlugin
import dsl.implementation
import dsl.libs
import com.bagnolati.learnoflegends.libs
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.dependencies

@Suppress("unused")
class AndroidFeatureConventionPlugin : Plugin<Project> {
override fun apply(target: Project) {
with(target) {
pluginManager.apply {
applyPlugin(libs.plugins.learnoflegends.android.library)
applyPlugin(libs.plugins.learnoflegends.android.hilt)
apply("learnoflegends.android.library")
apply("learnoflegends.android.hilt")
}

dependencies {
implementation(project(":core:model"))
implementation(project(":core:data"))
implementation(project(":core:common"))
implementation(project(":core:domain"))
implementation(project(":core:ui"))
add("implementation", project(":core:ui"))

implementation(libs.coil.kt)
implementation(libs.coil.kt.compose)

implementation(libs.androidx.hilt.navigation.compose)
implementation(libs.androidx.lifecycle.runtimeCompose)
implementation(libs.androidx.lifecycle.viewModelCompose)

implementation(libs.kotlinx.coroutines.android)
add("implementation", libs.findLibrary("androidx.hilt.navigation.compose").get())
add("implementation", libs.findLibrary("androidx.lifecycle.runtimeCompose").get())
add("implementation", libs.findLibrary("androidx.lifecycle.viewModelCompose").get())
}
}
}
}


}
Original file line number Diff line number Diff line change
@@ -1,25 +1,19 @@
@file:Suppress("UnstableApiUsage")

import dsl.applyPlugin
import dsl.implementation
import dsl.ksp
import dsl.libs
import com.bagnolati.learnoflegends.libs
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.dependencies

@Suppress("unused")
class AndroidHiltConventionPlugin : Plugin<Project> {
override fun apply(target: Project) {
with(target) {
with(pluginManager) {
applyPlugin(libs.plugins.hilt)
applyPlugin(libs.plugins.ksp)
apply("com.google.devtools.ksp")
apply("dagger.hilt.android.plugin")
}

dependencies {
implementation(libs.hilt.android)
ksp(libs.hilt.compiler)
"implementation"(libs.findLibrary("hilt.android").get())
"ksp"(libs.findLibrary("hilt.compiler").get())
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@ import com.android.build.gradle.LibraryExtension
import com.bagnolati.learnoflegends.configureAndroidCompose
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.getByType

@Suppress("unused")
class AndroidLibraryComposeConventionPlugin : Plugin<Project> {
override fun apply(target: Project) {
with(target) {
pluginManager.apply("com.android.library")
apply(plugin = "com.android.library")
apply(plugin = "org.jetbrains.kotlin.plugin.compose")

val extension = extensions.getByType<LibraryExtension>()
configureAndroidCompose(extension)
}
}

}
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
import com.android.build.gradle.LibraryExtension
import com.bagnolati.learnoflegends.configureKotlinAndroid
import dsl.applyPlugin
import dsl.libs
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.configure

@Suppress("unused")
class AndroidLibraryConventionPlugin : Plugin<Project> {
override fun apply(target: Project) {
with(target) {
with(pluginManager) {
apply("com.android.library")
applyPlugin(libs.plugins.kotlin.android)
apply("org.jetbrains.kotlin.android")
}

extensions.configure<LibraryExtension> {
configureKotlinAndroid(this)
defaultConfig.targetSdk = 34
// The resource prefix is derived from the module name,
// so resources inside ":core:module1" must be prefixed with "core_module1_"
resourcePrefix = path.split("""\W""".toRegex()).drop(1).distinct().joinToString(separator = "_").lowercase() + "_"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
import com.bagnolati.learnoflegends.configureKotlinJvm
import dsl.applyPlugin
import dsl.libs
import org.gradle.api.Plugin
import org.gradle.api.Project

@Suppress("unused")
class JvmLibraryConventionPlugin : Plugin<Project> {
override fun apply(target: Project) {
with(target) {
with(pluginManager) {
applyPlugin(libs.plugins.kotlin.jvm)
apply("org.jetbrains.kotlin.jvm")
}
configureKotlinJvm()
}
}
}
}
Loading

0 comments on commit abf73f3

Please sign in to comment.