Upgrade AGP to 7 (#4133)

* Upgrade AGP to 7.0.4 * Run Android tests on JDK 11 and above only * Skip Android report merging test if Android requirements unmet * Update skip reason Co-authored-by: Matthew Haughton <3flex@users.noreply.github.com>
detekt · Jan 15, 2022 · 08eac68 · 08eac68
1 parent a627da9
commit 08eac68
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektAndroidSpec.kt b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektAndroidSpec.kt
@@ -370,7 +370,7 @@ internal fun isAndroidSdkInstalled() =
 
 internal fun skipIfAndroidEnvironmentRequirementsUnmet() = when {
     !isAndroidSdkInstalled() -> Skip.Yes("No android SDK.")
-    getJdkVersion() >= 16 -> Skip.Yes("Android 4.1.3 & 4.2.1 don't run on JDK 16 or higher")
+    getJdkVersion() < 11 -> Skip.Yes("Android Gradle Plugin 7.0+ requires JDK 11 or newer")
     else -> Skip.No
 }
 

diff --git a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/report/ReportMergeSpec.kt b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/report/ReportMergeSpec.kt
@@ -2,6 +2,7 @@ package io.gitlab.arturbosch.detekt.report
 
 import io.gitlab.arturbosch.detekt.getJdkVersion
 import io.gitlab.arturbosch.detekt.manifestContent
+import io.gitlab.arturbosch.detekt.skipIfAndroidEnvironmentRequirementsUnmet
 import io.gitlab.arturbosch.detekt.testkit.DslGradleRunner
 import io.gitlab.arturbosch.detekt.testkit.DslTestBuilder
 import io.gitlab.arturbosch.detekt.testkit.ProjectLayout
@@ -85,7 +86,10 @@ class ReportMergeSpec : Spek({
             }
         }
 
-        it("for android detekt") {
+        it(
+            "for android detekt",
+            skip = skipIfAndroidEnvironmentRequirementsUnmet()
+        ) {
             val builder = DslTestBuilder.groovy()
             val projectLayout = ProjectLayout(0).apply {
                 addSubmodule(

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -22,7 +22,7 @@ kotlin-stdlibJdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", versio
 kotlinx-html = "org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.3"
 kotlinx-coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0"
 
-android-gradle = "com.android.tools.build:gradle:4.2.2"
+android-gradle = "com.android.tools.build:gradle:7.0.4"
 
 ktlint-core = { module = "com.pinterest.ktlint:ktlint-core", version.ref = "ktlint" }
 ktlint-rulesetStandard = { module = "com.pinterest.ktlint:ktlint-ruleset-standard", version.ref = "ktlint" }