Kotlin 2.3.20

CHANGELOG.md

@@ -6,6 +6,11 @@ Changelog
 
 - Compile against Kotlin `2.3.0`.This release requires Kotlin `2.3.0` or later.
 - Raise the Gradle plugin Kotlin target to `2.0`, which in turn requires Gradle `8.11` or later.
+- Remove the following deprecated targets. See: https://kotl.in/native-targets-tiers.
+  - `macosX64`
+  - `iosX64`
+  - `watchosX64`
+  - `tvosX64`
 
 1.15.1
 ------

gradle/libs.versions.toml

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 [versions]
-kotlin = "2.3.0"
+kotlin = "2.3.20-Beta1"
 jdk = "23"
 jvmTarget = "11"
 ktfmt = "0.61"

redacted-compiler-plugin-annotations/api/redacted-compiler-plugin-annotations.klib.api

@@ -1,5 +1,5 @@
 // Klib ABI Dump
-// Targets: [androidNativeArm32, androidNativeArm64, androidNativeX64, androidNativeX86, iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosDeviceArm64, watchosSimulatorArm64, watchosX64]
+// Targets: [androidNativeArm32, androidNativeArm64, androidNativeX64, androidNativeX86, iosArm64, iosSimulatorArm64, js, linuxArm64, linuxX64, macosArm64, mingwX64, tvosArm64, tvosSimulatorArm64, wasmJs, watchosArm32, watchosArm64, watchosDeviceArm64, watchosSimulatorArm64]
 // Rendering settings:
 // - Signature version: 2
 // - Show manifest properties: true

redacted-compiler-plugin-annotations/build.gradle.kts

@@ -67,19 +67,15 @@ kotlin {
 fun KotlinMultiplatformExtension.configureOrCreateNativePlatforms() {
   // Tier 1
   linuxX64()
-  macosX64()
   macosArm64()
   iosSimulatorArm64()
-  iosX64()
 
   // Tier 2
   linuxArm64()
   watchosSimulatorArm64()
-  watchosX64()
   watchosArm32()
   watchosArm64()
   tvosSimulatorArm64()
-  tvosX64()
   tvosArm64()
   iosArm64()
 

redacted-compiler-plugin/src/main/kotlin/dev/zacsweers/redacted/compiler/fir/RedactedFirExtensionRegistrar.kt

@@ -84,7 +84,7 @@ internal object FirRedactedDeclarationChecker : FirClassChecker(MppCheckerKind.C
         if (supertype is ConeErrorType) continue
         if (supertype !is ConeClassLikeType) continue
         val redactedAnnotation =
-          supertype.classId?.toSymbol()?.resolvedAnnotationClassIds?.firstOrNull {
+          supertype.classId.toSymbol()?.resolvedAnnotationClassIds?.firstOrNull {
             it in context.session.redactedAnnotations
           }
         if (redactedAnnotation != null) {

redacted-compiler-plugin/src/testFixtures/kotlin/dev/zacsweers/redacted/compiler/AbstractBoxTest.kt → redacted-compiler-plugin/src/testFixtures/kotlin/dev/zacsweers/redacted/compiler/AbstractJvmBoxTest.kt

@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirective
 import org.jetbrains.kotlin.test.runners.codegen.AbstractFirLightTreeBlackBoxCodegenTest
 import org.jetbrains.kotlin.test.services.KotlinStandardLibrariesPathProvider
 
-open class AbstractBoxTest : AbstractFirLightTreeBlackBoxCodegenTest() {
+open class AbstractJvmBoxTest : AbstractFirLightTreeBlackBoxCodegenTest() {
   override fun createKotlinStandardLibrariesPathProvider(): KotlinStandardLibrariesPathProvider {
     return ClasspathBasedStandardLibrariesPathProvider
   }

redacted-compiler-plugin/src/testFixtures/kotlin/dev/zacsweers/redacted/compiler/ClasspathBasedStandardLibrariesPathProvider.kt

@@ -8,7 +8,7 @@ import java.io.File.separator
 import kotlin.text.get
 import org.jetbrains.kotlin.test.services.KotlinStandardLibrariesPathProvider
 
-object ClasspathBasedStandardLibrariesPathProvider : KotlinStandardLibrariesPathProvider() {
+object ClasspathBasedStandardLibrariesPathProvider : KotlinStandardLibrariesPathProvider {
   private val SEP = "\\$separator"
 
   private val GRADLE_DEPENDENCY =

redacted-compiler-plugin/src/testFixtures/kotlin/dev/zacsweers/redacted/compiler/GenerateTests.kt

@@ -10,7 +10,7 @@ fun main() {
       testDataRoot = "redacted-compiler-plugin/testData",
       testsRoot = "redacted-compiler-plugin/test-gen/java",
     ) {
-      testClass<AbstractBoxTest> { model("box") }
+      testClass<AbstractJvmBoxTest> { model("box") }
       testClass<AbstractDiagnosticTest> { model("diagnostic") }
     }
   }

redacted-compiler-plugin/test-gen/java/dev/zacsweers/redacted/compiler/BoxTestGenerated.java → redacted-compiler-plugin/test-gen/java/dev/zacsweers/redacted/compiler/JvmBoxTestGenerated.java

@@ -14,7 +14,7 @@
 @SuppressWarnings("all")
 @TestMetadata("redacted-compiler-plugin/testData/box")
 @TestDataPath("$PROJECT_ROOT")
-public class BoxTestGenerated extends AbstractBoxTest {
+public class JvmBoxTestGenerated extends AbstractJvmBoxTest {
   @Test
   public void testAllFilesPresentInBox() {
     KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("redacted-compiler-plugin/testData/box"), Pattern.compile("^(.+)\\.kt$"), null, true);

sample/build.gradle.kts

@@ -29,10 +29,8 @@ kotlin {
     browser {}
   }
   linuxX64()
-  macosX64()
   macosArm64()
   iosSimulatorArm64()
-  iosX64()
 
   sourceSets {
     commonMain { dependencies { implementation(project(":redacted-compiler-plugin-annotations")) } }