test against Gradle 8.0-rc-2 and AGP 8.0.0-alpha11 (#499)

vanniktech · Jan 17, 2023 · b944e0d · b944e0d
1 parent 93a2188
commit b944e0d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/build-logic/src/main/kotlin/shared.gradle.kts b/build-logic/src/main/kotlin/shared.gradle.kts
@@ -1,4 +1,6 @@
 import org.gradle.accessors.dm.LibrariesForLibs
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 val libs = the<LibrariesForLibs>()
 
@@ -24,6 +26,12 @@ java {
   targetCompatibility = JavaVersion.VERSION_11
 }
 
+tasks.withType(KotlinCompile::class.java) {
+  compilerOptions {
+    jvmTarget.set(JvmTarget.JVM_11)
+  }
+}
+
 configurations.all {
   // Pin the kotlin version
   resolutionStrategy {

diff --git a/...src/integrationTest/kotlin/com/vanniktech/maven/publish/MavenPublishPluginPlatformTest.kt b/...src/integrationTest/kotlin/com/vanniktech/maven/publish/MavenPublishPluginPlatformTest.kt
@@ -6,6 +6,7 @@ import com.google.testing.junit.testparameterinjector.junit5.TestParameterInject
 import com.vanniktech.maven.publish.ProjectResultSubject.Companion.assertThat
 import com.vanniktech.maven.publish.TestOptions.Signing.IN_MEMORY_KEY
 import java.nio.file.Path
+import org.gradle.api.JavaVersion
 import org.junit.jupiter.api.io.TempDir
 
 class MavenPublishPluginPlatformTest {
@@ -310,7 +311,7 @@ class MavenPublishPluginPlatformTest {
     @TestParameter agpVersion: AgpVersion,
     @TestParameter kotlinVersion: KotlinVersion,
   ) {
-    agpVersion.assumeSupportedGradleVersion()
+    agpVersion.assumeSupportedJdkAndGradleVersion()
 
     val project = kotlinMultiplatformWithAndroidLibraryProjectSpec(agpVersion, kotlinVersion)
     val result = project.run(fixtures, testProjectDir, testOptions)
@@ -427,7 +428,7 @@ class MavenPublishPluginPlatformTest {
 
   @TestParameterInjectorTest
   fun androidLibraryProject(@TestParameter agpVersion: AgpVersion) {
-    agpVersion.assumeSupportedGradleVersion()
+    agpVersion.assumeSupportedJdkAndGradleVersion()
 
     val project = androidLibraryProjectSpec(agpVersion)
     val result = project.run(fixtures, testProjectDir, testOptions)
@@ -451,7 +452,7 @@ class MavenPublishPluginPlatformTest {
   fun androidMultiVariantLibraryProject(@TestParameter agpVersion: AgpVersion) {
     // regular plugin does not have a way to enable multi variant config
     assume().that(config).isEqualTo(TestOptions.Config.BASE)
-    agpVersion.assumeSupportedGradleVersion()
+    agpVersion.assumeSupportedJdkAndGradleVersion()
 
     val project = androidLibraryProjectSpec(agpVersion).copy(
       basePluginConfig = "configure(new AndroidMultiVariantLibrary(true, true))",
@@ -487,7 +488,7 @@ class MavenPublishPluginPlatformTest {
     @TestParameter agpVersion: AgpVersion,
     @TestParameter kotlinVersion: KotlinVersion,
   ) {
-    agpVersion.assumeSupportedGradleVersion()
+    agpVersion.assumeSupportedJdkAndGradleVersion()
 
     val project = androidLibraryKotlinProjectSpec(agpVersion, kotlinVersion)
     val result = project.run(fixtures, testProjectDir, testOptions)
@@ -543,7 +544,8 @@ class MavenPublishPluginPlatformTest {
     assertThat(result).module().isSigned()
   }
 
-  private fun AgpVersion.assumeSupportedGradleVersion() {
+  private fun AgpVersion.assumeSupportedJdkAndGradleVersion() {
+    assume().that(JavaVersion.current()).isAtLeast(minJdkVersion)
     assume().that(gradleVersion).isAtLeast(minGradleVersion)
     if (firstUnsupportedGradleVersion != null) {
       assume().that(gradleVersion).isLessThan(firstUnsupportedGradleVersion)

diff --git a/plugin/src/integrationTest/kotlin/com/vanniktech/maven/publish/TestOptions.kt b/plugin/src/integrationTest/kotlin/com/vanniktech/maven/publish/TestOptions.kt
@@ -1,5 +1,7 @@
 package com.vanniktech.maven.publish
 
+import org.gradle.api.JavaVersion
+
 data class TestOptions(
   val config: Config,
   val signing: Signing,
@@ -21,6 +23,7 @@ enum class AgpVersion(
   val value: String,
   val minGradleVersion: GradleVersion,
   val firstUnsupportedGradleVersion: GradleVersion? = null,
+  val minJdkVersion: JavaVersion = JavaVersion.VERSION_11,
 ) {
   // minimum supported
   AGP_7_1(
@@ -35,8 +38,9 @@ enum class AgpVersion(
   ),
   // canary channel
   AGP_8_0(
-    value = "8.0.0-alpha09",
+    value = "8.0.0-alpha11",
     minGradleVersion = GradleVersion.GRADLE_8_0,
+    minJdkVersion = JavaVersion.VERSION_17,
   ),
 }
 
@@ -53,7 +57,7 @@ enum class GradleVersion(val value: String) {
   // stable
   GRADLE_7_6("7.6"),
   // preview
-  GRADLE_8_0("8.0-rc-1"),
+  GRADLE_8_0("8.0-rc-2"),
   ;
 
   companion object {