Skip to content

Commit 60d2780

Browse files
feat!: upgrade to Kotlin 2.0
1 parent 79e9f10 commit 60d2780

File tree

22 files changed

+58
-89
lines changed

22 files changed

+58
-89
lines changed

.editorconfig

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ max_line_length = off
1919
[.editorconfig]
2020
max_line_length = off
2121

22-
[*.{json,yml,toml,xml}]
22+
[*.toml]
23+
max_line_length = off
24+
indent_size = 2
25+
26+
[*.{json,yml,xml}]
2327
indent_size = 2
2428

2529
# noinspection EditorConfigKeyCorrectness

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
* text eol=lf
1+
* text=auto eol=lf
22

33
gradlew linguist-generated
44
gradlew.bat linguist-generated eol=crlf

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ updates:
1515
- package-ecosystem: gradle
1616
directory: /
1717
schedule:
18-
interval: monthly
18+
interval: weekly
1919
day: saturday
2020
commit-message:
2121
prefix: build

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ dependency-graph-reports/
55
local.properties
66

77
### Kotlin ###
8+
.kotlin/
89
kotlin-js-store/
910

1011
### JetBrains ###

.idea/vcs.xml

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

build.gradle.kts

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
22
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
3-
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnLockMismatchReport
4-
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin
5-
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
63

74
plugins {
85
alias(libs.plugins.kotlin.mpp) apply false
@@ -32,14 +29,6 @@ plugins.withType<NodeJsRootPlugin> {
3229
the<NodeJsRootExtension>().download = false
3330
}
3431

35-
plugins.withType<YarnPlugin> {
36-
the<YarnRootExtension>().apply {
37-
download = false
38-
yarnLockAutoReplace = true
39-
yarnLockMismatchReport = YarnLockMismatchReport.WARNING
40-
}
41-
}
42-
4332
tasks.dokkaHtmlMultiModule {
4433
moduleName.set("KBigInt")
4534
includes.from("README.md")
@@ -52,6 +41,6 @@ tasks.dokkaHtmlMultiModule {
5241
}
5342

5443
tasks.wrapper {
55-
gradleVersion = "8.7"
44+
gradleVersion = "8.10"
5645
distributionType = Wrapper.DistributionType.BIN
5746
}

gradle.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# The version of the project.
2-
project.version=0.3.1
2+
project.version=0.4.0
33

44
# Specifies the JVM arguments used for the daemon process.
55
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
@@ -16,6 +16,8 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
1616
kotlin.mpp.enableCInteropCommonization=true
1717
# Ignore disabled Kotlin/Native targets
1818
kotlin.native.ignoreDisabledTargets=true
19+
# Use npm instead of yarn
20+
kotlin.js.yarn=false
1921

2022
# Enables the AndroidX package structure.
2123
android.useAndroidX=true

gradle/libs.versions.toml

Lines changed: 14 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,17 @@
11
[versions]
2-
kotlin-stdlib = "1.9.23"
3-
kotlin-serialization = "1.6.3"
4-
#noinspection GradleDependency
5-
android-gradle = {strictly = "8.2.0"}
2+
kotlin-stdlib = "2.0.20"
3+
kotlin-serialization = "1.7.2"
4+
android-gradle = {strictly = "8.5.2"}
65
dokka = "1.9.20"
76

8-
[libraries.kotlin-stdlib]
9-
module = "org.jetbrains.kotlin:kotlin-stdlib"
10-
version.ref = "kotlin-stdlib"
11-
12-
[libraries.kotlin-serialization-core]
13-
module = "org.jetbrains.kotlinx:kotlinx-serialization-core"
14-
version.ref = "kotlin-serialization"
15-
16-
[libraries.kotlin-serialization-json]
17-
module = "org.jetbrains.kotlinx:kotlinx-serialization-json"
18-
version.ref = "kotlin-serialization"
19-
20-
[libraries.kotlin-test]
21-
module = "org.jetbrains.kotlin:kotlin-test"
22-
version.ref = "kotlin-stdlib"
23-
24-
[plugins.kotlin-mpp]
25-
id = "org.jetbrains.kotlin.multiplatform"
26-
version.ref = "kotlin-stdlib"
27-
28-
[plugins.kotlin-serialization]
29-
id = "org.jetbrains.kotlin.plugin.serialization"
30-
version.ref = "kotlin-stdlib"
31-
32-
[plugins.android-library]
33-
id = "com.android.library"
34-
version.ref = "android-gradle"
35-
36-
[plugins.dokka]
37-
id = "org.jetbrains.dokka"
38-
version.ref = "dokka"
7+
[libraries]
8+
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin-stdlib" }
9+
kotlin-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlin-serialization" }
10+
kotlin-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlin-serialization" }
11+
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin-stdlib" }
12+
13+
[plugins]
14+
kotlin-mpp = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin-stdlib" }
15+
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-stdlib" }
16+
android-library = { id = "com.android.library", version.ref = "android-gradle" }
17+
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }

gradle/wrapper/gradle-wrapper.jar

130 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)