Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update v.next to be same as main #819

Merged
merged 8 commits into from
Jan 11, 2024
Merged

update v.next to be same as main #819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ec4c281
Mark/java doc download (#803)
mbcoder Sep 8, 2023
076e121
Cherry Pick sketch editor -> geometry editor from v.next
mfeigl Oct 5, 2023
9eaedb3
JavaFX plugin update to remove Gradle 9 warnings (#807) (#808)
mbcoder Oct 6, 2023
06ed910
Mark/8454 ant zip (#810) (#811)
mbcoder Oct 11, 2023
f9030a1
Mark/jfx21 main (#813)
mbcoder Nov 10, 2023
4432019
Updating service and associated doc (#814) (#815)
mbcoder Nov 17, 2023
d9ebd21
Patch: Fix broken links in sample readme files (#816)
steverozic Nov 20, 2023
c79396a
Update version to 200.3 in preparation for new release (#818)
mbcoder Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
23 changes: 11 additions & 12 deletions analysis/analyze-hotspots/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
plugins {
id 'application'
id 'idea'
id 'org.openjfx.javafxplugin' // version is defined in settings.gradle
}

idea {
module {
downloadJavadoc = true
}
}

group = 'com.esri.samples'

ext {
arcgisVersion = '200.2.0'
arcgisVersion = '200.3.0'
}

javafx {
version = "17.0.7"
version = "21.0.1"
modules = [ 'javafx.controls', 'javafx.graphics', 'javafx.fxml', 'javafx.web', 'javafx.media' ]
}

Expand Down Expand Up @@ -40,7 +47,7 @@ dependencies {
natives "com.esri.arcgisruntime:arcgis-java-jnilibs:$arcgisVersion"
natives "com.esri.arcgisruntime:arcgis-java-resources:$arcgisVersion"
// handle SLF4J http://www.slf4j.org/codes.html#StaticLoggerBinder
implementation 'org.slf4j:slf4j-nop:2.0.7'
implementation 'org.slf4j:slf4j-nop:2.0.9'
}

task createGradlePropertiesAndWriteApiKey {
Expand Down Expand Up @@ -72,17 +79,9 @@ run {
dependsOn copyNatives
}

task productionZip(type: Zip) {
group = 'distribution'
from copyNatives
from jar.destinationDirectory
into (project.name)
archiveBaseName = project.name
}

if (rootProject == project) {
// the wrapper task is only used if this project is the root project i.e. not a subproject
wrapper {
gradleVersion = '8.1.1'
gradleVersion = '8.4'
}
}
2 changes: 1 addition & 1 deletion analysis/analyze-hotspots/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion analysis/analyze-hotspots/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pluginManagement {
plugins {
// version defined in settings.gradle to avoid version error when this sample is used in a multi-project build
id 'org.openjfx.javafxplugin' version "0.0.14"
id 'org.openjfx.javafxplugin' version "0.1.0"
}
}

Expand Down
23 changes: 11 additions & 12 deletions analysis/distance-measurement-analysis/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
plugins {
id 'application'
id 'idea'
id 'org.openjfx.javafxplugin' // version is defined in settings.gradle
}

idea {
module {
downloadJavadoc = true
}
}

group = 'com.esri.samples'

ext {
arcgisVersion = '200.2.0'
arcgisVersion = '200.3.0'
}

javafx {
version = "17.0.7"
version = "21.0.1"
modules = [ 'javafx.controls', 'javafx.graphics', 'javafx.fxml', 'javafx.web', 'javafx.media' ]
}

Expand Down Expand Up @@ -40,7 +47,7 @@ dependencies {
natives "com.esri.arcgisruntime:arcgis-java-jnilibs:$arcgisVersion"
natives "com.esri.arcgisruntime:arcgis-java-resources:$arcgisVersion"
// handle SLF4J http://www.slf4j.org/codes.html#StaticLoggerBinder
implementation 'org.slf4j:slf4j-nop:2.0.7'
implementation 'org.slf4j:slf4j-nop:2.0.9'
}

task createGradlePropertiesAndWriteApiKey {
Expand Down Expand Up @@ -72,17 +79,9 @@ run {
dependsOn copyNatives
}

task productionZip(type: Zip) {
group = 'distribution'
from copyNatives
from jar.destinationDirectory
into (project.name)
archiveBaseName = project.name
}

if (rootProject == project) {
// the wrapper task is only used if this project is the root project i.e. not a subproject
wrapper {
gradleVersion = '8.1.1'
gradleVersion = '8.4'
}
}
2 changes: 1 addition & 1 deletion analysis/distance-measurement-analysis/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion analysis/distance-measurement-analysis/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pluginManagement {
plugins {
// version defined in settings.gradle to avoid version error when this sample is used in a multiproject build
id 'org.openjfx.javafxplugin' version "0.0.14"
id 'org.openjfx.javafxplugin' version "0.1.0"
}
}

Expand Down
26 changes: 11 additions & 15 deletions analysis/line-of-sight-geoelement/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
plugins {
id 'application'
id 'idea'
id 'org.openjfx.javafxplugin' // version is defined in settings.gradle
}

idea {
module {
downloadJavadoc = true
}
}

group = 'com.esri.samples'

ext {
arcgisVersion = '200.2.0'
arcgisVersion = '200.3.0'
}

javafx {
version = "17.0.7"
version = "21.0.1"
modules = [ 'javafx.controls', 'javafx.graphics', 'javafx.fxml', 'javafx.web', 'javafx.media' ]
}

Expand Down Expand Up @@ -40,7 +47,7 @@ dependencies {
natives "com.esri.arcgisruntime:arcgis-java-jnilibs:$arcgisVersion"
natives "com.esri.arcgisruntime:arcgis-java-resources:$arcgisVersion"
// handle SLF4J http://www.slf4j.org/codes.html#StaticLoggerBinder
implementation 'org.slf4j:slf4j-nop:2.0.7'
implementation 'org.slf4j:slf4j-nop:2.0.9'
}

task createGradlePropertiesAndWriteApiKey {
Expand Down Expand Up @@ -72,20 +79,9 @@ run {
dependsOn copyNatives
}

task productionZip(type: Zip) {
group = 'distribution'
from ("samples-data") {
into "samples-data"
}
from copyNatives
from jar.destinationDirectory
into (project.name)
archiveBaseName = project.name
}

if (rootProject == project) {
// the wrapper task is only used if this project is the root project i.e. not a subproject
wrapper {
gradleVersion = '8.1.1'
gradleVersion = '8.4'
}
}
2 changes: 1 addition & 1 deletion analysis/line-of-sight-geoelement/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions analysis/line-of-sight-geoelement/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
pluginManagement {
plugins {
// version defined in settings.gradle to avoid version error when this sample is used in a multiproject build
id 'org.openjfx.javafxplugin' version "0.0.14"
id 'org.openjfx.javafxplugin' version "0.1.0"
}
}

rootProject.name = 'line-of-sight-geoelement'

// download sample data
def ant = new groovy.util.AntBuilder()
def ant = new groovy.ant.AntBuilder()

if (!file("./samples-data").exists()) {
ant.get(
Expand Down
23 changes: 11 additions & 12 deletions analysis/line-of-sight-location/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
plugins {
id 'application'
id 'idea'
id 'org.openjfx.javafxplugin' // version is defined in settings.gradle
}

idea {
module {
downloadJavadoc = true
}
}

group = 'com.esri.samples'

ext {
arcgisVersion = '200.2.0'
arcgisVersion = '200.3.0'
}

javafx {
version = "17.0.7"
version = "21.0.1"
modules = [ 'javafx.controls', 'javafx.graphics', 'javafx.fxml', 'javafx.web', 'javafx.media' ]
}

Expand Down Expand Up @@ -40,7 +47,7 @@ dependencies {
natives "com.esri.arcgisruntime:arcgis-java-jnilibs:$arcgisVersion"
natives "com.esri.arcgisruntime:arcgis-java-resources:$arcgisVersion"
// handle SLF4J http://www.slf4j.org/codes.html#StaticLoggerBinder
implementation 'org.slf4j:slf4j-nop:2.0.7'
implementation 'org.slf4j:slf4j-nop:2.0.9'
}

task createGradlePropertiesAndWriteApiKey {
Expand Down Expand Up @@ -72,17 +79,9 @@ run {
dependsOn copyNatives
}

task productionZip(type: Zip) {
group = 'distribution'
from copyNatives
from jar.destinationDirectory
into (project.name)
archiveBaseName = project.name
}

if (rootProject == project) {
// the wrapper task is only used if this project is the root project i.e. not a subproject
wrapper {
gradleVersion = '8.1.1'
gradleVersion = '8.4'
}
}
2 changes: 1 addition & 1 deletion analysis/line-of-sight-location/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion analysis/line-of-sight-location/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pluginManagement {
plugins {
// version defined in settings.gradle to avoid version error when this sample is used in a multiproject build
id 'org.openjfx.javafxplugin' version "0.0.14"
id 'org.openjfx.javafxplugin' version "0.1.0"
}
}

Expand Down
23 changes: 11 additions & 12 deletions analysis/viewshed-camera/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
plugins {
id 'application'
id 'idea'
id 'org.openjfx.javafxplugin' // version is defined in settings.gradle
}

idea {
module {
downloadJavadoc = true
}
}

group = 'com.esri.samples'

ext {
arcgisVersion = '200.2.0'
arcgisVersion = '200.3.0'
}

javafx {
version = "17.0.7"
version = "21.0.1"
modules = [ 'javafx.controls', 'javafx.graphics', 'javafx.fxml', 'javafx.web', 'javafx.media' ]
}

Expand Down Expand Up @@ -40,7 +47,7 @@ dependencies {
natives "com.esri.arcgisruntime:arcgis-java-jnilibs:$arcgisVersion"
natives "com.esri.arcgisruntime:arcgis-java-resources:$arcgisVersion"
// handle SLF4J http://www.slf4j.org/codes.html#StaticLoggerBinder
implementation 'org.slf4j:slf4j-nop:2.0.7'
implementation 'org.slf4j:slf4j-nop:2.0.9'
}

task createGradlePropertiesAndWriteApiKey {
Expand Down Expand Up @@ -72,17 +79,9 @@ run {
dependsOn copyNatives
}

task productionZip(type: Zip) {
group = 'distribution'
from copyNatives
from jar.destinationDirectory
into (project.name)
archiveBaseName = project.name
}

if (rootProject == project) {
// the wrapper task is only used if this project is the root project i.e. not a subproject
wrapper {
gradleVersion = '8.1.1'
gradleVersion = '8.4'
}
}
2 changes: 1 addition & 1 deletion analysis/viewshed-camera/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion analysis/viewshed-camera/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pluginManagement {
plugins {
// version defined in settings.gradle to avoid version error when this sample is used in a multiproject build
id 'org.openjfx.javafxplugin' version "0.0.14"
id 'org.openjfx.javafxplugin' version "0.1.0"
}
}

Expand Down
Loading
Loading