Skip to content

Commit 3942539

Browse files
authored
update to kotlin 2.1.20 (#118)
* update to kotlin 2.1.20 * fix some warnings
1 parent 8422d77 commit 3942539

File tree

8 files changed

+27
-20
lines changed

8 files changed

+27
-20
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ gradlePlugin {
100100
}
101101

102102
ktlint {
103-
version.set("1.3.1")
103+
version.set("1.5.0")
104104
}
105105

106106
tasks {

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
kotlin.code.style=official
22
org.gradle.console=plain
3+
org.jetbrains.dokka.experimental.gradle.pluginMode=V2EnabledWithHelpers

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.8-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pluginManagement {
77
plugins {
88
// See https://jmfayard.github.io/refreshVersions
99
id("de.fayard.refreshVersions") version "0.60.5"
10-
id("com.gradle.develocity") version "3.17.5"
10+
id("com.gradle.develocity") version "4.0"
1111
}
1212

1313
develocity {

src/main/kotlin/dev/mythicdrops/gradle/conventions/MythicDropsJavaPlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ open class MythicDropsJavaPlugin : DependentPlugin("Java", "java") {
2626
// enable and configure JaCoCo
2727
target.pluginManager.apply(JacocoPlugin::class.java)
2828
target.configure<JacocoPluginExtension> {
29-
toolVersion = "0.8.12"
29+
toolVersion = "0.8.13"
3030
}
3131
target.tasks.withType<JacocoReport> {
3232
reports {

src/main/kotlin/dev/mythicdrops/gradle/conventions/MythicDropsKotlinJvmPlugin.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import org.jlleitschuh.gradle.ktlint.KtlintExtension
1313
import org.jlleitschuh.gradle.ktlint.KtlintPlugin
1414

1515
/**
16-
* Plugin that configures Kotlin for JDK 17, enables Detekt, and enables/configures KTLint to use 1.2.1.
16+
* Plugin that configures Kotlin for JDK 21, enables Detekt, and enables/configures KTLint to use 1.5.0.
1717
*/
1818
open class MythicDropsKotlinJvmPlugin : DependentPlugin("Kotlin JVM", "org.jetbrains.kotlin.jvm") {
1919
override fun configureProject(target: Project) {
@@ -24,7 +24,7 @@ open class MythicDropsKotlinJvmPlugin : DependentPlugin("Kotlin JVM", "org.jetbr
2424

2525
// exclude files from the build directory from being linted or formatted
2626
target.configure<KtlintExtension> {
27-
version.set("1.3.1")
27+
version.set("1.5.0")
2828
filter {
2929
exclude { entry ->
3030
entry.file.toString().contains("generated")
@@ -33,8 +33,8 @@ open class MythicDropsKotlinJvmPlugin : DependentPlugin("Kotlin JVM", "org.jetbr
3333
}
3434

3535
target.tasks.withType<KotlinCompile> {
36-
kotlinOptions {
37-
javaParameters = true
36+
compilerOptions {
37+
javaParameters.set(true)
3838
}
3939
}
4040

version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=9.0.*
1+
version=9.1.*

versions.properties

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,40 +7,46 @@
77
#### suppress inspection "SpellCheckingInspection" for whole file
88
#### suppress inspection "UnusedProperty" for whole file
99

10-
plugin.com.gradle.plugin-publish=1.2.1
10+
plugin.com.gradle.plugin-publish=1.3.1
1111

12-
plugin.io.gitlab.arturbosch.detekt=1.23.6
12+
plugin.io.gitlab.arturbosch.detekt=1.23.8
1313

14-
plugin.org.jetbrains.dokka=1.9.20
14+
plugin.org.jetbrains.dokka=2.0.0
1515

16-
plugin.org.jlleitschuh.gradle.ktlint=12.1.1
16+
plugin.org.jlleitschuh.gradle.ktlint=12.2.0
1717

18-
plugin.org.shipkit.shipkit-auto-version=2.0.9
18+
plugin.org.shipkit.shipkit-auto-version=2.1.2
1919

2020
plugin.org.shipkit.shipkit-changelog=2.0.1
2121

2222
plugin.org.shipkit.shipkit-github-release=2.0.1
2323

2424
plugin.com.adarshr.test-logger=4.0.0
2525

26-
version.org.shipkit..shipkit-auto-version=2.0.9
26+
version.org.shipkit..shipkit-auto-version=2.1.2
2727

2828
version.org.shipkit..shipkit-changelog=2.0.1
2929

3030
version.com.adarshr..gradle-test-logger-plugin=4.0.0
3131

32-
version.org.jetbrains.dokka..dokka-core=1.9.20
32+
version.org.jetbrains.dokka..dokka-core=2.0.0
3333

34-
version.org.jetbrains.dokka..dokka-gradle-plugin=1.9.20
34+
version.org.jetbrains.dokka..dokka-gradle-plugin=2.0.0
3535

3636
version.com.netflix.nebula..nebula-project-plugin=11.0.0
3737

38-
version.io.gitlab.arturbosch.detekt..detekt-gradle-plugin=1.23.6
38+
version.io.gitlab.arturbosch.detekt..detekt-gradle-plugin=1.23.8
3939

40-
version.org.jlleitschuh.gradle..ktlint-gradle=12.1.1
40+
version.org.jlleitschuh.gradle..ktlint-gradle=12.2.0
4141

4242
version.io.github.gradle-nexus..publish-plugin=2.0.0
4343

44-
version.org.kohsuke..github-api=1.323
44+
version.org.kohsuke..github-api=1.327
45+
## # available=2.0-alpha-3
46+
## # available=2.0-rc.1
47+
## # available=2.0-rc.2
48+
## # available=2.0-rc.3
49+
## # available=2.0.0-alpha-1
50+
## # available=2.0.0-alpha-2
4551

4652
version.io.github.patrick-choe..mojang-spigot-remapper=1.4.2

0 commit comments

Comments
 (0)