Revert "Remove support for Kotlin 2.0.0-RC2."

This reverts commit 67f8c5b.
touchlab · May 10, 2024 · 58b5df3 · 58b5df3
1 parent b745d16
commit 58b5df3
Show file tree

Hide file tree

Showing 19 changed files with 11 additions and 12 deletions.
diff --git a/...ortCodeSpecPhaseInterceptor.kgp_1.8.20.kt → ...ortCodeSpecPhaseInterceptor.kgp_1.8.20.kt b/...ortCodeSpecPhaseInterceptor.kgp_1.8.20.kt → ...ortCodeSpecPhaseInterceptor.kgp_1.8.20.kt
diff --git a/...uceObjCExportInterfacePhaseInterceptor.kt → ...uceObjCExportInterfacePhaseInterceptor.kt b/...uceObjCExportInterfacePhaseInterceptor.kt → ...uceObjCExportInterfacePhaseInterceptor.kt
diff --git a/...ler.kotlin-plugin.kgp_1.8.20..1.9.20__.kt → ...ler.kotlin-plugin.kgp_1.8.20..1.9.20__.kt b/...ler.kotlin-plugin.kgp_1.8.20..1.9.20__.kt → ...ler.kotlin-plugin.kgp_1.8.20..1.9.20__.kt
diff --git a/...d/konan/objcexport/ObjCNoneExportScope.kt → ...d/konan/objcexport/ObjCNoneExportScope.kt b/...d/konan/objcexport/ObjCNoneExportScope.kt → ...d/konan/objcexport/ObjCNoneExportScope.kt
diff --git a/...ameTypeNamedPhaseInterceptorConfigurer.kt → ...ameTypeNamedPhaseInterceptorConfigurer.kt b/...ameTypeNamedPhaseInterceptorConfigurer.kt → ...ameTypeNamedPhaseInterceptorConfigurer.kt
diff --git a/.../SimpleNamedPhaseInterceptorConfigurer.kt → .../SimpleNamedPhaseInterceptorConfigurer.kt b/.../SimpleNamedPhaseInterceptorConfigurer.kt → .../SimpleNamedPhaseInterceptorConfigurer.kt
diff --git a/.../phaseInterceptorConfigurers.kgp_1.9.0.kt → .../phaseInterceptorConfigurers.kgp_1.9.0.kt b/.../phaseInterceptorConfigurers.kgp_1.9.0.kt → .../phaseInterceptorConfigurers.kgp_1.9.0.kt
diff --git a/...s/UserVisibleIrModulesSupportReflector.kt → ...s/UserVisibleIrModulesSupportReflector.kt b/...s/UserVisibleIrModulesSupportReflector.kt → ...s/UserVisibleIrModulesSupportReflector.kt
diff --git a/...skie/entrypoint/LinkerPhaseInterceptor.kt → ...skie/entrypoint/LinkerPhaseInterceptor.kt b/...skie/entrypoint/LinkerPhaseInterceptor.kt → ...skie/entrypoint/LinkerPhaseInterceptor.kt
diff --git a/...ltable/DummyIrSimpleFunction.kgp_1.9.0.kt → ...ltable/DummyIrSimpleFunction.kgp_1.9.0.kt b/...ltable/DummyIrSimpleFunction.kgp_1.9.0.kt → ...ltable/DummyIrSimpleFunction.kgp_1.9.0.kt
diff --git a/...mpilerinject.interceptor.PhaseInterceptor → ...mpilerinject.interceptor.PhaseInterceptor b/...mpilerinject.interceptor.PhaseInterceptor → ...mpilerinject.interceptor.PhaseInterceptor
diff --git a/...pilerConfigurationAnalytics.kgp_1.9.20.kt → ...pilerConfigurationAnalytics.kgp_1.9.20.kt b/...pilerConfigurationAnalytics.kgp_1.9.20.kt → ...pilerConfigurationAnalytics.kgp_1.9.20.kt
diff --git a/...ableDescriptorExtensionShim.kgp_1.9.20.kt → ...ableDescriptorExtensionShim.kgp_1.9.20.kt b/...ableDescriptorExtensionShim.kgp_1.9.20.kt → ...ableDescriptorExtensionShim.kgp_1.9.20.kt
diff --git a/...ouchlab/skie/shim/IrFactory.kgp_1.9.20.kt → ...ouchlab/skie/shim/IrFactory.kgp_1.9.20.kt b/...ouchlab/skie/shim/IrFactory.kgp_1.9.20.kt → ...ouchlab/skie/shim/IrFactory.kgp_1.9.20.kt
diff --git a/...-compiler/linker-plugin/src/kgp_common/kotlin/co/touchlab/skie/context/MainSkieContext.kt b/...-compiler/linker-plugin/src/kgp_common/kotlin/co/touchlab/skie/context/MainSkieContext.kt
@@ -83,12 +83,11 @@ class MainSkieContext internal constructor(
             BitcodeEmbedding.Mode.MARKER -> SwiftCompilerConfiguration.BitcodeEmbeddingMode.Marker
             BitcodeEmbedding.Mode.NONE, null -> SwiftCompilerConfiguration.BitcodeEmbeddingMode.None
         },
