Skip to content

Commit 041ebce

Browse files
Merge pull request #18 from rondlh/Upgrade-to-Gradle-8.13
Upgrade to gradle 8.13
2 parents fed3d46 + 61f2f6c commit 041ebce

File tree

2 files changed

+33
-41
lines changed

2 files changed

+33
-41
lines changed

CaDoodleUpdater/build.gradle

Lines changed: 32 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3,64 +3,56 @@
33
*
44
* This generated file contains a sample Java library project to get you started.
55
* For more details take a look at the 'Building Java & JVM projects' chapter in the Gradle
6-
* User Manual available at https://docs.gradle.org/8.1.1/userguide/building_java_projects.html
6+
* User Manual available at https://docs.gradle.org/current/userguide/userguide.html
77
*/
8-
buildscript {
9-
repositories {
10-
gradlePluginPortal()
11-
}
12-
dependencies {
13-
classpath 'com.github.johnrengelman:shadow:8.1.1'
14-
}
15-
}
16-
17-
apply plugin: 'com.github.johnrengelman.shadow'
18-
apply plugin: 'java'
19-
apply plugin: 'application'
20-
apply plugin: 'eclipse'
218

9+
plugins {
10+
id 'java'
11+
id 'application'
12+
id 'eclipse'
13+
id 'com.gradleup.shadow' version '8.3.9'
14+
}
2215

2316
repositories {
24-
// Use Maven Central for resolving dependencies.
25-
mavenCentral()
17+
// Use Maven Central for resolving dependencies.
18+
mavenCentral()
2619
}
2720

2821
dependencies {
29-
// Use JUnit Jupiter for testing.
30-
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.1'
22+
// Use JUnit Jupiter for testing.
23+
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
3124

32-
// This dependency is used internally, and not exposed to consumers on their own compile classpath.
33-
implementation 'com.google.guava:guava:31.1-jre'
34-
implementation 'com.google.code.gson:gson:2.8.6'
25+
// This dependency is used internally, and not exposed to consumers on their own compile classpath.
26+
implementation 'com.google.guava:guava:31.1-jre'
27+
implementation 'com.google.code.gson:gson:2.11.0'
3528
implementation 'org.apache.commons:commons-compress:1.26.2'
3629
}
3730

3831
// Apply a specific Java toolchain to ease working on different environments.
3932
java {
40-
toolchain {
41-
languageVersion = JavaLanguageVersion.of(17)
42-
}
33+
toolchain {
34+
languageVersion = JavaLanguageVersion.of(17)
35+
}
4336
}
4437

4538
tasks.named('test') {
46-
// Use JUnit Platform for unit tests.
47-
useJUnitPlatform()
48-
}
49-
application {
50-
// Define the main class for the application.
51-
mainClass = 'com.commonwealthrobotics.Main'
39+
// Use JUnit Platform for unit tests.
40+
useJUnitPlatform()
5241
}
5342

54-
shadowJar {
55-
archiveBaseName.set('CaDoodleUpdater')
56-
archiveClassifier.set('')
57-
archiveVersion.set('')
58-
}
59-
jar {
43+
tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
44+
archiveBaseName = 'CaDoodleUpdater'
45+
archiveClassifier = ''
46+
archiveVersion = ''
6047
manifest {
61-
attributes 'Implementation-Title': 'BowlerStudioUpdater',
62-
'Implementation-Version': '0.0.1',
63-
'Main-Class': 'com.commonwealthrobotics.Main'
64-
48+
attributes(
49+
'Implementation-Title': 'BowlerStudioUpdater',
50+
'Implementation-Version': '0.0.1',
51+
'Main-Class': 'com.commonwealthrobotics.Main'
52+
)
6553
}
6654
}
55+
56+
application {
57+
mainClass = 'com.commonwealthrobotics.Main'
58+
}
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.1.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)