Skip to content

Commit 2628c8d

Browse files
committed
Update gradle to v9.2.1 to support Java25
1 parent 55cd0aa commit 2628c8d

3 files changed

Lines changed: 21 additions & 11 deletions

File tree

build.gradle

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@ subprojects {
1111

1212
group = 'com.bladecoder.ink'
1313

14-
sourceCompatibility = 1.8
15-
targetCompatibility = 1.8
14+
java {
15+
sourceCompatibility = JavaVersion.VERSION_1_8
16+
targetCompatibility = JavaVersion.VERSION_1_8
17+
}
18+
1619
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
1720

1821
repositories {
@@ -48,14 +51,16 @@ subprojects {
4851
}
4952

5053
jar {
51-
manifest.attributes += [
54+
manifest {
55+
attributes(
5256
'github' : 'https://github.com/bladecoder/blade-ink/',
5357
'license' : 'Apache-2.0',
5458
'group' : project.group,
5559
'version' : project.version,
56-
'java' : targetCompatibility,
60+
'java' : project.java.targetCompatibility,
5761
'timestamp': System.currentTimeMillis()
58-
]
62+
)
63+
}
5964
}
6065

6166
javadoc {

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip

inklecate/build.gradle

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@ plugins {
22
id 'application'
33
}
44

5-
sourceCompatibility = 1.8
6-
targetCompatibility = 1.8
5+
java {
6+
sourceCompatibility = JavaVersion.VERSION_1_8
7+
targetCompatibility = JavaVersion.VERSION_1_8
8+
}
9+
710
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
811

912
repositories {
@@ -21,9 +24,11 @@ application {
2124

2225
jar {
2326
dependsOn(':compiler:jar', ':runtime:jar')
24-
manifest.attributes += [
25-
'Main-Class': application.mainClass
26-
]
27+
manifest {
28+
attributes(
29+
'Main-Class': application.mainClass.get()
30+
)
31+
}
2732
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
2833
from {
2934
configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }

0 commit comments

Comments
 (0)