Update dependency gradle to v8 (#40)

* Update dependency gradle to v8 * Update compile options for gradle 8.x * Update AGP version * Update workflows java version * Remove deprecated auto component creation --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Maxwell Mapako <[email protected]>
AniTrend · May 20, 2023 · 7a1c471 · 7a1c471
1 parent 4adbd6b
commit 7a1c471
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 39 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/workflows/android-spotless.yml b/.github/workflows/android-spotless.yml
@@ -14,10 +14,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: set up JDK 11
+    - name: set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: 17
         distribution: 'adopt'
 
     - name: Grant execute permission for gradlew

diff --git a/.github/workflows/android-test.yml b/.github/workflows/android-test.yml
@@ -14,10 +14,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: set up JDK 11
+    - name: set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: 17
         distribution: 'adopt'
 
     - name: Grant execute permission for gradlew

diff --git a/.github/workflows/gradle-dokka.yml b/.github/workflows/gradle-dokka.yml
@@ -11,10 +11,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: set up JDK 11
+    - name: set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: 17
         distribution: 'adopt'
 
     - name: Grant execute permission for gradlew

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -19,17 +19,6 @@ repositories {
     }
 }
 
-tasks.withType(KotlinCompile::class) {
-	sourceCompatibility = "11"
-	targetCompatibility = "11"
-}
-
-tasks.withType(KotlinJvmCompile::class) {
-	kotlinOptions {
-		jvmTarget = "11"
-	}
-}
-
 val libs get() = extensions.getByType<LibrariesForLibs>()
 
 dependencies {

diff --git a/...ava/co/anitrend/support/query/builder/buildSrc/plugins/components/ProjectConfiguration.kt b/...ava/co/anitrend/support/query/builder/buildSrc/plugins/components/ProjectConfiguration.kt
@@ -121,8 +121,8 @@ internal fun Project.configureAndroid(): Unit = baseExtension().run {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     tasks.withType(KotlinCompile::class.java) {
@@ -136,7 +136,7 @@ internal fun Project.configureAndroid(): Unit = baseExtension().run {
 
     tasks.withType(KotlinJvmCompile::class.java) {
         kotlinOptions {
-            jvmTarget = "11"
+            jvmTarget = "17"
         }
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -28,6 +28,4 @@ kapt.incremental.apt=true
 
 # Improved file system watcher
 # https://blog.gradle.org/introducing-file-system-watching
-org.gradle.vfs.watch=true
-
-android.disableAutomaticComponentCreation=true
+org.gradle.vfs.watch=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 ktlint = "0.40.0"
 
-gradle-plugin = "7.4.0"
+gradle-plugin = "8.0.1"
 
 androidx-appcompat = "1.5.1"
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Dec 04 13:13:43 SAST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME