Skip to content

Commit 7251ae6

Browse files
EMaksymenkoEMaksymenko
authored
Merge pull request NASAWorldWind#78 from WorldWindEarth/gdal-update
GDAL update for version 3.x
2 parents 78df5d5 + 63a0346 commit 7251ae6

17 files changed

+411
-220
lines changed

‎.classpath‎

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,19 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
4-
<classpathentry kind="src" path="src"/>
5-
<classpathentry kind="src" path="test"/>
6-
<classpathentry kind="src" path="testFunctional"/>
7-
<classpathentry kind="lib" path="gdal.jar"/>
8-
<classpathentry kind="lib" path="gluegen-rt-natives-linux-amd64.jar"/>
9-
<classpathentry kind="lib" path="gluegen-rt-natives-linux-i586.jar"/>
10-
<classpathentry kind="lib" path="gluegen-rt-natives-macosx-universal.jar"/>
11-
<classpathentry kind="lib" path="gluegen-rt-natives-windows-amd64.jar"/>
12-
<classpathentry kind="lib" path="gluegen-rt-natives-windows-i586.jar"/>
13-
<classpathentry kind="lib" path="gluegen-rt.jar"/>
14-
<classpathentry kind="lib" path="jackson-core-asl.jar"/>
15-
<classpathentry kind="lib" path="jogl-all-natives-linux-amd64.jar"/>
16-
<classpathentry kind="lib" path="jogl-all-natives-linux-i586.jar"/>
17-
<classpathentry kind="lib" path="jogl-all-natives-macosx-universal.jar"/>
18-
<classpathentry kind="lib" path="jogl-all-natives-windows-amd64.jar"/>
19-
<classpathentry kind="lib" path="jogl-all-natives-windows-i586.jar"/>
20-
<classpathentry kind="lib" path="jogl-all.jar"/>
21-
<classpathentry kind="lib" path="junit-4.5.jar"/>
22-
<classpathentry kind="lib" path="vpf-symbols.jar"/>
23-
<classpathentry kind="output" path="bin"/>
24-
</classpath>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" output="bin/main" path="src">
4+
<attributes>
5+
<attribute name="gradle_scope" value="main"/>
6+
<attribute name="gradle_used_by_scope" value="main,test"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry kind="src" output="bin/test" path="test">
10+
<attributes>
11+
<attribute name="gradle_scope" value="test"/>
12+
<attribute name="gradle_used_by_scope" value="test"/>
13+
<attribute name="test" value="true"/>
14+
</attributes>
15+
</classpathentry>
16+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
17+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
18+
<classpathentry kind="output" path="bin/default"/>
19+
</classpath>

‎.project‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>WorldWindJava</name>
3+
<name>worldwind</name>
44
<comment></comment>
55
<projects>
66
</projects>
@@ -10,8 +10,14 @@
1010
<arguments>
1111
</arguments>
1212
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
1318
</buildSpec>
1419
<natures>
1520
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
1622
</natures>
1723
</projectDescription>

‎.settings/org.eclipse.buildship.core.prefs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
arguments=
2+
auto.sync=false
3+
build.scans.enabled=false
4+
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
5+
connection.project.dir=
6+
eclipse.preferences.version=1
7+
gradle.user.home=
8+
java.home=
9+
jvm.arguments=
10+
offline.mode=false
11+
override.workspace.settings=false
12+
show.console.view=false
13+
show.executions.view=false

‎.settings/org.eclipse.core.resources.prefs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
encoding/<project>=UTF-8

‎bin/.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/main/
2+
/test/
3+
/default/

‎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.

‎gradle/wrapper/gradle-wrapper.properties‎

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)