Skip to content

Commit 604bf3f

Browse files
committed
upgrade plugins
1 parent 5f540f8 commit 604bf3f

File tree

4 files changed

+18
-14
lines changed

4 files changed

+18
-14
lines changed

build-gui/build.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
plugins {
22
id "java"
33
id "application"
4-
id "edu.sc.seis.launch4j" version "2.5.4"
4+
id "edu.sc.seis.launch4j" version "3.0.6"
55
id "org.openjfx.javafxplugin" version "0.1.0"
6-
id "com.github.johnrengelman.shadow" version "7.1.2"
6+
id "com.gradleup.shadow" version "8.3.5"
77
}
88

99
group = ss_group
@@ -69,12 +69,12 @@ shadowJar {
6969
}
7070
}
7171

72-
createExe {
73-
jarTask = shadowJar
72+
launch4j {
73+
jarTask = project.tasks.shadowJar
7474
mainClassName = ss_main_class
7575
outfile = "ServerSyncClient.exe"
7676
icon = "${rootDir}/build-shared/src/main/resources/ServersyncLogo.ico"
77-
copyConfigurable = shadowJar.outputs.files
77+
copyConfigurable = []
7878
supportUrl = "https://github.com/superzanti/ServerSync"
7979
productName = "ServerSync - Client"
8080
fileDescription = "The client side for users."
@@ -83,7 +83,7 @@ createExe {
8383

8484
startScripts {
8585
dependsOn shadowJar
86-
classpath = files(classpath = files("${buildDir}/libs/${project.name}-${project.version}.jar"))
86+
classpath = files(classpath = files("${layout.buildDirectory.get()}/libs/${project.name}-${project.version}.jar"))
8787
}
8888

8989

@@ -108,7 +108,7 @@ distributions {
108108
tasks.register("assembleGithubArtifacts", Copy) {
109109
group = "distribution"
110110
dependsOn createExe
111-
from layout.buildDirectory.dir("launch4j/lib"), layout.buildDirectory.file("launch4j")
111+
from layout.buildDirectory.dir("libs"), layout.buildDirectory.file("launch4j")
112112
into file("$rootDir/publish/github")
113113
exclude "lib"
114114
}

build-server/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
22
id "java"
33
id "application"
4-
id "edu.sc.seis.launch4j" version "2.5.4"
5-
id "com.github.johnrengelman.shadow" version "7.1.2"
4+
id "edu.sc.seis.launch4j" version "3.0.6"
5+
id "com.gradleup.shadow" version "8.3.5"
66
}
77

88
group = ss_group
@@ -55,13 +55,13 @@ shadowJar {
5555
}
5656
}
5757

58-
createExe {
58+
launch4j {
5959
jarTask = shadowJar
6060
mainClassName = ss_main_class
6161
outfile = "ServerSyncServer.exe"
6262
headerType = "console"
6363
icon = "${rootDir}/build-shared/src/main/resources/ServersyncLogoServer.ico"
64-
copyConfigurable = shadowJar.outputs.files
64+
copyConfigurable = []
6565
supportUrl = "https://github.com/superzanti/ServerSync"
6666
productName = "ServerSync - Server"
6767
fileDescription = "The server side for admins."
@@ -70,7 +70,7 @@ createExe {
7070

7171
startScripts {
7272
dependsOn shadowJar
73-
classpath = files(classpath = files("${buildDir}/libs/${project.name}-${project.version}.jar"))
73+
classpath = files(classpath = files("${layout.buildDirectory.get()}/libs/${project.name}-${project.version}.jar"))
7474
}
7575

7676
distZip {
@@ -94,7 +94,7 @@ distributions {
9494
tasks.register("assembleGithubArtifacts", Copy) {
9595
group = "distribution"
9696
dependsOn createExe
97-
from layout.buildDirectory.dir("launch4j/lib"), layout.buildDirectory.file("launch4j")
97+
from layout.buildDirectory.dir("libs"), layout.buildDirectory.file("launch4j")
9898
into file("$rootDir/publish/github")
9999
exclude "lib"
100100
}

build-shared/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies {
1616
// Use JUnit Jupiter API for testing.
1717
testImplementation "org.junit.jupiter:junit-jupiter-api:5.8.2", "org.junit.jupiter:junit-jupiter-params:5.8.2"
1818
// Use JUnit Jupiter Engine for testing.
19-
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.8.2", "com.eclipsesource.minimal-json:minimal-json:0.9.5"
19+
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.8.2", "com.eclipsesource.minimal-json:minimal-json:0.9.5", "org.junit.platform:junit-platform-launcher"
2020
}
2121

2222
java {

settings.gradle

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
* in the user manual at https://docs.gradle.org/5.5.1/userguide/multi_project_builds.html
88
*/
99

10+
plugins {
11+
id "org.gradle.toolchains.foojay-resolver-convention" version "0.9.0"
12+
}
13+
1014
rootProject.name = 'ServerSync'
1115
include 'build-shared'
1216
include 'build-gui'

0 commit comments

Comments
 (0)