Build's working again

Author: ZacSweers

.github/workflows/ci.yml

@@ -17,12 +17,11 @@ concurrency:
 
 jobs:
   build:
-    name: 'KSP ${{ matrix.ksp_enabled }} / K2 ${{ matrix.k2_enabled }}'
+    name: 'KSP ${{ matrix.ksp_enabled }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
         ksp_enabled: [ true, false ]
-        k2_enabled: [ true, false ]
       fail-fast: false
 
     steps:
@@ -39,7 +38,7 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
 
       - name: Build project
-        run: ./gradlew build check -Pmoshix.useKsp=${{ matrix.ksp_enabled }} -Pkotlin.experimental.tryK2=${{ matrix.k2_enabled }} --quiet
+        run: ./gradlew build check -Pmoshix.useKsp=${{ matrix.ksp_enabled }} --quiet
 
   publish-snapshot:
     needs: 'build'

build.gradle.kts

@@ -76,9 +76,9 @@ spotless {
 subprojects {
   pluginManager.withPlugin("java") {
     // javaReleaseVersion can be set to override the global version
+    // Can't use providers.gradleProperty() because it doesn't work on subprojects
     val jvmTargetProvider =
-      providers
-        .gradleProperty("moshix.javaReleaseVersion")
+      provider<String> { findProperty("moshix.javaReleaseVersion") as? String? }
         .orElse(libs.versions.jvmTarget)
         .map(String::toInt)
     configure<JavaPluginExtension> {

moshi-ir/moshi-kotlin-tests/build.gradle.kts

@@ -22,6 +22,8 @@ plugins {
   alias(libs.plugins.ksp)
 }
 
+kotlin.compilerOptions.optIn.add("kotlin.ExperimentalStdlibApi")
+
 moshi { enableSealed.set(true) }
 
 val proguardRuleValidator =
@@ -38,15 +40,10 @@ val proguardRuleValidator =
     }
   }
 
-tasks.withType<KotlinCompile>().configureEach {
-  compilerOptions { freeCompilerArgs.addAll("-opt-in=kotlin.ExperimentalStdlibApi") }
-  if (
-    name == "compileTestKotlin" &&
-      providers.gradleProperty("kotlin.experimental.tryK2").orNull != "true"
-  ) {
-    finalizedBy(proguardRuleValidator)
-  }
-}
+tasks
+  .withType<KotlinCompile>()
+  .named { it == "compileTestKotlin" }
+  .configureEach { finalizedBy(proguardRuleValidator) }
 
 dependencies {
   testImplementation("junit:junit:4.13.2")