Skip to content

Commit e8262dc

Browse files
committed
Update to gradle version 7.6
1 parent b6aeb87 commit e8262dc

File tree

5 files changed

+192
-129
lines changed

5 files changed

+192
-129
lines changed

build.gradle

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
id 'com.jfrog.bintray' version '1.8.1'
99
}
1010

11-
apply plugin: 'java'
11+
apply plugin: 'java-library'
1212
apply plugin: 'maven-publish'
1313
apply plugin: 'com.jfrog.artifactory'
1414

@@ -22,28 +22,28 @@ ant {
2222

2323
ext {
2424
joglVersion = '2.4.0-rc-20200202'
25-
gdalVersion = '3.3.0'
25+
gdalVersion = '3.5.0'
2626
jacksonVersion = '1.9.13'
2727
junitVersion = '4.5'
28+
//systemGDAL = true
2829
}
2930

3031
repositories {
3132
mavenLocal()
3233
mavenCentral()
33-
jcenter()
3434
}
3535

3636
dependencies {
37-
compile "com.metsci.ext.org.jogamp.jogl:jogl-all-main:$project.joglVersion"
38-
compile "com.metsci.ext.org.jogamp.gluegen:gluegen-rt-main:$project.joglVersion"
37+
implementation group: 'com.metsci.ext.org.jogamp.jogl', name: 'jogl-all-main', version:"$project.joglVersion"
38+
implementation group: 'com.metsci.ext.org.jogamp.gluegen', name: 'gluegen-rt-main', version:"$project.joglVersion"
3939

4040
if (project.hasProperty('systemGDAL')) {
41-
compile files("${ant.properties['gdal.jar.dir']}/gdal.jar")
41+
implementation files("C:\\Program Files\\GDAL\\java\\gdal.jar")
4242
} else {
4343
implementation "org.gdal:gdal:$project.gdalVersion"
4444
}
4545

46-
compile "org.codehaus.jackson:jackson-core-asl:$project.jacksonVersion"
46+
implementation "org.codehaus.jackson:jackson-core-asl:$project.jacksonVersion"
4747

4848
testImplementation "junit:junit:$project.junitVersion"
4949
}
@@ -60,10 +60,10 @@ task sourcesJar(type: Jar, dependsOn: classes) {
6060
}
6161
}
6262

63-
task extensionsJar(type: Jar) {
63+
task worldwindJar(type: Jar) {
6464
group = 'build'
65-
description = 'Assembles a jar archive containing the extension classes.'
66-
baseName = 'worldwindx'
65+
description = 'Assembles a jar archive containing the WorldWind classes.'
66+
archivesBaseName = 'worldwind'
6767
from (sourceSets.main.output) {
6868
exclude 'com/**'
6969
exclude 'config/**'
@@ -72,9 +72,9 @@ task extensionsJar(type: Jar) {
7272
}
7373
doLast {
7474
copy {
75-
from "$buildDir/libs/$extensionsJar.archiveName"
75+
from "$buildDir/libs/$worldwindJar.archiveFileName"
7676
into project.projectDir
77-
rename "$extensionsJar.archiveName", "$extensionsJar.baseName.$extensionsJar.extension"
77+
rename "$worldwindJar.archiveFileName", "$worldwindJar.baseName.$worldwindJar.extension"
7878
}
7979
}
8080
}
@@ -200,7 +200,7 @@ compileJava {
200200

201201
test {
202202
dependsOn jar
203-
classpath += project.files("$buildDir/libs/$jar.archiveName", configurations.runtime)
203+
classpath += project.files("$buildDir/libs/$jar.archiveFileName")
204204
}
205205

206206
jar {
@@ -209,9 +209,9 @@ jar {
209209
exclude 'gov/nasa/worldwindx/**'
210210
doLast {
211211
copy {
212-
from "$buildDir/libs/$jar.archiveName"
212+
from "$buildDir/libs/$jar.archiveFileName"
213213
into project.projectDir
214-
rename "$jar.archiveName", "$jar.baseName.$jar.extension"
214+
rename "$jar.archiveFileName", "$jar.baseName.$jar.extension"
215215
}
216216
}
217217
}
@@ -234,7 +234,7 @@ javadoc {
234234

235235
artifacts {
236236
archives sourcesJar
237-
archives extensionsJar
237+
archives worldwindJar
238238
archives javadocJar
239239
}
240240

@@ -302,7 +302,7 @@ task processMilStd2525SVGs(dependsOn: jar) {
302302
exec {
303303
commandLine 'java',\
304304
'-cp',\
305-
"$buildDir/libs/$jar.archiveName",\
305+
"$buildDir/libs/$jar.archiveFileName",\
306306
'gov.nasa.worldwind.util.ImageTrimmer',\
307307
srcFile
308308
}

gradle/wrapper/gradle-wrapper.jar

2.32 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)