bump compiler and analysis API version to 1.7.0-dev-2437

(cherry picked from commit fbb02bf)
google · May 5, 2022 · dc054df · dc054df
1 parent 22daa3f
commit dc054df
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 12 deletions.
diff --git 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
@@ -137,16 +137,16 @@ class KMPImplementedIT {
         ).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 @@ class KMPImplementedIT {
 
         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
@@ -105,8 +105,6 @@ class OnErrorIT {
                     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
@@ -2,7 +2,7 @@ description = "Kotlin Symbol Processing implementation using Kotlin Analysis API
 
 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/...uilt/repo/tests-common-1.7.0-dev-1984.jar → ...uilt/repo/tests-common-1.7.0-dev-2437.jar b/...uilt/repo/tests-common-1.7.0-dev-1984.jar → ...uilt/repo/tests-common-1.7.0-dev-2437.jar
diff --git a/...built/repo/tests-mutes-1.7.0-dev-1984.jar → ...built/repo/tests-mutes-1.7.0-dev-2437.jar b/...built/repo/tests-mutes-1.7.0-dev-1984.jar → ...built/repo/tests-mutes-1.7.0-dev-2437.jar
-Original file line number
+Diff line change
@@ Expand Up / @@ -105,8 +105,6 @@ class OnErrorIT { @@
                         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")
         }
@@ Expand Down @@