-//         absoluteSwiftcPath = if (KotlinCompilerVersion.current >= KotlinCompilerVersion.`2_0_0`) {
-//             configurables.absoluteTargetToolchain + "/bin/swiftc"
-//         } else {
-//             configurables.absoluteTargetToolchain + "/usr/bin/swiftc"
-//         },
-        absoluteSwiftcPath = configurables.absoluteTargetToolchain + "/usr/bin/swiftc",
+        absoluteSwiftcPath = if (KotlinCompilerVersion.current >= KotlinCompilerVersion.`2_0_0`) {
+            configurables.absoluteTargetToolchain + "/bin/swiftc"
+        } else {
+            configurables.absoluteTargetToolchain + "/usr/bin/swiftc"
+        },
         absoluteTargetSysRootPath = configurables.absoluteTargetSysRoot,
         osVersionMin = configurables.osVersionMin,
     )

diff --git a/.../kgp_common/kotlin/co/touchlab/skie/phases/other/ConfigureSwiftSpecificLinkerArgsPhase.kt b/.../kgp_common/kotlin/co/touchlab/skie/phases/other/ConfigureSwiftSpecificLinkerArgsPhase.kt
@@ -16,11 +16,11 @@ object ConfigureSwiftSpecificLinkerArgsPhase : LinkPhase {
         val swiftLibSearchPaths = listOf(
             File(
                 configurables.absoluteTargetToolchain,
-//                 if (KotlinCompilerVersion.current >= KotlinCompilerVersion.`2_0_0`) {
-//                     "lib/swift/${configurables.platformName().lowercase()}"
-//                 } else {
+                if (KotlinCompilerVersion.current >= KotlinCompilerVersion.`2_0_0`) {
+                    "lib/swift/${configurables.platformName().lowercase()}"
+                } else {
                     "usr/lib/swift/${configurables.platformName().lowercase()}"
-//                 },
+                },
             ),
             File(configurables.absoluteTargetSysRoot, "usr/lib/swift"),
         ).flatMap { listOf("-L", it.absolutePath) }

diff --git a/...b/skie/plugin/shim/LaunchSchedulerImpl.kt → ...b/skie/plugin/shim/LaunchSchedulerImpl.kt b/...b/skie/plugin/shim/LaunchSchedulerImpl.kt → ...b/skie/plugin/shim/LaunchSchedulerImpl.kt
diff --git a/common-gradle/gradle.properties b/common-gradle/gradle.properties
@@ -8,7 +8,7 @@ kotlin.mpp.import.enableKgpDependencyResolution=true
 
 pluginId=co.touchlab.skie
 
-versionSupport.kotlinTooling=1.8.0(1.8.10), 1.8.20(1.8.21, 1.8.22), 1.9.0(1.9.10), 1.9.20(1.9.21, 1.9.22, 1.9.23, 1.9.24)
+versionSupport.kotlinTooling=1.8.0(1.8.10), 1.8.20(1.8.21, 1.8.22), 1.9.0(1.9.10), 1.9.20(1.9.21, 1.9.22, 1.9.23, 1.9.24), 2.0.0[2.0.0-RC1](2.0.0-RC2)
 versionSupport.gradleApi=7.3, 8.0, 8.1
 
 touchlab.key=ABCDEFGHIJKLMNOPQRSTUVWXYZ

diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/SkieTestRunnerConfiguration.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/SkieTestRunnerConfiguration.kt
@@ -13,7 +13,7 @@ object SkieTestRunnerConfiguration {
     val configurations = list<BuildConfiguration>("matrix.configurations")
     val linkModes = list<LinkMode>("matrix.linkModes")
     // TODO Automatically derive from Build-setup
-    val kotlinVersions = list("matrix.kotlinVersions", ::KotlinVersion) ?: listOf("1.8.0", "1.8.20", "1.9.0", "1.9.20").map(::KotlinVersion)
+    val kotlinVersions = list("matrix.kotlinVersions", ::KotlinVersion) ?: listOf("1.8.0", "1.8.20", "1.9.0", "1.9.20", "2.0.0-RC2").map(::KotlinVersion)
     val gradleVersions = list("matrix.gradleVersions", ::GradleVersion) ?: listOf("8.6").map(::GradleVersion)
 
     fun buildMatrixSource(): SkieTestMatrixSource {