Update main with modularized samples (#793)

Updates main branch to include modularized samples based on development work done during 200.0.0 and 200.1.0 that is now completed. 
Also adds two new samples: add a dynamic entity layer, and create and edit geometries

Author: jenmerritt

.github/scripts/ci/readme_metadata_style_check/README_style_checker.py

@@ -51,6 +51,7 @@
     'ogc',
     'portal',
     'raster',
+    'real_time',
     'scene',
     'search',
     'symbology',

.github/scripts/ci/readme_metadata_style_check/entry.py

@@ -24,6 +24,7 @@
     'ogc',
     'portal',
     'raster',
+    'real_time',
     'scene',
     'search',
     'symbology',

.github/scripts/ci/readme_metadata_style_check/metadata_style_checker.py

@@ -25,6 +25,7 @@
     'ogc',
     'portal',
     'raster',
+    'real_time',
     'scene',
     'search',
     'symbology',
@@ -152,6 +153,7 @@ def get_source_code_paths(self) -> typing.List[str]:
         results = list(filter(lambda x: 'build/' not in x, results)) # exclude \build folder
         results = list(filter(lambda x: 'out/' not in x, results)) # exclude \out folder
         results = list(filter(lambda x: 'Launcher' not in x, results)) # exclude *Launcher.java
+        results = list(filter(lambda x: 'module-info' not in x, results)) # exclude module-info.java
         results = list(map(lambda x: x.replace(os.sep, '/'), results)) # eliminate double backslashes in the paths
 
         return sorted(results)

.github/workflows/main.yml

@@ -8,6 +8,7 @@ on:
     branches:
       - main
       - v.next
+      - v200.develop
 
 # A workflow run is made up of one or more jobs that can run sequentially or
 # in parallel.

analysis/analyze-hotspots/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'application'
-    id 'org.openjfx.javafxplugin' version '0.0.13'
+    id 'org.openjfx.javafxplugin' // version is defined in settings.gradle
 }
 
 group = 'com.esri.samples'
@@ -11,7 +11,12 @@ ext {
 
 javafx {
     version = "17.0.2"
-    modules = [ 'javafx.controls' ]
+    modules = [ 'javafx.controls', 'javafx.graphics', 'javafx.fxml', 'javafx.web', 'javafx.media' ]
+}
+
+application {
+    mainModule = "com.esri.samples.analyze_hotspots"
+    mainClass = "com.esri.samples.analyze_hotspots.AnalyzeHotspotsSample"
 }
 
 compileJava.options.encoding = 'UTF-8'
@@ -65,22 +70,6 @@ run {
         systemProperty 'apiKey', apiKey
     }
     dependsOn copyNatives
-    mainClassName = 'com.esri.samples.analyze_hotspots.AnalyzeHotspotsLauncher'
-}
-
-jar {
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    manifest {
-        attributes("Main-Class": "$mainClassName")
-    }
-    from {
-        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
-    }
-
-    // exclude signing files that come from dependencies
-    exclude "META-INF/*.SF"
-    exclude "META-INF/*.DSA"
-    exclude "META-INF/*.RSA"
 }
 
 task productionZip(type: Zip) {
@@ -91,6 +80,9 @@ task productionZip(type: Zip) {
     archiveBaseName = project.name
 }
 
-wrapper {
-    gradleVersion = '7.5'
+if (rootProject == project) {
+    // the wrapper task is only used if this project is the root project i.e. not a subproject
+    wrapper {
+        gradleVersion = '7.5.1'
+    }
 }

analysis/analyze-hotspots/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

analysis/analyze-hotspots/settings.gradle

@@ -1 +1,8 @@
-rootProject.name = 'analyze-hotspots'
+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.13"
+    }
+}
+
+rootProject.name = 'analyze-hotspots'

analysis/analyze-hotspots/src/main/java/com/esri/samples/analyze_hotspots/AnalyzeHotspotsLauncher.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2022 Esri.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+module com.esri.samples.analyze_hotspots {
+  // require ArcGIS Maps SDK for Java module
+  requires com.esri.arcgisruntime;
+
+  // require JavaFX modules that the application uses
+  requires javafx.graphics;
+  requires javafx.controls;
+
+  // require other modules that the application uses
+  requires java.sql;
+
+  exports com.esri.samples.analyze_hotspots;
+}

analysis/analyze-hotspots/src/main/java/module-info.java

@@ -1,6 +1,6 @@
 plugins {
     id 'application'
-    id 'org.openjfx.javafxplugin' version '0.0.13'
+    id 'org.openjfx.javafxplugin' // version is defined in settings.gradle
 }
 
 group = 'com.esri.samples'
@@ -11,7 +11,12 @@ ext {
 
 javafx {
     version = "17.0.2"
-    modules = [ 'javafx.controls', 'javafx.fxml' ]
+    modules = [ 'javafx.controls', 'javafx.graphics', 'javafx.fxml', 'javafx.web', 'javafx.media' ]
+}
+
+application {
+    mainModule = "com.esri.samples.distance_measurement_analysis"
+    mainClass = "com.esri.samples.distance_measurement_analysis.DistanceMeasurementAnalysisSample"
 }
 
 compileJava.options.encoding = 'UTF-8'
@@ -65,22 +70,6 @@ run {
         systemProperty 'apiKey', apiKey
     }
     dependsOn copyNatives
-    mainClassName = 'com.esri.samples.distance_measurement_analysis.DistanceMeasurementAnalysisLauncher'
-}
-
-jar {
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    manifest {
-        attributes("Main-Class": "$mainClassName")
-    }
-    from {
-        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
-    }
-
-    // exclude signing files that come from dependencies
-    exclude "META-INF/*.SF"
-    exclude "META-INF/*.DSA"
-    exclude "META-INF/*.RSA"
 }
 
 task productionZip(type: Zip) {
@@ -91,6 +80,9 @@ task productionZip(type: Zip) {
     archiveBaseName = project.name
 }
 
-wrapper {
-    gradleVersion = '7.5'
+if (rootProject == project) {
+    // the wrapper task is only used if this project is the root project i.e. not a subproject
+    wrapper {
+        gradleVersion = '7.5.1'
+    }
 }