Skip to content

Commit a6c0324

Browse files
committed
fix(ci): update kotlin to 2.0.21
1 parent 0265f1b commit a6c0324

File tree

8 files changed

+14
-20
lines changed

8 files changed

+14
-20
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
- name: Install Kotlin
2222
run: |
23-
curl -o kotlin-compiler.zip -L https://github.com/JetBrains/kotlin/releases/download/v1.7.22/kotlin-compiler-1.7.22.zip
23+
curl -o kotlin-compiler.zip -L https://github.com/JetBrains/kotlin/releases/download/v2.0.21/kotlin-compiler-2.0.21.zip
2424
2525
if [[ "$OSTYPE" != "darwin"* ]]
2626
then

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LABEL "com.github.actions.description"="Runs Kotlin Dangerfiles"
77
LABEL "com.github.actions.icon"="zap"
88
LABEL "com.github.actions.color"="blue"
99

10-
ARG KOTLINC_VERSION="1.7.22"
10+
ARG KOTLINC_VERSION="2.0.21"
1111
ARG DANGER_KOTLIN_VERSION="1.3.1"
1212
ARG DANGER_JS_VERSION="11.3.1"
1313

danger-kotlin-sample-plugin/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
}
1010

1111
plugins {
12-
id 'org.jetbrains.kotlin.jvm' version '1.7.22'
12+
id 'org.jetbrains.kotlin.jvm' version '2.0.21'
1313
}
1414

1515
apply plugin: 'danger-kotlin-plugin-installer'

danger-kotlin-sdk/maven-publish.gradle

+5-11
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply from: file('../secrets.gradle')
22

33
task sourceJar(type: Jar) {
4-
classifier "sources"
4+
archiveClassifier.set("sources")
55
from sourceSets.main.allJava
66
}
77

88
task javadocJar(type: Jar, dependsOn: javadoc) {
9-
classifier "javadoc"
9+
archiveClassifier.set("javadoc")
1010
from javadoc.destinationDir
1111
}
1212

@@ -32,14 +32,8 @@ publishing {
3232
publications {
3333
maven(MavenPublication) {
3434
from components.java
35-
artifact sourceJar {
36-
classifier "sources"
37-
from sourceSets.main.allJava
38-
}
39-
artifact javadocJar {
40-
classifier "javadoc"
41-
from javadoc.destinationDir
42-
}
35+
artifact sourceJar
36+
artifact javadocJar
4337
pom {
4438
name = 'Danger Kotlin SDK'
4539
description = 'Develop your own plugin for Danger Kotlin'
@@ -81,4 +75,4 @@ publishing {
8175
}
8276
}
8377
}
84-
}
78+
}

danger-kotlin/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ kotlin {
1414
"linuxX64" -> linuxX64("runner")
1515
"macosArm64" -> macosArm64("runner")
1616
"mingwX64" -> mingwX64("runner")
17-
else -> throw GradleException("OS '$osName' is not supported.") as Throwable
17+
else -> throw GradleException("OS '$osName' is not supported.")
1818
}
1919
} else {
2020
when (val osName = System.getProperty("os.name")) {
2121
"Mac OS X" -> macosX64("runner")
2222
"Linux" -> linuxX64("runner")
2323
"Mac OS X Apple silicon" -> macosArm64("runner")
2424
"Windows 11" -> mingwX64("runner")
25-
else -> throw GradleException("OS '$osName' is not supported.") as Throwable
25+
else -> throw GradleException("OS '$osName' is not supported.")
2626
}
2727
}
2828

dependencyVersions.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ project.ext.groupIdOkio = 'com.squareup.okio'
2020
project.ext.artifactIdOkio = 'okio'
2121

2222
// Kotlin
23-
project.ext.versionKotlin = '1.7.22'
23+
project.ext.versionKotlin = '2.0.21'
2424
project.ext.groupIdKotlin = 'org.jetbrains.kotlin'
2525
project.ext.groupIdKotlinx = 'org.jetbrains.kotlinx'
2626
project.ext.artifactIdKotlinMain = 'kotlin-main-kts'

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
kotlinVersion=1.7.22
1+
kotlinVersion=2.0.21
22
kotlin.code.style=official
33
systemProp.org.gradle.internal.publish.checksums.insecure=true

scripts/install.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ if [[ -n "$sudo" && "$OSTYPE" != "darwin"* ]]; then
3131
fi
3232

3333
if ! [[ -x "$(command -v kotlinc)" ]]; then
34-
echo "Installing kotlin compiler 1.7.22"
35-
curl -o kotlin-compiler.zip -L https://github.com/JetBrains/kotlin/releases/download/v1.7.22/kotlin-compiler-1.7.22.zip
34+
echo "Installing kotlin compiler 2.0.21"
35+
curl -o kotlin-compiler.zip -L https://github.com/JetBrains/kotlin/releases/download/v2.0.21/kotlin-compiler-2.0.21.zip
3636
unzip -d /usr/local/ kotlin-compiler.zip
3737
echo 'export PATH=/usr/local/kotlinc/bin:$PATH' >> ~/.bash_profile
3838
rm -rf kotlin-compiler.zip

0 commit comments

Comments
 (0)