@@ -8,7 +8,7 @@ plugins {
8
8
id ' com.jfrog.bintray' version ' 1.8.1'
9
9
}
10
10
11
- apply plugin : ' java'
11
+ apply plugin : ' java-library '
12
12
apply plugin : ' maven-publish'
13
13
apply plugin : ' com.jfrog.artifactory'
14
14
@@ -22,28 +22,28 @@ ant {
22
22
23
23
ext {
24
24
joglVersion = ' 2.4.0-rc-20200202'
25
- gdalVersion = ' 3.3 .0'
25
+ gdalVersion = ' 3.5 .0'
26
26
jacksonVersion = ' 1.9.13'
27
27
junitVersion = ' 4.5'
28
+ // systemGDAL = true
28
29
}
29
30
30
31
repositories {
31
32
mavenLocal()
32
33
mavenCentral()
33
- jcenter()
34
34
}
35
35
36
36
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 "
39
39
40
40
if (project. hasProperty(' systemGDAL' )) {
41
- compile files(" ${ ant.properties['gdal.jar.dir'] } / gdal.jar" )
41
+ implementation files(" C: \\ Program Files \\ GDAL \\ java \\ gdal.jar" )
42
42
} else {
43
43
implementation " org.gdal:gdal:$project . gdalVersion "
44
44
}
45
45
46
- compile " org.codehaus.jackson:jackson-core-asl:$project . jacksonVersion "
46
+ implementation " org.codehaus.jackson:jackson-core-asl:$project . jacksonVersion "
47
47
48
48
testImplementation " junit:junit:$project . junitVersion "
49
49
}
@@ -60,10 +60,10 @@ task sourcesJar(type: Jar, dependsOn: classes) {
60
60
}
61
61
}
62
62
63
- task extensionsJar (type : Jar ) {
63
+ task worldwindJar (type : Jar ) {
64
64
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 '
67
67
from (sourceSets. main. output) {
68
68
exclude ' com/**'
69
69
exclude ' config/**'
@@ -72,9 +72,9 @@ task extensionsJar(type: Jar) {
72
72
}
73
73
doLast {
74
74
copy {
75
- from " $buildDir /libs/$e xtensionsJar . archiveName "
75
+ from " $buildDir /libs/$w orldwindJar . archiveFileName "
76
76
into project. projectDir
77
- rename " $e xtensionsJar . archiveName " , " $e xtensionsJar . baseName . $e xtensionsJar . extension "
77
+ rename " $w orldwindJar . archiveFileName " , " $w orldwindJar . baseName . $w orldwindJar . extension "
78
78
}
79
79
}
80
80
}
@@ -200,7 +200,7 @@ compileJava {
200
200
201
201
test {
202
202
dependsOn jar
203
- classpath + = project. files(" $buildDir /libs/$jar . archiveName " , configurations . runtime )
203
+ classpath + = project. files(" $buildDir /libs/$jar . archiveFileName " )
204
204
}
205
205
206
206
jar {
@@ -209,9 +209,9 @@ jar {
209
209
exclude ' gov/nasa/worldwindx/**'
210
210
doLast {
211
211
copy {
212
- from " $buildDir /libs/$jar . archiveName "
212
+ from " $buildDir /libs/$jar . archiveFileName "
213
213
into project. projectDir
214
- rename " $jar . archiveName " , " $jar . baseName . $jar . extension "
214
+ rename " $jar . archiveFileName " , " $jar . baseName . $jar . extension "
215
215
}
216
216
}
217
217
}
@@ -234,7 +234,7 @@ javadoc {
234
234
235
235
artifacts {
236
236
archives sourcesJar
237
- archives extensionsJar
237
+ archives worldwindJar
238
238
archives javadocJar
239
239
}
240
240
@@ -302,7 +302,7 @@ task processMilStd2525SVGs(dependsOn: jar) {
302
302
exec {
303
303
commandLine ' java' ,\
304
304
' -cp' ,\
305
- " $buildDir /libs/$jar . archiveName " ,\
305
+ " $buildDir /libs/$jar . archiveFileName " ,\
306
306
' gov.nasa.worldwind.util.ImageTrimmer' ,\
307
307
srcFile
308
308
}
0 commit comments