bump compiler and analysis API version to 1.7.0-dev-2437 (cherry picked from commit fbb02bfeafdb69b876bc6c0bd433fd1ebf4c8150)
diff --git a/gradle.properties b/gradle.properties index 91ff14d..4ec199b 100644 --- a/gradle.properties +++ b/gradle.properties
@@ -1,7 +1,7 @@ # Copied from kotlinc org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx2200m -Dfile.encoding=UTF-8 -kotlinBaseVersion=1.7.0-dev-1984 +kotlinBaseVersion=1.7.0-dev-2437 agpBaseVersion=7.0.0 intellijVersion=203.8084.24 junitVersion=4.12
diff --git a/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/KMPImplementedIT.kt b/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/KMPImplementedIT.kt index 23a7738..a02a9ff 100644 --- a/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/KMPImplementedIT.kt +++ b/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/KMPImplementedIT.kt
@@ -137,16 +137,16 @@ ).build().let { Assert.assertEquals(TaskOutcome.SUCCESS, it.task(":workload-androidNative:build")?.outcome) verifyKexe( - "workload-androidNative/build/bin/androidNativeX64/debugExecutable/workload-androidNative.so" + "workload-androidNative/build/bin/androidNativeX64/debugExecutable/workload-androidNative.kexe" ) verifyKexe( - "workload-androidNative/build/bin/androidNativeX64/releaseExecutable/workload-androidNative.so" + "workload-androidNative/build/bin/androidNativeX64/releaseExecutable/workload-androidNative.kexe" ) verifyKexe( - "workload-androidNative/build/bin/androidNativeArm64/debugExecutable/workload-androidNative.so" + "workload-androidNative/build/bin/androidNativeArm64/debugExecutable/workload-androidNative.kexe" ) verifyKexe( - "workload-androidNative/build/bin/androidNativeArm64/releaseExecutable/workload-androidNative.so" + "workload-androidNative/build/bin/androidNativeArm64/releaseExecutable/workload-androidNative.kexe" ) Assert.assertFalse(it.output.contains("kotlin scripting plugin:")) Assert.assertTrue(it.output.contains("w: [ksp] platforms: [Native")) @@ -246,10 +246,10 @@ verifyKexe("workload/build/bin/linuxX64/debugExecutable/workload.kexe") verifyKexe("workload/build/bin/linuxX64/releaseExecutable/workload.kexe") - verifyKexe("workload/build/bin/androidNativeX64/debugExecutable/workload.so") - verifyKexe("workload/build/bin/androidNativeX64/releaseExecutable/workload.so") - verifyKexe("workload/build/bin/androidNativeArm64/debugExecutable/workload.so") - verifyKexe("workload/build/bin/androidNativeArm64/releaseExecutable/workload.so") + verifyKexe("workload/build/bin/androidNativeX64/debugExecutable/workload.kexe") + verifyKexe("workload/build/bin/androidNativeX64/releaseExecutable/workload.kexe") + verifyKexe("workload/build/bin/androidNativeArm64/debugExecutable/workload.kexe") + verifyKexe("workload/build/bin/androidNativeArm64/releaseExecutable/workload.kexe") // TODO: Enable after CI's Xcode version catches up. // Assert.assertTrue(
diff --git a/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/OnErrorIT.kt b/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/OnErrorIT.kt index dfbe139..d44740a 100644 --- a/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/OnErrorIT.kt +++ b/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/OnErrorIT.kt
@@ -105,8 +105,6 @@ it.startsWith("e: [ksp] kotlin.io.FileAlreadyExistsException:") } ) - - Assert.assertTrue(result.output.contains("e: java.lang.IllegalStateException: Should not be called!")) } project.restore("workload/build.gradle.kts") }
diff --git a/kotlin-analysis-api/build.gradle.kts b/kotlin-analysis-api/build.gradle.kts index 2f07868..7014ad3 100644 --- a/kotlin-analysis-api/build.gradle.kts +++ b/kotlin-analysis-api/build.gradle.kts
@@ -2,7 +2,7 @@ val intellijVersion: String by project val junitVersion: String by project -val analysisAPIVersion = "1.7.0-dev-1984" +val analysisAPIVersion = "1.7.0-dev-2437" val libsForTesting by configurations.creating plugins {
diff --git a/third_party/prebuilt/repo/tests-common-1.7.0-dev-1984.jar b/third_party/prebuilt/repo/tests-common-1.7.0-dev-2437.jar similarity index 96% rename from third_party/prebuilt/repo/tests-common-1.7.0-dev-1984.jar rename to third_party/prebuilt/repo/tests-common-1.7.0-dev-2437.jar index 043b608..f35cb5f 100644 --- a/third_party/prebuilt/repo/tests-common-1.7.0-dev-1984.jar +++ b/third_party/prebuilt/repo/tests-common-1.7.0-dev-2437.jar Binary files differ
diff --git a/third_party/prebuilt/repo/tests-mutes-1.7.0-dev-1984.jar b/third_party/prebuilt/repo/tests-mutes-1.7.0-dev-2437.jar similarity index 97% rename from third_party/prebuilt/repo/tests-mutes-1.7.0-dev-1984.jar rename to third_party/prebuilt/repo/tests-mutes-1.7.0-dev-2437.jar index 706517e..98262c3 100644 --- a/third_party/prebuilt/repo/tests-mutes-1.7.0-dev-1984.jar +++ b/third_party/prebuilt/repo/tests-mutes-1.7.0-dev-2437.jar Binary files differ