release: v2.0.20-0.9.3

ForteScarlet · ForteScarlet · commit 0886b2d4a232 · 2024-10-08T16:44:57.000+08:00
diff --git a/.changelog/v2.0.20-0.9.3.md b/.changelog/v2.0.20-0.9.3.md
@@ -0,0 +1 @@
+Kotlin version: `v2.0.20`
diff --git a/buildSrc/src/main/kotlin/IProject.kt b/buildSrc/src/main/kotlin/IProject.kt
@@ -10,7 +10,7 @@ object IProject : ProjectDetail() {
     const val HOMEPAGE = "https://github.com/ForteScarlet/kotlin-suspend-transform-compiler-plugin"
 
     // Remember the libs.versions.toml!
-    val ktVersion = "2.1.0-Beta1"
+    val ktVersion = "2.0.20"
     val pluginVersion = "0.9.3"
 
     override val version: String = "$ktVersion-$pluginVersion"
diff --git a/compiler/suspend-transform-plugin/src/main/kotlin/love/forte/plugin/suspendtrans/fir/SuspendTransformFirTransformer.kt b/compiler/suspend-transform-plugin/src/main/kotlin/love/forte/plugin/suspendtrans/fir/SuspendTransformFirTransformer.kt
@@ -36,7 +36,6 @@ import org.jetbrains.kotlin.fir.plugin.createConeType
 import org.jetbrains.kotlin.fir.resolve.ScopeSession
 import org.jetbrains.kotlin.fir.resolve.SessionHolderImpl
 import org.jetbrains.kotlin.fir.resolve.getSuperTypes
-import org.jetbrains.kotlin.fir.resolve.toRegularClassSymbol
 import org.jetbrains.kotlin.fir.resolve.transformers.ReturnTypeCalculatorForFullBodyResolve
 import org.jetbrains.kotlin.fir.scopes.impl.FirClassDeclaredMemberScope
 import org.jetbrains.kotlin.fir.scopes.processAllFunctions
@@ -372,7 +371,7 @@ class SuspendTransformFirTransformer(
                     }
 
                     val overriddenAnnotation = firAnnotation(
-                        overriddenFunction, markAnnotation, overriddenFunction.getContainingClassSymbol()
+                        overriddenFunction, markAnnotation, overriddenFunction.getContainingClassSymbol(session)
                     ) ?: return@processOverridden
 
                     val overriddenAnnoData = overriddenAnnotation.toTransformAnnotationData(
@@ -501,11 +500,11 @@ class SuspendTransformFirTransformer(
         return if (resultConeType is ConeErrorType) {
             buildErrorTypeRef {
                 diagnostic = resultConeType.diagnostic
-                coneType = resultConeType
+                type = resultConeType
             }
         } else {
             buildResolvedTypeRef {
-                coneType = resultConeType
+                type = resultConeType
             }
         }
     }
@@ -564,7 +563,7 @@ class SuspendTransformFirTransformer(
                 val copied = notCompileAnnotationsCopied.map { a ->
                     buildAnnotation {
                         annotationTypeRef = buildResolvedTypeRef {
-                            coneType = a.resolvedType
+                            type = a.resolvedType
                         }
                         this.typeArguments.addAll(a.typeArguments)
                         this.argumentMapping = buildAnnotationArgumentMapping {
@@ -599,7 +598,7 @@ class SuspendTransformFirTransformer(
                 val includeAnnotation = buildAnnotation {
                     argumentMapping = buildAnnotationArgumentMapping()
                     annotationTypeRef = buildResolvedTypeRef {
-                        coneType = classId.createConeType(session)
+                        type = classId.createConeType(session)
                     }
                 }
                 add(includeAnnotation)
@@ -624,7 +623,7 @@ class SuspendTransformFirTransformer(
                     val includeAnnotation = buildAnnotation {
                         argumentMapping = buildAnnotationArgumentMapping()
                         annotationTypeRef = buildResolvedTypeRef {
-                            coneType = classId.createConeType(session)
+                            type = classId.createConeType(session)
                         }
                     }
                     add(includeAnnotation)
diff --git a/compiler/suspend-transform-plugin/src/testData/codegen/opt.fir.ir.txt b/compiler/suspend-transform-plugin/src/testData/codegen/opt.fir.ir.txt
@@ -102,7 +102,7 @@ FILE fqName:<root> fileName:/Main.kt
                       $this: GET_VAR '<this>: <root>.OptInTest declared in <root>.OptInTest.runBlocking' type=<root>.OptInTest origin=null
     FUN name:run visibility:public modality:FINAL <> ($this:<root>.OptInTest) returnType:kotlin.Int [suspend]
       annotations:
-        OptIn(markerClass = [CLASS_REFERENCE 'CLASS ANNOTATION_CLASS name:OneOptAnno modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass<<root>.OneOptAnno>] type=kotlin.Array<out kotlin.reflect.KClass<out kotlin.Annotation>> varargElementType=kotlin.reflect.KClass<out kotlin.Annotation>)
+        OptIn(markerClass = [CLASS_REFERENCE 'CLASS ANNOTATION_CLASS name:OneOptAnno modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass<<root>.OneOptAnno>])
         Values(target = CLASS_REFERENCE 'CLASS CLASS name:OptInTest modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass<<root>.OptInTest>)
         JvmBlocking(baseName = <null>, suffix = <null>, asProperty = <null>)
         JvmAsync(baseName = <null>, suffix = <null>, asProperty = <null>)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ kotlinx-coroutines = "1.8.0"
 kotlinx-serialization = "1.7.1"
 google-auto-service = "1.0.1"
 # Remember the `IProject.ktVersion`!
-kotlin = "2.1.0-Beta1"
+kotlin = "2.0.20"
 
 [libraries]
 
diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
@@ -1159,13 +1159,6 @@ kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
-kotlin-web-helpers@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmmirror.com/kotlin-web-helpers/-/kotlin-web-helpers-2.0.0.tgz#b112096b273c1e733e0b86560998235c09a19286"
-  integrity sha512-xkVGl60Ygn/zuLkDPx+oHj7jeLR7hCvoNF99nhwXMn8a3ApB4lLiC9pk4ol4NHPjyoCbvQctBqvzUcp8pkqyWw==
-  dependencies:
-    format-util "^1.0.5"
-
 loader-runner@^4.2.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
diff --git a/tests/test-js/build.gradle.kts b/tests/test-js/build.gradle.kts
@@ -15,7 +15,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("love.forte.plugin.suspend-transform:suspend-transform-plugin-gradle:2.1.0-Beta1-0.9.3")
+        classpath("love.forte.plugin.suspend-transform:suspend-transform-plugin-gradle:2.0.20-0.9.3")
         classpath("org.jetbrains.kotlin:kotlin-compiler:2.1.0-Beta1")
     }
 }
diff --git a/tests/test-jvm/build.gradle.kts b/tests/test-jvm/build.gradle.kts
@@ -19,7 +19,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("love.forte.plugin.suspend-transform:suspend-transform-plugin-gradle:2.1.0-Beta1-0.9.3")
+        classpath("love.forte.plugin.suspend-transform:suspend-transform-plugin-gradle:2.0.20-0.9.3")
         classpath("org.jetbrains.kotlin:kotlin-compiler:2.1.0-Beta1")
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ import org.jetbrains.kotlin.fir.plugin.createConeType`
`36`	`36`	`import org.jetbrains.kotlin.fir.resolve.ScopeSession`
`37`	`37`	`import org.jetbrains.kotlin.fir.resolve.SessionHolderImpl`
`38`	`38`	`import org.jetbrains.kotlin.fir.resolve.getSuperTypes`
`39`		`-import org.jetbrains.kotlin.fir.resolve.toRegularClassSymbol`
`40`	`39`	`import org.jetbrains.kotlin.fir.resolve.transformers.ReturnTypeCalculatorForFullBodyResolve`
`41`	`40`	`import org.jetbrains.kotlin.fir.scopes.impl.FirClassDeclaredMemberScope`
`42`	`41`	`import org.jetbrains.kotlin.fir.scopes.processAllFunctions`
`@@ -372,7 +371,7 @@ class SuspendTransformFirTransformer(`
`372`	`371`	`}`
`373`	`372`
`374`	`373`	`val overriddenAnnotation = firAnnotation(`
`375`		`- overriddenFunction, markAnnotation, overriddenFunction.getContainingClassSymbol()`
	`374`	`+ overriddenFunction, markAnnotation, overriddenFunction.getContainingClassSymbol(session)`
`376`	`375`	`) ?: return@processOverridden`
`377`	`376`
`378`	`377`	`val overriddenAnnoData = overriddenAnnotation.toTransformAnnotationData(`
`@@ -501,11 +500,11 @@ class SuspendTransformFirTransformer(`
`501`	`500`	`return if (resultConeType is ConeErrorType) {`
`502`	`501`	`buildErrorTypeRef {`
`503`	`502`	`diagnostic = resultConeType.diagnostic`
`504`		`- coneType = resultConeType`
	`503`	`+ type = resultConeType`
`505`	`504`	`}`
`506`	`505`	`} else {`
`507`	`506`	`buildResolvedTypeRef {`
`508`		`- coneType = resultConeType`
	`507`	`+ type = resultConeType`
`509`	`508`	`}`
`510`	`509`	`}`
`511`	`510`	`}`
`@@ -564,7 +563,7 @@ class SuspendTransformFirTransformer(`
`564`	`563`	`val copied = notCompileAnnotationsCopied.map { a ->`
`565`	`564`	`buildAnnotation {`
`566`	`565`	`annotationTypeRef = buildResolvedTypeRef {`
`567`		`- coneType = a.resolvedType`
	`566`	`+ type = a.resolvedType`
`568`	`567`	`}`
`569`	`568`	`this.typeArguments.addAll(a.typeArguments)`
`570`	`569`	`this.argumentMapping = buildAnnotationArgumentMapping {`
`@@ -599,7 +598,7 @@ class SuspendTransformFirTransformer(`
`599`	`598`	`val includeAnnotation = buildAnnotation {`
`600`	`599`	`argumentMapping = buildAnnotationArgumentMapping()`
`601`	`600`	`annotationTypeRef = buildResolvedTypeRef {`
`602`		`- coneType = classId.createConeType(session)`
	`601`	`+ type = classId.createConeType(session)`
`603`	`602`	`}`
`604`	`603`	`}`
`605`	`604`	`add(includeAnnotation)`
`@@ -624,7 +623,7 @@ class SuspendTransformFirTransformer(`
`624`	`623`	`val includeAnnotation = buildAnnotation {`
`625`	`624`	`argumentMapping = buildAnnotationArgumentMapping()`
`626`	`625`	`annotationTypeRef = buildResolvedTypeRef {`
`627`		`- coneType = classId.createConeType(session)`
	`626`	`+ type = classId.createConeType(session)`
`628`	`627`	`}`
`629`	`628`	`}`
`630`	`629`	`add(includeAnnotation)`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ buildscript {`
`15`	`15`	`mavenCentral()`
`16`	`16`	`}`
`17`	`17`	`dependencies {`
`18`		`- classpath("love.forte.plugin.suspend-transform:suspend-transform-plugin-gradle:2.1.0-Beta1-0.9.3")`
	`18`	`+ classpath("love.forte.plugin.suspend-transform:suspend-transform-plugin-gradle:2.0.20-0.9.3")`
`19`	`19`	`classpath("org.jetbrains.kotlin:kotlin-compiler:2.1.0-Beta1")`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ buildscript {`
`19`	`19`	`mavenCentral()`
`20`	`20`	`}`
`21`	`21`	`dependencies {`
`22`		`- classpath("love.forte.plugin.suspend-transform:suspend-transform-plugin-gradle:2.1.0-Beta1-0.9.3")`
	`22`	`+ classpath("love.forte.plugin.suspend-transform:suspend-transform-plugin-gradle:2.0.20-0.9.3")`
`23`	`23`	`classpath("org.jetbrains.kotlin:kotlin-compiler:2.1.0-Beta1")`
`24`	`24`	`}`
`25`	`25`	`}`