Skip to content

Commit 3498660

Browse files
authored
Migrate Kotlin to 2.3.0 (#93)
* Migrate Kotlin to 2.3.0 * Fix compiler testings
1 parent 3aac7c3 commit 3498660

File tree

8 files changed

+30
-24
lines changed

8 files changed

+30
-24
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ It’s **strongly recommended to use the exact same Kotlin version** as this lib
192192

193193
| Stability Analyzer | Kotlin |
194194
|--------------------|-------------|
195+
| 0.6.5+ | 2.3.0 |
195196
| 0.4.0~0.6.4 | 2.2.21 |
196197

197198
### TraceRecomposition Annotation

compiler-tests/src/test/kotlin/com/skydoves/compose/stability/compiler/tests/GenerateTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package com.skydoves.compose.stability.compiler.tests
1717

18-
import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5
18+
import org.jetbrains.kotlin.generators.dsl.junit5.generateTestGroupSuiteWithJUnit5
1919

2020
/**
2121
* Main function to generate test classes from test data files.

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
compiler = "1.5.15"
33
junit = "4.13.2"
4-
kotlin = "2.2.21"
4+
kotlin = "2.3.0"
55
dokka = "2.1.0"
66
jvmTarget = "17"
77
kotlinxCollectionsImmutable = "0.4.0"

kotlin-js-store/yarn.lock

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -699,10 +699,10 @@ engine.io@~6.6.0:
699699
engine.io-parser "~5.2.1"
700700
ws "~8.17.1"
701701

702-
enhanced-resolve@^5.17.2:
703-
version "5.18.3"
704-
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz#9b5f4c5c076b8787c78fe540392ce76a88855b44"
705-
integrity sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==
702+
enhanced-resolve@^5.17.3:
703+
version "5.18.4"
704+
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.4.tgz#c22d33055f3952035ce6a144ce092447c525f828"
705+
integrity sha512-LgQMM4WXU3QI+SYgEc2liRgznaD5ojbmY3sb8LxyguVkIg5FxdpTkvk72te2R38/TGKxH634oLxXRGY6d7AP+Q==
706706
dependencies:
707707
graceful-fs "^4.2.4"
708708
tapable "^2.2.0"
@@ -1216,10 +1216,9 @@ [email protected]:
12161216
minimatch "^9.0.3"
12171217
webpack-merge "^4.1.5"
12181218

1219-
1219+
"karma@github:Kotlin/karma#6.4.5":
12201220
version "6.4.4"
1221-
resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.4.tgz#dfa5a426cf5a8b53b43cd54ef0d0d09742351492"
1222-
integrity sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w==
1221+
resolved "https://codeload.github.com/Kotlin/karma/tar.gz/239a8fc984584f0d96b1dd750e7a5e2c79da93a6"
12231222
dependencies:
12241223
"@colors/colors" "1.5.0"
12251224
body-parser "^1.19.0"
@@ -1251,10 +1250,10 @@ kind-of@^6.0.2:
12511250
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
12521251
integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
12531252

1254-
kotlin-web-helpers@2.1.0:
1255-
version "2.1.0"
1256-
resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-2.1.0.tgz#6cd4b0f0dc3baea163929c8638155b8d19c55a74"
1257-
integrity sha512-NAJhiNB84tnvJ5EQx7iER3GWw7rsTZkX9HVHZpe7E3dDBD/dhTzqgSwNU3MfQjniy2rB04bP24WM9Z32ntUWRg==
1253+
kotlin-web-helpers@3.0.0:
1254+
version "3.0.0"
1255+
resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-3.0.0.tgz#3ed6b48f694f74bb60a737a9d7e2c0e3b29abdb9"
1256+
integrity sha512-kdQO4AJQkUPvpLh9aglkXDRyN+CfXO7pKq+GESEnxooBFkQpytLrqZis3ABvmFN1cGw/ZQ/K38u5sRGW+NfBnw==
12581257
dependencies:
12591258
format-util "^1.0.5"
12601259

@@ -1369,10 +1368,10 @@ mkdirp@^0.5.5:
13691368
dependencies:
13701369
minimist "^1.2.6"
13711370

1372-
1373-
version "11.7.1"
1374-
resolved "https://registry.yarnpkg.com/mocha/-/mocha-11.7.1.tgz#91948fecd624fb4bd154ed260b7e1ad3910d7c7a"
1375-
integrity sha512-5EK+Cty6KheMS/YLPPMJC64g5V61gIR25KsRItHw6x4hEKT6Njp1n9LOlH4gpevuwMVS66SXaBBpg+RWZkza4A==
1371+
1372+
version "11.7.2"
1373+
resolved "https://registry.yarnpkg.com/mocha/-/mocha-11.7.2.tgz#3c0079fe5cc2f8ea86d99124debcc42bb1ab22b5"
1374+
integrity sha512-lkqVJPmqqG/w5jmmFtiRvtA2jkDyNVUcefFJKb2uyX4dekk8Okgqop3cgbFiaIvj8uCRJVTP5x9dfxGyXm2jvQ==
13761375
dependencies:
13771376
browser-stdout "^1.3.1"
13781377
chokidar "^4.0.1"
@@ -2027,10 +2026,10 @@ webpack-sources@^3.3.3:
20272026
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.3.3.tgz#d4bf7f9909675d7a070ff14d0ef2a4f3c982c723"
20282027
integrity sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg==
20292028

2030-
webpack@5.100.2:
2031-
version "5.100.2"
2032-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.100.2.tgz#e2341facf9f7de1d702147c91bcb65b693adf9e8"
2033-
integrity sha512-QaNKAvGCDRh3wW1dsDjeMdDXwZm2vqq3zn6Pvq4rHOEOGSaUMgOOjG2Y9ZbIGzpfkJk9ZYTHpDqgDfeBDcnLaw==
2029+
webpack@5.101.3:
2030+
version "5.101.3"
2031+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.101.3.tgz#3633b2375bb29ea4b06ffb1902734d977bc44346"
2032+
integrity sha512-7b0dTKR3Ed//AD/6kkx/o7duS8H3f1a4w3BYpIriX4BzIhjkn4teo05cptsxvLesHFKK5KObnadmCHBwGc+51A==
20342033
dependencies:
20352034
"@types/eslint-scope" "^3.7.7"
20362035
"@types/estree" "^1.0.8"
@@ -2042,7 +2041,7 @@ [email protected]:
20422041
acorn-import-phases "^1.0.3"
20432042
browserslist "^4.24.0"
20442043
chrome-trace-event "^1.0.2"
2045-
enhanced-resolve "^5.17.2"
2044+
enhanced-resolve "^5.17.3"
20462045
es-module-lexer "^1.2.1"
20472046
eslint-scope "5.1.1"
20482047
events "^3.2.0"

stability-compiler/api/stability-compiler.api

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public final class com/skydoves/compose/stability/compiler/StabilityAnalyzerIrGe
116116

117117
public final class com/skydoves/compose/stability/compiler/StabilityAnalyzerPluginRegistrar : org/jetbrains/kotlin/compiler/plugin/CompilerPluginRegistrar {
118118
public fun <init> ()V
119-
public final fun getPluginId ()Ljava/lang/String;
119+
public fun getPluginId ()Ljava/lang/String;
120120
public fun getSupportsK2 ()Z
121121
public fun registerExtensions (Lorg/jetbrains/kotlin/compiler/plugin/CompilerPluginRegistrar$ExtensionStorage;Lorg/jetbrains/kotlin/config/CompilerConfiguration;)V
122122
}

stability-compiler/src/main/kotlin/com/skydoves/compose/stability/compiler/StabilityAnalyzerPluginRegistrar.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class StabilityAnalyzerPluginRegistrar : CompilerPluginRegistrar() {
2626

2727
override val supportsK2: Boolean = true
2828

29-
public val pluginId: String = StabilityAnalyzerCommandLineProcessor.PLUGIN_ID
29+
override val pluginId: String = StabilityAnalyzerCommandLineProcessor.PLUGIN_ID
3030

3131
override fun ExtensionStorage.registerExtensions(configuration: CompilerConfiguration) {
3232
val enabled = configuration.get(StabilityAnalyzerConfigurationKeys.KEY_ENABLED, true)

stability-gradle/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ dependencies {
3838
tasks.withType<KotlinCompile> {
3939
compilerOptions {
4040
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
41+
apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
42+
languageVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
4143
}
4244
}
4345

stability-lint/src/test/kotlin/com/skydoves/compose/stability/lint/TraceRecompositionDetectorTest.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ class TraceRecompositionDetectorTest : LintDetectorTest() {
7171
""",
7272
).indented(),
7373
)
74+
.allowMissingSdk()
7475
.run()
7576
.expect(
7677
"""
@@ -103,6 +104,7 @@ class TraceRecompositionDetectorTest : LintDetectorTest() {
103104
""",
104105
).indented(),
105106
)
107+
.allowMissingSdk()
106108
.run()
107109
.expectClean()
108110
}
@@ -128,6 +130,7 @@ class TraceRecompositionDetectorTest : LintDetectorTest() {
128130
""",
129131
).indented(),
130132
)
133+
.allowMissingSdk()
131134
.run()
132135
.expectClean()
133136
}
@@ -148,6 +151,7 @@ class TraceRecompositionDetectorTest : LintDetectorTest() {
148151
""",
149152
).indented(),
150153
)
154+
.allowMissingSdk()
151155
.run()
152156
.expectClean()
153157
}

0 commit comments

Comments
 (0)