Run Gradle LanguageVersion tests with Kotlin min version

apollographql · Nov 27, 2024 · 6819f7b · 6819f7b
1 parent 9554653
commit 6819f7b
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 12 deletions.
diff --git a/...lugin/src/test-java11/kotlin/com/apollographql/apollo/gradle/test/LanguageVersionTests.kt b/...lugin/src/test-java11/kotlin/com/apollographql/apollo/gradle/test/LanguageVersionTests.kt
@@ -62,17 +62,19 @@ class LanguageVersionTests {
       graphqlPath: String = "hero",
       block: (File) -> Unit,
   ) {
-    TestUtils.withProject(
-        usesKotlinDsl = true,
-        plugins = listOf(TestUtils.kotlinJvmPlugin, TestUtils.apolloPlugin),
-        apolloConfiguration = getConfiguration(
-            kotlinLanguageVersion = kotlinLanguageVersion,
-            kotlinApiVersion = kotlinApiVersion,
-            apolloLanguageVersion = apolloLanguageVersion,
-        ),
-        graphqlPath = graphqlPath,
-        block = block
-    )
+    TestUtils.withTestProject("language-version") { dir ->
+      dir.resolve("build.gradle.kts").appendText(
+          getConfiguration(
+              kotlinLanguageVersion = kotlinLanguageVersion,
+              kotlinApiVersion = kotlinApiVersion,
+              apolloLanguageVersion = apolloLanguageVersion,
+          )
+      )
+
+      TestUtils.fixturesDirectory().resolve(graphqlPath).copyRecursively(dir.resolve("src/main/graphql/com/example"))
+
+      block(dir)
+    }
   }
 
   private fun getConfiguration(
@@ -90,7 +92,7 @@ class LanguageVersionTests {
       """.trimIndent()
 
     val apolloConfiguration = """
-      apollo {
+      configure<ApolloExtension> {
         service("service") {
           packageNamesFromFilePaths()
           codegenModels.set(com.apollographql.apollo.compiler.MODELS_RESPONSE_BASED)

diff --git a/libraries/apollo-gradle-plugin/testProjects/language-version/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/language-version/build.gradle.kts
@@ -0,0 +1,19 @@
+import com.apollographql.apollo.gradle.api.ApolloExtension
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+  alias(libs.plugins.kotlin.jvm.min)
+  alias(libs.plugins.apollo)
+}
+
+dependencies {
+  add("implementation", libs.apollo.api)
+}
+
+tasks.withType<KotlinCompile>().configureEach {
+  kotlinOptions {
+    // Required for Kotlin < 1.6.10
+    // See https://kotlinlang.org/docs/whatsnew1620.html#compatibility-changes-in-the-xjvm-default-modes
+    freeCompilerArgs += "-Xjvm-default=all"
+  }
+}
diff --git a/libraries/apollo-gradle-plugin/testProjects/language-version/settings.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/language-version/settings.gradle.kts
@@ -0,0 +1 @@
+apply(from = "../../../../gradle/test.settings.gradle.kts")