Clean up old agp integration tests
Removes AGP 7.x tests
Adds AGP 9.0 test with built in kotlin disabled
diff --git a/integration-tests/build.gradle.kts b/integration-tests/build.gradle.kts
index b7b4fa7..1399877 100644
--- a/integration-tests/build.gradle.kts
+++ b/integration-tests/build.gradle.kts
@@ -42,8 +42,7 @@
}
val agpCompatibilityTestClasses = listOf(
- "**/AGP731IT.class", "**/AGP741IT.class",
- "**/AGP812IT.class", "**/AGP810IT.class", "**/AGP890IT.class", "**/AGP900IT.class"
+ "**/AGP812IT.class", "**/AGP810IT.class", "**/AGP890IT.class", "**/AGP900IT.class", "**/BuiltInKotlinAGP900IT.class"
)
// Create a new test task for the AGP compatibility tests
diff --git a/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/AGP731IT.kt b/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/AGP731IT.kt
deleted file mode 100644
index fb90b6b..0000000
--- a/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/AGP731IT.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2020 Google LLC
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.devtools.ksp.test
-
-import org.gradle.testkit.runner.GradleRunner
-import org.gradle.testkit.runner.TaskOutcome
-import org.junit.Assert
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.Parameterized
-import java.io.File
-
-@RunWith(Parameterized::class)
-class AGP731IT(useKSP2: Boolean) {
- @Rule
- @JvmField
- val project: TemporaryTestProject = TemporaryTestProject("playground-android-multi", "playground", useKSP2)
-
- @Test
- fun testRunsKSP() {
- val gradleRunner = GradleRunner.create().withProjectDir(project.root).withGradleVersion("7.6.3")
-
- File(project.root, "gradle.properties").appendText("\nagpVersion=7.3.1")
- gradleRunner.withArguments(":workload:compileDebugKotlin").build().let { result ->
- Assert.assertEquals(TaskOutcome.SUCCESS, result.task(":workload:kspDebugKotlin")?.outcome)
- }
- }
-
- companion object {
- @JvmStatic
- @Parameterized.Parameters(name = "KSP2={0}")
- fun params() = listOf(arrayOf(true), arrayOf(false))
- }
-}
diff --git a/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/AGP741IT.kt b/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/AGP741IT.kt
deleted file mode 100644
index 6e6e7a6..0000000
--- a/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/AGP741IT.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2020 Google LLC
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.devtools.ksp.test
-
-import org.gradle.testkit.runner.GradleRunner
-import org.junit.Assert
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.Parameterized
-import java.io.File
-
-@RunWith(Parameterized::class)
-class AGP741IT(useKSP2: Boolean) {
- @Rule
- @JvmField
- val project: TemporaryTestProject = TemporaryTestProject("playground-android-multi", "playground", useKSP2)
-
- @Test
- fun testDependencyResolutionCheck() {
- val gradleRunner = GradleRunner.create().withProjectDir(project.root).withGradleVersion("7.6.3")
-
- File(project.root, "gradle.properties").appendText("\nagpVersion=7.4.1")
- gradleRunner.withArguments(":workload:compileDebugKotlin").build().let { result ->
- Assert.assertFalse(result.output.contains("was resolved during configuration time."))
- }
- }
-
- companion object {
- @JvmStatic
- @Parameterized.Parameters(name = "KSP2={0}")
- fun params() = listOf(arrayOf(true), arrayOf(false))
- }
-}
diff --git a/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/AGP900IT.kt b/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/AGP900IT.kt
index 9650767..c8f9994 100644
--- a/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/AGP900IT.kt
+++ b/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/AGP900IT.kt
@@ -5,20 +5,30 @@
import org.junit.Assert
import org.junit.Rule
import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
import java.io.File
-class AGP900IT {
+@RunWith(Parameterized::class)
+class AGP900IT(useKSP2: Boolean) {
@Rule
@JvmField
- val project: TemporaryTestProject = TemporaryTestProject("playground-android-builtinkotlin", "playground", true)
+ val project: TemporaryTestProject = TemporaryTestProject("playground-android-multi", "playground", useKSP2)
@Test
fun testRunsKSP() {
val gradleRunner = GradleRunner.create().withProjectDir(project.root).withGradleVersion("9.0.0")
File(project.root, "gradle.properties").appendText("\nagpVersion=9.0.0-alpha03")
+ File(project.root, "gradle.properties").appendText("\nandroid.builtInKotlin=false")
gradleRunner.withArguments(":workload:compileDebugKotlin").build().let { result ->
Assert.assertEquals(TaskOutcome.SUCCESS, result.task(":workload:kspDebugKotlin")?.outcome)
}
}
+
+ companion object {
+ @JvmStatic
+ @Parameterized.Parameters(name = "KSP2={0}")
+ fun params() = listOf(arrayOf(true), arrayOf(false))
+ }
}
diff --git a/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/BuiltInKotlinAGP900IT.kt b/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/BuiltInKotlinAGP900IT.kt
new file mode 100644
index 0000000..9b2e686
--- /dev/null
+++ b/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/BuiltInKotlinAGP900IT.kt
@@ -0,0 +1,24 @@
+package com.google.devtools.ksp.test
+
+import org.gradle.testkit.runner.GradleRunner
+import org.gradle.testkit.runner.TaskOutcome
+import org.junit.Assert
+import org.junit.Rule
+import org.junit.Test
+import java.io.File
+
+class BuiltInKotlinAGP900IT {
+ @Rule
+ @JvmField
+ val project: TemporaryTestProject = TemporaryTestProject("playground-android-builtinkotlin", "playground", true)
+
+ @Test
+ fun testRunsKSP() {
+ val gradleRunner = GradleRunner.create().withProjectDir(project.root).withGradleVersion("9.0.0")
+
+ File(project.root, "gradle.properties").appendText("\nagpVersion=9.0.0-alpha03")
+ gradleRunner.withArguments(":workload:compileDebugKotlin").build().let { result ->
+ Assert.assertEquals(TaskOutcome.SUCCESS, result.task(":workload:kspDebugKotlin")?.outcome)
+ }
+ }
+}
diff --git a/integration-tests/src/test/resources/playground-android-multi/workload/build.gradle.kts b/integration-tests/src/test/resources/playground-android-multi/workload/build.gradle.kts
index 4855372..11b6b9c 100644
--- a/integration-tests/src/test/resources/playground-android-multi/workload/build.gradle.kts
+++ b/integration-tests/src/test/resources/playground-android-multi/workload/build.gradle.kts
@@ -26,6 +26,12 @@
compileSdk = 34
defaultConfig {
minSdk = 34
+ }
+ lint {
+ targetSdk = 34
+ }
+
+ testOptions {
targetSdk = 34
}
}
