Update to beta09 and re-enable unit tests finally (#153)

ZacSweers · Sep 3, 2021 · 4449cf2 · 4449cf2
1 parent 92bb7ba
commit 4449cf2
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 415 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -21,7 +21,7 @@ kotlinCompileTesting = "1.4.3"
 kotlin = "1.5.30"
 jvmTarget = "1.8"
 kotlinpoet = "1.9.0"
-ksp = "1.5.30-1.0.0-beta08"
+ksp = "1.5.30-1.0.0-beta09"
 ktlint = "0.41.0"
 moshi = "1.12.0"
 okhttp = "4.9.1"
@@ -31,8 +31,8 @@ retrofit = "2.9.0"
 dokka = { id = "org.jetbrains.dokka", version = "1.5.0" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.17.0" }
-spotless = { id = "com.diffplug.spotless", version = "5.14.2" }
-kotlinBinaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.7.0" }
+spotless = { id = "com.diffplug.spotless", version = "5.14.3" }
+kotlinBinaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.7.1" }
 
 [libraries]
 asm = { module = "org.ow2.asm:asm", version = "9.2" }

diff --git a/moshi-ksp/moshi-ksp/build.gradle.kts b/moshi-ksp/moshi-ksp/build.gradle.kts
@@ -46,8 +46,7 @@ dependencies {
   testImplementation(libs.truth)
   testImplementation(libs.junit)
   testImplementation(libs.kotlin.reflect)
-  // TODO re-enable with new release
-//  testImplementation(Dependencies.Testing.kspCompileTesting)
   testImplementation(libs.kotlinCompileTesting)
+  testImplementation(libs.kotlinCompileTesting.ksp)
   testImplementation(libs.kotlin.compilerEmbeddable)
 }
diff --git a/moshi-ksp/moshi-ksp/src/test/kotlin/com/tschuchort/compiletesting/symbolProcessors.kt b/moshi-ksp/moshi-ksp/src/test/kotlin/com/tschuchort/compiletesting/symbolProcessors.kt
diff --git a/moshi-ksp/moshi-ksp/src/test/kotlin/dev/zacsweers/moshix/ksp/JsonClassSymbolProcessorTest.kt b/moshi-ksp/moshi-ksp/src/test/kotlin/dev/zacsweers/moshix/ksp/JsonClassSymbolProcessorTest.kt
@@ -41,7 +41,6 @@ import kotlin.reflect.KVariance.INVARIANT
 import kotlin.reflect.full.createType
 
 /** Execute kotlinc to confirm that either files are generated or errors are printed. */
-@Ignore("https://github.com/google/ksp/issues/427")
 @RunWith(Parameterized::class)
 class JsonClassSymbolProcessorTest(private val incremental: Boolean) {
 
@@ -326,7 +325,7 @@ class JsonClassSymbolProcessorTest(private val incremental: Boolean) {
     )
     assertThat(result.exitCode).isEqualTo(KotlinCompilation.ExitCode.COMPILATION_ERROR)
     assertThat(result.messages).contains(
-      "@JsonClass can't be applied to expression: must be a Kotlin class"
+      "@JsonClass can't be applied to test.expression: must be a Kotlin class"
     )
   }
 

diff --git a/moshi-sealed/codegen-ksp/build.gradle.kts b/moshi-sealed/codegen-ksp/build.gradle.kts
@@ -37,8 +37,7 @@ dependencies {
   testImplementation(libs.ksp)
   testImplementation(libs.truth)
   testImplementation(libs.junit)
-  // TODO re-enable with new release
-//  testImplementation(Dependencies.Testing.kspCompileTesting)
   testImplementation(libs.kotlinCompileTesting)
+  testImplementation(libs.kotlinCompileTesting.ksp)
   testImplementation(libs.kotlin.compilerEmbeddable)
 }