Skip to content

Commit 4083a8e

Browse files
eygrabereygraber
authored
Support Kotlin 2.3.0 (#943)
* Support Kotlin 2.3.0 * Update Gradle to 9.2.1
1 parent b0067fe commit 4083a8e

11 files changed

Lines changed: 50 additions & 30 deletions

File tree

‎docs/CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,17 @@ But there is no intent to bump the Ktorfit major version for every KSP update.
2525
Thanks to @eygraber, @martinbirn, @rsicarelli and @haruue for contributing to this release!
2626

2727

28+
# [2.7.0]()
29+
30+
2.7.0 -
31+
========================================
32+
* Supported KSP version: >=2.3.0
33+
* Supported Kotlin version: >=2.3.0
34+
* Ktor version: 3.2.1
35+
36+
## Changed
37+
- Update Kotlin to 2.3.0
38+
2839
# [2.6.4]()
2940

3041
2.6.4 - 2025-07-29

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ coroutines = "1.8.1"
66
detekt = "1.23.8"
77
junit = "4.13.2"
88
kctfork = "0.11.1"
9-
kotlin = "2.2.21"
9+
kotlin = "2.3.0-RC2"
1010
kotlinx = "1.10.1"
1111
kotlinPoet = "2.2.0"
1212
kspVersion = "2.3.3"

‎gradle/wrapper/gradle-wrapper.jar‎

1.83 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

‎gradlew‎

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gradlew.bat‎

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎kotlin-js-store/yarn.lock‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ balanced-match@^1.0.0:
5252
integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
5353

5454
brace-expansion@^2.0.1:
55-
version "2.0.1"
56-
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
57-
integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
55+
version "2.0.2"
56+
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.2.tgz#54fc53237a613d854c7bd37463aad17df87214e7"
57+
integrity sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==
5858
dependencies:
5959
balanced-match "^1.0.0"
6060

@@ -119,9 +119,9 @@ cross-spawn@^7.0.6:
119119
which "^2.0.1"
120120

121121
debug@^4.3.5:
122-
version "4.4.1"
123-
resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.1.tgz#e5a8bc6cbc4c6cd3e64308b0693a3d4fa550189b"
124-
integrity sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==
122+
version "4.4.3"
123+
resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"
124+
integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==
125125
dependencies:
126126
ms "^2.1.3"
127127

@@ -151,9 +151,9 @@ emoji-regex@^9.2.2:
151151
integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
152152

153153
escalade@^3.1.1:
154-
version "3.1.1"
155-
resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
156-
integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
154+
version "3.2.0"
155+
resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
156+
integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
157157

158158
escape-string-regexp@^4.0.0:
159159
version "4.0.0"
@@ -243,16 +243,16 @@ jackspeak@^3.1.2:
243243
"@pkgjs/parseargs" "^0.11.0"
244244

245245
js-yaml@^4.1.0:
246-
version "4.1.0"
247-
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
248-
integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
246+
version "4.1.1"
247+
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.1.tgz#854c292467705b699476e1a2decc0c8a3458806b"
248+
integrity sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==
249249
dependencies:
250250
argparse "^2.0.1"
251251

252-
kotlin-web-helpers@2.1.0:
253-
version "2.1.0"
254-
resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-2.1.0.tgz#6cd4b0f0dc3baea163929c8638155b8d19c55a74"
255-
integrity sha512-NAJhiNB84tnvJ5EQx7iER3GWw7rsTZkX9HVHZpe7E3dDBD/dhTzqgSwNU3MfQjniy2rB04bP24WM9Z32ntUWRg==
252+
kotlin-web-helpers@3.0.0:
253+
version "3.0.0"
254+
resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-3.0.0.tgz#3ed6b48f694f74bb60a737a9d7e2c0e3b29abdb9"
255+
integrity sha512-kdQO4AJQkUPvpLh9aglkXDRyN+CfXO7pKq+GESEnxooBFkQpytLrqZis3ABvmFN1cGw/ZQ/K38u5sRGW+NfBnw==
256256
dependencies:
257257
format-util "^1.0.5"
258258

@@ -288,10 +288,10 @@ minimatch@^9.0.4, minimatch@^9.0.5:
288288
resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
289289
integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
290290

291-
mocha@11.7.1:
292-
version "11.7.1"
293-
resolved "https://registry.yarnpkg.com/mocha/-/mocha-11.7.1.tgz#91948fecd624fb4bd154ed260b7e1ad3910d7c7a"
294-
integrity sha512-5EK+Cty6KheMS/YLPPMJC64g5V61gIR25KsRItHw6x4hEKT6Njp1n9LOlH4gpevuwMVS66SXaBBpg+RWZkza4A==
291+
mocha@11.7.2:
292+
version "11.7.2"
293+
resolved "https://registry.yarnpkg.com/mocha/-/mocha-11.7.2.tgz#3c0079fe5cc2f8ea86d99124debcc42bb1ab22b5"
294+
integrity sha512-lkqVJPmqqG/w5jmmFtiRvtA2jkDyNVUcefFJKb2uyX4dekk8Okgqop3cgbFiaIvj8uCRJVTP5x9dfxGyXm2jvQ==
295295
dependencies:
296296
browser-stdout "^1.3.1"
297297
chokidar "^4.0.1"

‎ktorfit-compiler-plugin/api/ktorfit-compiler-plugin.api‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
public final class de/jensklingenberg/ktorfit/CommonCompilerPluginRegistrar : org/jetbrains/kotlin/compiler/plugin/CompilerPluginRegistrar {
2+
public static final field Companion Lde/jensklingenberg/ktorfit/CommonCompilerPluginRegistrar$Companion;
3+
public static final field PLUGIN_ID Ljava/lang/String;
24
public fun <init> ()V
5+
public fun getPluginId ()Ljava/lang/String;
36
public fun getSupportsK2 ()Z
47
public fun registerExtensions (Lorg/jetbrains/kotlin/compiler/plugin/CompilerPluginRegistrar$ExtensionStorage;Lorg/jetbrains/kotlin/config/CompilerConfiguration;)V
58
}
69

10+
public final class de/jensklingenberg/ktorfit/CommonCompilerPluginRegistrar$Companion {
11+
}
12+
713
public final class de/jensklingenberg/ktorfit/ExampleCommandLineProcessor : org/jetbrains/kotlin/compiler/plugin/CommandLineProcessor {
814
public fun <init> ()V
915
public fun appendList (Lorg/jetbrains/kotlin/config/CompilerConfiguration;Lorg/jetbrains/kotlin/config/CompilerConfigurationKey;Ljava/lang/Object;)V

‎ktorfit-compiler-plugin/src/main/java/de/jensklingenberg/ktorfit/CommonCompilerPluginRegistrar.kt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import org.jetbrains.kotlin.config.CompilerConfiguration
1111
@OptIn(ExperimentalCompilerApi::class)
1212
@AutoService(CompilerPluginRegistrar::class)
1313
class CommonCompilerPluginRegistrar : CompilerPluginRegistrar() {
14+
override val pluginId: String = PLUGIN_ID
15+
1416
override val supportsK2: Boolean
1517
get() = true
1618

@@ -25,4 +27,8 @@ class CommonCompilerPluginRegistrar : CompilerPluginRegistrar() {
2527
KtorfitIrGenerationExtension(DebugLogger(logging, messageCollector)),
2628
)
2729
}
30+
31+
companion object {
32+
const val PLUGIN_ID = "ktorfitPlugin"
33+
}
2834
}

‎ktorfit-compiler-plugin/src/main/java/de/jensklingenberg/ktorfit/ExampleCommandLineProcessor.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.config.CompilerConfigurationKey
1111
@OptIn(ExperimentalCompilerApi::class)
1212
@AutoService(CommandLineProcessor::class) // don't forget!
1313
class ExampleCommandLineProcessor : CommandLineProcessor {
14-
override val pluginId: String = "ktorfitPlugin"
14+
override val pluginId: String = CommonCompilerPluginRegistrar.PLUGIN_ID
1515

1616
override val pluginOptions: Collection<CliOption> =
1717
listOf(

0 commit comments

Comments
 (0)