Update: Android Gradle Plugin to 7.4 (#85)

Rolf-Smit · web-flow · commit 487520b57ebc · 2023-11-02T16:16:18.000+01:00
This also includes other dependency updates and makes the minimum required Gradle version 7.5
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,25 +1,25 @@
 [versions]
 androidMinSdk       = "19"
-androidTargetSdk    = "32"
-androidCompileSdk   = "32"
-kotlin              = "1.6.21"
-androidGradlePlugin = "7.3.0"
+androidTargetSdk    = "33"
+androidCompileSdk   = "33"
+kotlin              = "1.7.21"
+androidGradlePlugin = "7.4.2"
 
 [libraries]
-appCompat              = { module = "androidx.appcompat:appcompat",         version = "1.5.0" }
+appCompat              = { module = "androidx.appcompat:appcompat",         version = "1.6.1" }
 androidGradlePlugin    = { module = "com.android.tools.build:gradle",       version.ref = "androidGradlePlugin" }
 androidGradlePluginApi = { module = "com.android.tools.build:gradle-api",   version.ref = "androidGradlePlugin" }
 
 # Test dependencies
 junit               = { module = "junit:junit",                             version = "4.13.2" }
 truth               = { module = "com.google.truth:truth",                  version = "1.1.3" }
-supportTestRunner   = { module = "androidx.test:runner",                    version = "1.4.0" }
-espressoCore        = { module = "androidx.test.espresso:espresso-core",    version = "3.4.0" }
-androidJUnit        = { module = "androidx.test.ext:junit",                 version = "1.1.3" }
-commonsCsv          = { module = "org.apache.commons:commons-csv",          version = "1.9.0" }
+supportTestRunner   = { module = "androidx.test:runner",                    version = "1.5.2" }
+espressoCore        = { module = "androidx.test.espresso:espresso-core",    version = "3.5.1" }
+androidJUnit        = { module = "androidx.test.ext:junit",                 version = "1.1.5" }
+commonsCsv          = { module = "org.apache.commons:commons-csv",          version = "1.10.0" }
 kotlinTest          = { module = "org.jetbrains.kotlin:kotlin-test",        version.ref = "kotlin" }
-robolectric         = { module = "org.robolectric:robolectric",             version = "4.8.2" }
-mockk               = { module = "io.mockk:mockk",                          version = "1.12.5" }
+robolectric         = { module = "org.robolectric:robolectric",             version = "4.10.2" }
+mockk               = { module = "io.mockk:mockk",                          version = "1.13.5" }
 
 [bundles]
 androidInstrumentedTest = ["supportTestRunner", "espressoCore", "androidJUnit"]
@@ -29,9 +29,9 @@ jvmTest = ["kotlinTest", "junit", "truth", "commonsCsv"]
 [plugins]
 kotlinJvm           = { id = "org.jetbrains.kotlin.jvm",        version.ref = "kotlin" }
 kotlinAndroid       = { id = "org.jetbrains.kotlin.android",    version.ref = "kotlin" }
-kotlinDokka         = { id = "org.jetbrains.dokka",             version.ref = "kotlin" }
+kotlinDokka         = { id = "org.jetbrains.dokka",             version = "1.7.20" }
 pluginPortalPublish = { id = "com.gradle.plugin-publish",       version = "0.21.0" }
-mavenPublish        = { id = "com.vanniktech.maven.publish",    version = "0.21.0" }
-versionCheck        = { id = "com.github.ben-manes.versions",   version = "0.42.0" }
+mavenPublish        = { id = "com.vanniktech.maven.publish",    version = "0.25.2" }
+versionCheck        = { id = "com.github.ben-manes.versions",   version = "0.46.0" }
 androidApp          = { id = "com.android.application",         version.ref = "androidGradlePlugin"}
 androidLibrary      = { id = "com.android.library",             version.ref = "androidGradlePlugin"}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -20,8 +20,8 @@ plugins {
 // > ./gradlew clean test
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 }
 
 jacocoTestReport {
diff --git a/plugin/src/test/kotlin/org/neotech/plugin/rootcoverage/IntegrationTest.kt b/plugin/src/test/kotlin/org/neotech/plugin/rootcoverage/IntegrationTest.kt
@@ -161,7 +161,7 @@ class IntegrationTest(
 
             val testFixtures =
                 File("src/test/test-fixtures").listFiles()?.filter { it.isDirectory } ?: error("Could not list test fixture directories")
-            val gradleVersions = arrayOf("7.4", "7.4.2", "7.5.1")
+            val gradleVersions = arrayOf("7.5", "7.5.1", "7.6", "7.6.1")
             return testFixtures.flatMap { fixture ->
                 val configurations = File(fixture, "configurations").listFiles() ?: error("Configurations folder not found in $fixture")
                 configurations.flatMap { configuration ->
diff --git a/plugin/src/test/test-fixtures/multi-module/app/build.gradle b/plugin/src/test/test-fixtures/multi-module/app/build.gradle
@@ -29,8 +29,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     testOptions {
@@ -49,7 +49,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 }
 
diff --git a/plugin/src/test/test-fixtures/multi-module/library_android/build.gradle b/plugin/src/test/test-fixtures/multi-module/library_android/build.gradle
@@ -29,8 +29,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     testOptions {
@@ -46,7 +46,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 }
 
diff --git a/plugin/src/test/test-fixtures/multi-module/library_java/build.gradle b/plugin/src/test/test-fixtures/multi-module/library_java/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_11
+targetCompatibility = JavaVersion.VERSION_11
diff --git a/plugin/src/test/test-fixtures/multi-module/library_nested/java/build.gradle b/plugin/src/test/test-fixtures/multi-module/library_nested/java/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_11
+targetCompatibility = JavaVersion.VERSION_11

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ plugins {`
`20`	`20`	`// > ./gradlew clean test`
`21`	`21`
`22`	`22`	`java {`
`23`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`24`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`23`	`+ sourceCompatibility = JavaVersion.VERSION_11`
	`24`	`+ targetCompatibility = JavaVersion.VERSION_11`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`jacocoTestReport {`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ android {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`compileOptions {`
`32`		`- sourceCompatibility JavaVersion.VERSION_1_8`
`33`		`- targetCompatibility JavaVersion.VERSION_1_8`
	`32`	`+ sourceCompatibility JavaVersion.VERSION_11`
	`33`	`+ targetCompatibility JavaVersion.VERSION_11`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`testOptions {`
`@@ -49,7 +49,7 @@ android {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`kotlinOptions {`
`52`		`- jvmTarget = "1.8"`
	`52`	`+ jvmTarget = "11"`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ dependencies {`
`6`	`6`	`implementation fileTree(dir: 'libs', include: ['*.jar'])`
`7`	`7`	`}`
`8`	`8`
`9`		`-sourceCompatibility = JavaVersion.VERSION_1_8`
`10`		`-targetCompatibility = JavaVersion.VERSION_1_8`
	`9`	`+sourceCompatibility = JavaVersion.VERSION_11`
	`10`	`+targetCompatibility = JavaVersion.VERSION_11`