Kotlin 2.1.0

build.gradle.kts

@@ -18,7 +18,7 @@ buildscript {
 
 allprojects {
     group = "com.rickclephas.kmp"
-    version = "1.0.0-ALPHA-37"
+    version = "1.0.0-ALPHA-37-kotlin-2.1.0-RC2"
 
     repositories {
         mavenCentral()

gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
-kotlin = "2.0.21"
+kotlin = "2.1.0"
 kotlinx-coroutines = "1.9.0"
 kotlinx-binary-compatibility-validator = "0.16.3"
-ksp = "2.0.21-1.0.28"
+ksp = "2.1.0-1.0.28"
 kotlinpoet = "1.18.1"
 junit = "5.9.1"
 
@@ -23,7 +23,7 @@ kotlin-script-runtime = { module = "org.jetbrains.kotlin:kotlin-script-runtime",
 kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
 kotlin-compiler-internalTestFramework = { module = "org.jetbrains.kotlin:kotlin-compiler-internal-test-framework", version.ref = "kotlin" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
-kotlinCompileTesting-ksp = { module = "dev.zacsweers.kctfork:ksp", version = "0.3.2" }
+kotlinCompileTesting-ksp = { module = "dev.zacsweers.kctfork:ksp", version = "0.5.1" }
 junit = { module = "junit:junit", version = "4.13.2" }
 junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter" }

kmp-nativecoroutines-compiler/src/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/Annotations.kt

@@ -37,7 +37,7 @@ internal fun buildAnnotation(
     arguments: Map<Name, FirExpression> = emptyMap()
 ) = buildAnnotation {
     annotationTypeRef = buildResolvedTypeRef {
-        type = classId.constructClassLikeType()
+        coneType = classId.constructClassLikeType()
     }
     argumentMapping = buildAnnotationArgumentMapping {
         mapping.putAll(arguments)

kmp-nativecoroutines-compiler/src/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/StateFlowValue.kt

@@ -64,7 +64,7 @@ internal fun FirExtension.buildStateFlowValueProperty(
 
         returnTypeRef = firCallableSignature.getNativeType(callableSignature.returnType.valueType)
             .applyIf(callableSignature.returnType.isNullable) {
-                withNullability(ConeNullability.NULLABLE, session.typeContext)
+                withNullability(true, session.typeContext)
             }
             .let(typeParameters.substitutor::substituteOrSelf)
             .toFirResolvedTypeRef()

kmp-nativecoroutines-compiler/src/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/extensions/KmpNativeCoroutinesDeclarationGenerationExtension.kt

@@ -5,8 +5,6 @@ import com.rickclephas.kmp.nativecoroutines.compiler.fir.codegen.buildNativeFunc
 import com.rickclephas.kmp.nativecoroutines.compiler.fir.codegen.buildNativeProperty
 import com.rickclephas.kmp.nativecoroutines.compiler.fir.codegen.buildSharedFlowReplayCacheProperty
 import com.rickclephas.kmp.nativecoroutines.compiler.fir.codegen.buildStateFlowValueProperty
-import com.rickclephas.kmp.nativecoroutines.compiler.fir.utils.getFunctionSymbols
-import com.rickclephas.kmp.nativecoroutines.compiler.fir.utils.getPropertySymbols
 import com.rickclephas.kmp.nativecoroutines.compiler.utils.NativeCoroutinesAnnotation
 import com.rickclephas.kmp.nativecoroutines.compiler.utils.NativeCoroutinesAnnotation.NativeCoroutines
 import com.rickclephas.kmp.nativecoroutines.compiler.utils.NativeCoroutinesAnnotation.NativeCoroutinesIgnore
@@ -23,6 +21,9 @@ import org.jetbrains.kotlin.fir.declarations.utils.isOverride
 import org.jetbrains.kotlin.fir.extensions.*
 import org.jetbrains.kotlin.fir.extensions.predicate.LookupPredicate
 import org.jetbrains.kotlin.fir.resolve.providers.symbolProvider
+import org.jetbrains.kotlin.fir.scopes.getFunctions
+import org.jetbrains.kotlin.fir.scopes.getProperties
+import org.jetbrains.kotlin.fir.scopes.impl.declaredMemberScope
 import org.jetbrains.kotlin.fir.symbols.impl.*
 import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.Name
@@ -109,6 +110,7 @@ internal class KmpNativeCoroutinesDeclarationGenerationExtension(
         context: MemberGenerationContext?
     ): List<FirNamedFunctionSymbol> = buildList {
         generateFunctions(
+            context?.owner,
             callableId, suffix,
             setOf(NativeCoroutines, NativeCoroutinesRefined)
         ) { symbol, annotation ->
@@ -117,13 +119,17 @@ internal class KmpNativeCoroutinesDeclarationGenerationExtension(
     }
 
     private fun MutableList<FirNamedFunctionSymbol>.generateFunctions(
+        owner: FirClassSymbol<*>?,
         callableId: CallableId,
         suffix: String?,
         annotations: Set<NativeCoroutinesAnnotation>,
         generateFunction: (FirNamedFunctionSymbol, NativeCoroutinesAnnotation) -> FirNamedFunctionSymbol?
     ) {
         val originalCallableName = callableId.callableName.withoutSuffix(suffix) ?: return
-        val symbols = session.symbolProvider.getFunctionSymbols(callableId.copy(originalCallableName))
+        val symbols = when (owner) {
+            null -> session.symbolProvider.getTopLevelFunctionSymbols(callableId.packageName, originalCallableName)
+            else -> owner.declaredMemberScope(session, null).getFunctions(originalCallableName)
+        }
         for (symbol in symbols) {
             val annotation = getAnnotationForSymbol(symbol) ?: continue
             if (annotation !in annotations) continue
@@ -136,30 +142,35 @@ internal class KmpNativeCoroutinesDeclarationGenerationExtension(
         context: MemberGenerationContext?
     ): List<FirPropertySymbol> = buildList {
         generateProperties(
+            context?.owner,
             callableId, suffix,
             setOf(NativeCoroutines, NativeCoroutinesRefined)
         ) { symbol, annotation ->
             buildNativeProperty(callableId, symbol, annotation, objCName = symbol.name.identifier)
         }
         generateProperties(
+            context?.owner,
             callableId, flowValueSuffix,
             setOf(NativeCoroutines, NativeCoroutinesRefined)
         ) { symbol, annotation ->
             buildStateFlowValueProperty(callableId, symbol, annotation, objCNameSuffix = flowValueSuffix)
         }
         generateProperties(
+            context?.owner,
             callableId, flowReplayCacheSuffix,
             setOf(NativeCoroutines, NativeCoroutinesRefined)
         ) { symbol, annotation ->
             buildSharedFlowReplayCacheProperty(callableId, symbol, annotation, flowReplayCacheSuffix)
         }
         generateProperties(
+            context?.owner,
             callableId, stateSuffix,
             setOf(NativeCoroutinesState, NativeCoroutinesRefinedState)
         ) { symbol, annotation ->
             buildStateFlowValueProperty(callableId, symbol, annotation, objCName = symbol.name.identifier)
         }
         generateProperties(
+            context?.owner,
             callableId, stateFlowSuffix,
             setOf(NativeCoroutinesState, NativeCoroutinesRefinedState)
         ) { symbol, annotation ->
@@ -168,13 +179,18 @@ internal class KmpNativeCoroutinesDeclarationGenerationExtension(
     }
 
     private fun MutableList<FirPropertySymbol>.generateProperties(
+        owner: FirClassSymbol<*>?,
         callableId: CallableId,
         suffix: String?,
         annotations: Set<NativeCoroutinesAnnotation>,
         generateProperty: (FirPropertySymbol, NativeCoroutinesAnnotation) -> FirPropertySymbol?
     ) {
         val originalCallableName = callableId.callableName.withoutSuffix(suffix) ?: return
-        val symbols = session.symbolProvider.getPropertySymbols(callableId.copy(originalCallableName))
+        val symbols = when (owner) {
+            null -> session.symbolProvider.getTopLevelPropertySymbols(callableId.packageName, originalCallableName)
+            else -> owner.declaredMemberScope(session, null)
+                .getProperties(originalCallableName).filterIsInstance<FirPropertySymbol>()
+        }
         for (symbol in symbols) {
             val annotation = getAnnotationForSymbol(symbol) ?: continue
             if (annotation !in annotations) continue

kmp-nativecoroutines-compiler/src/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/utils/FirCallableSignature.kt

@@ -49,7 +49,7 @@ internal class FirCallableSignature(
 }
 
 internal fun FirCallableSymbol<*>.getCallableSignature(session: FirSession): FirCallableSignature? {
-    val returnType = resolvedReturnTypeRefOrNull?.type?.fullyExpandedType(session) ?: return null
+    val returnType = resolvedReturnTypeRefOrNull?.coneType?.fullyExpandedType(session) ?: return null
     return FirCallableSignature(session) {
         val valueParameters = when (this@getCallableSignature) {
             is FirFunctionSymbol<*> -> valueParameterSymbols.map {
@@ -94,8 +94,8 @@ private fun FirCallableSignature.Builder.createType(rawType: ConeKotlinType): Ca
     return rawType.asRawType()
 }
 
-private val ConeKotlinType.flowValueType: ConeKotlinType
+private val ConeClassLikeType.flowValueType: ConeKotlinType
     get() = when (val argument = typeArguments.firstOrNull()) {
         is ConeKotlinTypeProjection -> argument.type
-        is ConeStarProjection, null -> StandardClassIds.Any.constructClassLikeType(isNullable = true)
+        is ConeStarProjection, null -> StandardClassIds.Any.constructClassLikeType(isMarkedNullable = true)
     }

kmp-nativecoroutines-compiler/src/test/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/runners/AbstractFirBaseCodegenTest.kt

@@ -41,8 +41,8 @@ import org.junit.jupiter.api.BeforeAll
 
 abstract class AbstractFirBaseCodegenTest(
     private val firParser: FirParser
-): AbstractJvmBlackBoxCodegenTestBase<FirOutputArtifact, IrBackendInput>(
-    FrontendKinds.FIR, TargetBackend.JVM_IR
+): AbstractJvmBlackBoxCodegenTestBase<FirOutputArtifact>(
+    FrontendKinds.FIR
 ) {
 
     companion object {
@@ -61,8 +61,6 @@ abstract class AbstractFirBaseCodegenTest(
         get() = ::FirFrontendFacade
     final override val frontendToBackendConverter: Constructor<Frontend2BackendConverter<FirOutputArtifact, IrBackendInput>>
         get() = ::Fir2IrResultsConverter
-    final override val backendFacade: Constructor<BackendFacade<IrBackendInput, BinaryArtifacts.Jvm>>
-        get() = ::JvmIrBackendFacade
 
     override fun configure(builder: TestConfigurationBuilder) = with(builder) {
         super.configure(builder)