Skip to content

Commit 6d94fac

Browse files
committed
Merge pull request #1 from es6kr/gradlew-update-8.1.1
Update Gradle Wrapper from 8.0.1 to 8.1.1
2 parents 243badb + 4b58888 commit 6d94fac

File tree

6 files changed

+290
-203
lines changed

6 files changed

+290
-203
lines changed

.github/workflows/deploy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ jobs:
99
steps:
1010
- name: Checkout code
1111
uses: actions/checkout@v2
12-
- name: Set up JDK 11
12+
- name: Set up JDK 17
1313
uses: actions/setup-java@v2
1414
with:
15-
java-version: 11
16-
distribution: 'adopt'
15+
java-version: 17
16+
distribution: zulu
1717
- name: Update Gradle Wrapper Action
1818
uses: gradle-update/update-gradle-wrapper-action@v1
1919
- name: Build with Gradle

build.gradle

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,18 @@ apply plugin: 'kotlin'
1717

1818
archivesBaseName = 'kotlib'
1919
group 'kr.es6'
20-
try {
21-
version project.KOTLIB_VERSION
22-
} catch (Exception ignored) {
20+
21+
java.sourceCompatibility = JavaVersion.VERSION_17
22+
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
23+
kotlinOptions {
24+
jvmTarget = JavaVersion.VERSION_17
25+
}
2326
}
2427

2528
// Run this task to bundle all needed dependency
2629
task bundle(type: Jar) {
30+
archiveFileName.set("$archivesBaseName-all.jar")
31+
from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
2732
with jar
2833
}
2934

gradle/wrapper/gradle-wrapper.jar

7.57 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Thu Jan 02 17:51:45 KST 2020
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionSha256Sum=5625a0ae20fe000d9225d000b36909c7a0e0e8dda61c19b12da769add847c975
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
5+
networkTimeout=10000
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip

0 commit comments

Comments
 (0)