Skip to content

Commit

Permalink
release: v2.0.20-0.9.3
Browse files Browse the repository at this point in the history
  • Loading branch information
ForteScarlet committed Oct 8, 2024
1 parent 7ed27cd commit 0886b2d
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 19 deletions.
1 change: 1 addition & 0 deletions .changelog/v2.0.20-0.9.3.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Kotlin version: `v2.0.20`
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/IProject.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -372,7 +371,7 @@ class SuspendTransformFirTransformer(
}

val overriddenAnnotation = firAnnotation(
overriddenFunction, markAnnotation, overriddenFunction.getContainingClassSymbol()
overriddenFunction, markAnnotation, overriddenFunction.getContainingClassSymbol(session)
) ?: return@processOverridden

val overriddenAnnoData = overriddenAnnotation.toTransformAnnotationData(
Expand Down Expand Up @@ -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
}
}
}
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -599,7 +598,7 @@ class SuspendTransformFirTransformer(
val includeAnnotation = buildAnnotation {
argumentMapping = buildAnnotationArgumentMapping()
annotationTypeRef = buildResolvedTypeRef {
coneType = classId.createConeType(session)
type = classId.createConeType(session)
}
}
add(includeAnnotation)
Expand All @@ -624,7 +623,7 @@ class SuspendTransformFirTransformer(
val includeAnnotation = buildAnnotation {
argumentMapping = buildAnnotationArgumentMapping()
annotationTypeRef = buildResolvedTypeRef {
coneType = classId.createConeType(session)
type = classId.createConeType(session)
}
}
add(includeAnnotation)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>)
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
7 changes: 0 additions & 7 deletions kotlin-js-store/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tests/test-js/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/test-jvm/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
Expand Down

0 comments on commit 0886b2d

Please sign in to comment.