Skip to content

Commit 034abef

Browse files
committed
upgrade dependencies, reorganize dependencies
1 parent 4168ee1 commit 034abef

File tree

2 files changed

+21
-15
lines changed

2 files changed

+21
-15
lines changed

build.gradle

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,40 +24,39 @@ configurations {
2424
}
2525

2626
dependencies {
27-
def graalvmVersion = project.properties["graalvm.version"]
2827

29-
implementation group: 'org.apache.groovy', name: 'groovy-all', version: '4.0.2'
28+
implementation group: 'org.apache.groovy', name: 'groovy-all', version: project.property('dep.groovy')
3029
implementation group: "org.python", name: "jython", version: "2.7.2"
3130
implementation group: 'javax.activation', name: 'activation', version: '1.1.1'
3231

33-
implementation group: 'com.github.spullara.mustache.java', name: 'compiler', version: '0.9.6'
32+
implementation group: 'com.github.spullara.mustache.java', name: 'compiler', version: project.property('dep.mustache')
3433
implementation group: 'com.fifesoft', name: 'rsyntaxtextarea', version: '3.2.0'
3534
implementation group: 'org.apache.commons', name: 'commons-compress', version: '1.21'
3635

3736
// graalvm
38-
implementation group: 'org.graalvm.sdk', name: 'graal-sdk', version: graalvmVersion
39-
implementation group: 'org.graalvm.truffle', name: 'truffle-api', version: graalvmVersion
40-
implementation group: 'org.graalvm.js', name: 'js', version: graalvmVersion
41-
graalvm group: 'org.graalvm.sdk', name: 'graal-sdk', version: graalvmVersion
42-
graalvm group: 'org.graalvm.truffle', name: 'truffle-api', version: graalvmVersion
43-
graalvm group: 'org.graalvm.js', name: 'js', version: graalvmVersion
37+
implementation group: 'org.graalvm.sdk', name: 'graal-sdk', version: project.properties["graalvm.version"]
38+
implementation group: 'org.graalvm.truffle', name: 'truffle-api', version: project.properties["graalvm.version"]
39+
implementation group: 'org.graalvm.js', name: 'js', version: project.properties["graalvm.version"]
40+
graalvm group: 'org.graalvm.sdk', name: 'graal-sdk', version: project.properties["graalvm.version"]
41+
graalvm group: 'org.graalvm.truffle', name: 'truffle-api', version: project.properties["graalvm.version"]
42+
graalvm group: 'org.graalvm.js', name: 'js', version: project.properties["graalvm.version"]
4443

4544
packIntoJar group: "org.mozilla", name: "rhino", version: "1.7.14"
4645
packIntoJar group: 'javax.validation', name: 'validation-api', version: '1.0.0.GA'
4746
packIntoJar group: 'javax.activation', name: 'activation', version: '1.1.1'
48-
packIntoJar group: 'com.github.spullara.mustache.java', name: 'compiler', version: '0.9.10'
47+
packIntoJar group: 'com.github.spullara.mustache.java', name: 'compiler', version: project.property('dep.mustache')
4948
packIntoJar group: 'com.fifesoft', name: 'rsyntaxtextarea', version: '3.2.0'
5049
packIntoJar group: 'org.apache.commons', name: 'commons-compress', version: '1.21'
5150

5251
testImplementation('org.openstreetmap.josm:josm-unittest:latest'){changing=true}
5352
testImplementation group: 'org.jmockit', name: 'jmockit', version: '1.40'
54-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
55-
testImplementation group: 'org.apache.groovy', name: 'groovy-all', version: '4.0.2'
56-
testImplementation group: 'org.apache.groovy', name: 'groovy-test', version: '4.0.2'
53+
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.8.2'
54+
testImplementation group: 'org.apache.groovy', name: 'groovy-all', version: project.property('dep.groovy')
55+
testImplementation group: 'org.apache.groovy', name: 'groovy-test', version: project.property('dep.groovy')
5756
testImplementation group: 'com.github.tomakehurst', name: 'wiremock', version: '2.27.2'
5857
testImplementation group: 'org.awaitility', name: 'awaitility', version: '4.2.0'
5958

60-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
59+
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.8.2'
6160
}
6261

6362
def releases = Releases.fromFile(file("releases.yml"))

gradle.properties

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,11 @@ graalvm.version=22.1.0
2424
graalvm.plattform=linux-amd64
2525
# either 'java11' or 'java17'
2626
graalvm.jdk=java11
27-
graalvm.download-base-url=https://github.com/graalvm/graalvm-ce-builds/releases/download
27+
graalvm.download-base-url=https://github.com/graalvm/graalvm-ce-builds/releases/download
28+
29+
30+
#-------------------------------
31+
# depenendy versions
32+
#-------------------------------
33+
dep.groovy=4.0.3
34+
dep.mustache=0.9.10

0 commit comments

Comments
 (0)