Migrate to gradle 8

Drjacky · Aug 6, 2023 · 8401515 · 8401515
1 parent 6da28e6
commit 8401515
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 21 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -49,11 +49,11 @@ android {
         }
     }
     compileOptions {
-        targetCompatibility = JavaVersion.VERSION_11
-        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
     lintOptions {
         isAbortOnError = false
@@ -64,11 +64,12 @@ android {
         exclude("META-INF/proguard/androidx-annotations.pro")
         resources.excludes += "DebugProbesKt.bin"
     }
+    namespace = "app.web.drjackycv.mvvmtemplate"
 }
 
 tasks.withType<KotlinCompile> {
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
         freeCompilerArgs = freeCompilerArgs + listOf("-XXLanguage:+InlineClasses")
     }
 }

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="app.web.drjackycv.mvvmtemplate">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
 

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -10,7 +10,7 @@ repositories {
 
 dependencies {
     implementation("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.10")
-    implementation("com.android.tools.build:gradle:7.4.1")
+    implementation("com.android.tools.build:gradle:8.1.0")
     implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.22.0")
     implementation("com.squareup:javapoet:1.13.0")
 }
diff --git a/buildSrc/src/main/kotlin/app/web/drjackycv/buildsrc/Depends.kt b/buildSrc/src/main/kotlin/app/web/drjackycv/buildsrc/Depends.kt
@@ -6,7 +6,7 @@ object Depends {
 
     object Versions {
         const val appVersionCode = 1_000_000
-        const val gradleVersion = "7.4.1"
+        const val gradleVersion = "8.2.0-alpha14"
         const val androidCompileSdkVersion = 33
         const val targetSdkVersion = 33
         const val minSdkVersion = 21

diff --git a/data/build.gradle.kts b/data/build.gradle.kts
@@ -20,11 +20,11 @@ android {
         consumerProguardFiles("consumer-rules.pro")
     }
     compileOptions {
-        targetCompatibility = JavaVersion.VERSION_11
-        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
     testOptions.unitTests.isReturnDefaultValues = true
     sourceSets {
@@ -53,6 +53,7 @@ android {
             )
         }
     }
+    namespace = "app.web.drjackycv.data"
 
 }
 

diff --git a/data/src/main/AndroidManifest.xml b/data/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="app.web.drjackycv.data" />
+<manifest />
diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts
@@ -20,11 +20,11 @@ android {
         consumerProguardFiles("consumer-rules.pro")
     }
     compileOptions {
-        targetCompatibility = JavaVersion.VERSION_11
-        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
         freeCompilerArgs = freeCompilerArgs + listOf("-XXLanguage:+InlineClasses")
     }
     sourceSets {
@@ -42,6 +42,7 @@ android {
             )
         }
     }
+    namespace = "app.web.drjackycv.domain"
 
 }
 

diff --git a/domain/src/main/AndroidManifest.xml b/domain/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="app.web.drjackycv.domain" />
+<manifest />
diff --git a/gradle.properties b/gradle.properties
@@ -8,6 +8,9 @@ org.gradle.parallel=true
 org.gradle.caching.debug=true
 org.gradle.warning.mode=summary
 org.gradle.configureondemand=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
 #android.enableR8=true
 #android.databinding.enableV2=true
 #kapt.use.worker.api=false

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
diff --git a/presentation/build.gradle.kts b/presentation/build.gradle.kts
@@ -23,11 +23,11 @@ android {
         consumerProguardFiles("consumer-rules.pro")
     }
     compileOptions {
-        targetCompatibility = JavaVersion.VERSION_11
-        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 
     buildFeatures {
@@ -54,6 +54,7 @@ android {
             )
         }
     }
+    namespace = "app.web.drjackycv.presentation"
 
 }
 

diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="app.web.drjackycv.presentation" />
+<manifest />