Esri
diff --git a/‎.gitignore‎
Lines changed: 1 addition & 1 deletion b/‎.gitignore‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎README.md‎
Lines changed: 6 additions & 1 deletion b/‎README.md‎
Lines changed: 6 additions & 1 deletion
diff --git a/‎bom/build.gradle.kts‎
Lines changed: 3 additions & 2 deletions b/‎bom/build.gradle.kts‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎build.gradle.kts‎
Lines changed: 35 additions & 0 deletions b/‎build.gradle.kts‎
Lines changed: 35 additions & 0 deletions
diff --git a/‎buildSrc/src/main/kotlin/deploy/ArtifactPublisher.kt‎
Lines changed: 7 additions & 4 deletions b/‎buildSrc/src/main/kotlin/deploy/ArtifactPublisher.kt‎
Lines changed: 7 additions & 4 deletions
diff --git a/‎ci/publish.sh‎
Lines changed: 2 additions & 1 deletion b/‎ci/publish.sh‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎ci/run_gradle_task.sh‎
Lines changed: 1 addition & 1 deletion b/‎ci/run_gradle_task.sh‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎gradle.properties‎
Lines changed: 6 additions & 10 deletions b/‎gradle.properties‎
Lines changed: 6 additions & 10 deletions
diff --git a/‎gradle/libs.versions.toml‎
Lines changed: 39 additions & 11 deletions b/‎gradle/libs.versions.toml‎
Lines changed: 39 additions & 11 deletions
diff --git a/‎kdoc/build.gradle.kts‎
Lines changed: 0 additions & 7 deletions b/‎kdoc/build.gradle.kts‎
Lines changed: 0 additions & 7 deletions
@@ -23,7 +23,7 @@ proguard/
 .classpath
 bin/
 gen/
-/.settings
+.settings/
 .vscode/
 
 # OS generated files #
 
@@ -11,6 +11,8 @@ The ArcGIS Maps SDK for Kotlin Toolkit contains components that will simplify yo
 * **[GeoView-Compose](toolkit/geoview-compose)** - Compose wrappers for the MapView and SceneView.
   * **[Callout](toolkit/geoview-compose#display-a-callout)** - Draws a callout on the GeoView to display Composable content.
 * **[Popup](toolkit/popup)** - View field values of features in a layer using the Popup API.
+* **[UtilityNetworkTrace](toolkit/utilitynetworks)** - Configure, run, and visualize UtilityNetworkTraces on a composable MapView.
+* **[Augmented Reality](toolkit/ar)** - Provides components to "augment" the physical world with virtual content.
 
 ## API Reference
 
@@ -43,12 +45,15 @@ repositories {
 The *ArcGIS Maps SDK for Kotlin Toolkit* is released with a "bill of materials" (`BOM`). The releasable BOM is versioned and represents a set of versions of the toolkit components which are compatible with one another. You may specify dependencies as follows
 
 ```
-implementation(platform("com.esri:arcgis-maps-kotlin-toolkit-bom:200.5.0"))
+implementation(platform("com.esri:arcgis-maps-kotlin-toolkit-bom:200.6.0"))
 implementation("com.esri:arcgis-maps-kotlin-toolkit-authentication")
 implementation("com.esri:arcgis-maps-kotlin-toolkit-compass")
+implementation("com.esri:arcgis-maps-kotlin-toolkit-featureforms")
 implementation("com.esri:arcgis-maps-kotlin-toolkit-geoview-compose")
 implementation("com.esri:arcgis-maps-kotlin-toolkit-indoors")
 implementation("com.esri:arcgis-maps-kotlin-toolkit-popup")
+implementation("com.esri:arcgis-maps-kotlin-toolkit-utilitynetworks")
+implementation("com.esri:arcgis-maps-kotlin-toolkit-ar")
 ```
 
 The template and TemplateApp modules are for bootstrapping new modules.
 
@@ -31,8 +31,9 @@ val artifactoryUsername: String by project
 val artifactoryPassword: String by project
 val versionNumber: String by project
 val buildNumber: String by project
-val ignoreBuildNumber: String by project
-val artifactVersion: String = if (ignoreBuildNumber == "true") {
+val finalBuild: Boolean = (project.properties["finalBuild"] ?: "false")
+    .run { this == "true" }
+val artifactVersion: String = if (finalBuild) {
     versionNumber
 } else {
     "$versionNumber-$buildNumber"
 
@@ -28,6 +28,7 @@ plugins {
     alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.dokka) apply false
     alias(libs.plugins.gmazzo.test.aggregation)
+    alias(libs.plugins.compose.compiler) apply false
 }
 
 buildscript {
@@ -38,6 +39,38 @@ buildscript {
         // before any dependent subproject uses its symbols to configure a dokka task.
         classpath(libs.dokka.versioning)
     }
+    val finalBuild: Boolean = (project.properties["finalBuild"] ?: "false")
+        .run { this == "true" }
+
+    if (finalBuild) {
+        check(project.hasProperty("versionNumber"))
+        project.logger.info("release candidate build requested version ${project.properties["versionNumber"]}")
+    } else if (!project.hasProperty("versionNumber") && !project.hasProperty("buildNum")) {
+        // both version number and build number must be set
+        java.util.Properties().run {
+            try {
+                File(project.projectDir, "../buildnum/buildnum.txt")
+                    .reader()
+                    .use {
+                        load(it)
+                    }
+                this["BUILDVER"]?.let {
+                    project.extra.set("versionNumber", it)
+                }
+                this["BUILDNUM"]?.let {
+                    project.extra.set("buildNumber", it)
+                }
+                check(project.hasProperty("versionNumber"))
+                check(project.hasProperty("buildNumber"))
+                project.logger.info("version and build number set from buildnum.txt to ${project.properties["versionNumber"]}-${project.properties["buildNumber"]}")
+            } catch (t: Throwable) {
+                // The buildnum file is not there. ignore it and log a warning.
+                project.logger.warn("the buildnum.txt file is missing or not readable")
+                project.extra.set("versionNumber", "0.0.0")
+                project.extra.set("buildNumber", "SNAPSHOT")
+            }
+        }
+    }
 }
 
 // Path to the centralized folder in root directory where test reports for connected tests end up
@@ -60,6 +93,7 @@ testAggregation {
         "microapps-lib",
         "template",
         "template-app",
+        "utility-network-trace-app",
         "composable-map").forEach {
         this.modules.include(project(":$it"))
     }
@@ -77,3 +111,4 @@ fun getModulesExcept(vararg modulesToExclude: String): List<String> =
             }
             .filter { !modulesToExclude.contains(it) } // exclude specified modules
     }
+
@@ -21,10 +21,12 @@ package deploy
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.publish.PublishingExtension
-import org.gradle.api.publish.maven.plugins.MavenPublishPlugin
-import org.gradle.kotlin.dsl.*
 import org.gradle.api.publish.maven.MavenPublication
+import org.gradle.api.publish.maven.plugins.MavenPublishPlugin
 import org.gradle.configurationcache.extensions.capitalized
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.get
+import org.gradle.kotlin.dsl.provideDelegate
 import java.net.URI
 
 /**
@@ -45,9 +47,10 @@ class ArtifactPublisher : Plugin<Project> {
         val artifactoryUsername: String by project
         val artifactoryPassword: String by project
         val versionNumber: String by project
-        val ignoreBuildNumber: String by project
+        val finalBuild: Boolean = (project.properties["finalBuild"] ?: "false")
+            .run { this == "true" }
         val buildNumber: String by project
-        val artifactVersion: String = if (ignoreBuildNumber == "true") {
+        val artifactVersion: String = if (finalBuild) {
             versionNumber
         } else {
             "$versionNumber-$buildNumber"
 
@@ -69,7 +69,8 @@ function _check_options_and_set_variables() {
 
 function _publish() {
   _log "Publish the release build to artifactory"
-  if ! ${apps_path}/arcgis-maps-sdk-kotlin-toolkit/ci/run_gradle_task.sh -v -t publish -x "-PartifactoryUsername=${ARTIFACTORY_USR} -PartifactoryPassword=${ARTIFACTORY_PSW} -PversionNumber=${BUILDVER} -PbuildNumber=${BUILDNUM}" ; then
+
+  if ! ${apps_path}/arcgis-maps-sdk-kotlin-toolkit/ci/run_gradle_task.sh -t publish -x "-PartifactoryUsername=${ARTIFACTORY_USR} -PartifactoryPassword=${ARTIFACTORY_PSW} -PversionNumber=${BUILDVER} -PbuildNumber=${BUILDNUM} -PfinalBuild=${FINAL_BUILD}" ; then
     echo "error: Running the publish gradle task failed"
     exit 1
   fi
 
@@ -77,7 +77,7 @@ function _run_gradle_task() {
   if [ "${verbose}" == "true" ]; then
     gradle_flags+="--info "
   fi
-
+ 
   if ! ./gradlew ${gradle_flags} ${task} ${extra_gradle_flags}; then
     echo
     echo "error: Something went wrong when running gradle"
 
@@ -44,14 +44,10 @@ artifactoryGroupId=com.esri
 artifactoryArtifactBaseId=arcgis-maps-kotlin-toolkit
 artifactoryUsername=""
 artifactoryPassword=""
-# these numbers will define the artifact version on artifactory
-# and are overridden by the jenkins command line in the daily build
-versionNumber=200.5.0
-buildNumber=0000-snapshot
-#set this flag to `true` to ignore the build number when publishing. This
-# will publish an artifact with a build number like "..:200.2.0" as opposed to "...:200.2.0-3963
-ignoreBuildNumber=true
-# these versions define the dependency of the ArcGIS Maps SDK for Kotlin dependency
-# and are generally not overridden at the command line unless a special build is requested.
-sdkVersionNumber=200.5.0
+
+# These versions define the dependency of the ArcGIS Maps SDK for Kotlin dependency
+# when building the toolkit locally, typically from Android Studio. When building the toolkit
+# with CI, these versions are obtained from command line provided properties, see sdkVersionNumber
+# in settings.gradle.kts.
+sdkVersionNumber=200.6.0
 sdkBuildNumber=
@@ -3,41 +3,50 @@ activityCompose = "1.8.2"
 androidGradlePlugin = "8.3.2"
 androidXBrowser = "1.8.0"
 coilBOM = "2.5.0"
-composeBOM = "2024.04.01"
+composeBOM = "2024.10.00"
+androidxCamera = "1.4.0-rc02"
 androidxComposeCompiler = "1.5.12"
 androidxCore = "1.13.0"
 androidxEspresso = "3.5.1"
 androidxHiltNavigationCompose = "1.2.0"
 androidxLifecycle = "2.7.0"
 androidxMaterialIcons = "1.6.6"
 androidxTestExt = "1.1.5"
+androidXTestRunner = "1.6.2"
+androidXTestRules = "1.6.1"
 androidxWindow = "1.2.0"
 binaryCompatibilityValidator = "0.14.0"
 compileSdk = "34"
 compose-navigation = "2.7.7"
+commonMark = "0.22.0"
 dokka = "1.9.20"
 hilt = "2.49"
 hiltExt = "1.2.0"
 junit = "4.13.2"
-kotlin = "1.9.23"
-ksp = "1.9.23-1.0.20"
+kotlin = "2.0.20"
+ksp = "2.0.20-1.0.24"
 media3Exoplayer = "1.3.1"
 minSdk = "26"
+mlkitBarcodeScanning = "17.3.0"
 kotlinxCoroutinesTest = "1.8.0"
 kotlinxSerializationJson = "1.6.3"
 mockkAndroid = "1.13.10"
 room = "2.6.1"
 truth = "1.4.2"
 uiautomator = "2.3.0"
+arcore = "1.45.0"
 
 [libraries]
 androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose"}
 androidx-browser = { group = "androidx.browser", name = "browser", version.ref = "androidXBrowser"}
+androidx-camera-core = { group = "androidx.camera", name = "camera-core", version.ref = "androidxCamera" }
+androidx-camera-camera2 = { group = "androidx.camera", name = "camera-camera2", version.ref = "androidxCamera" }
+androidx-camera-lifecycle = { group = "androidx.camera", name = "camera-lifecycle", version.ref = "androidxCamera" }
+androidx-camera-view = { group = "androidx.camera", name = "camera-view", version.ref = "androidxCamera" }
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCore" }
 androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBOM" }
 androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }
 androidx-compose-ui = { group = "androidx.compose.ui", name = "ui"}
-androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime"}
 androidx-compose-material3 = { module = "androidx.compose.material3:material3"}
 androidx-compose-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "compose-navigation" }
 androidx-compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics"}
@@ -56,13 +65,18 @@ androidx-media3-ui = { module = "androidx.media3:media3-ui", version.ref = "medi
 androidx-media3-exoplayer-dash = { module = "androidx.media3:media3-exoplayer-dash", version.ref = "media3Exoplayer" }
 androidx-test-ext = { group = "androidx.test.ext", name = "junit-ktx", version.ref = "androidxTestExt" }
 androidx-test-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "androidxEspresso" }
+androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = "androidXTestRunner" }
+androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "androidXTestRules" }
 androidx-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "uiautomator" }
 androidx-window = { group = "androidx.window", name = "window", version.ref = "androidxWindow" }
 androidx-window-core = { group = "androidx.window", name = "window-core", version.ref = "androidxWindow" }
+mlkit-barcode-scanning = { module = "com.google.mlkit:barcode-scanning", version.ref = "mlkitBarcodeScanning" }
 coil-bom = { group = "io.coil-kt", name = "coil-bom", version.ref = "coilBOM" }
 coil = { group = "io.coil-kt", name = "coil" }
 coil-base = { group = "io.coil-kt", name = "coil-base" }
 coil-compose = { group = "io.coil-kt", name = "coil-compose" }
+commonmark = { group = "org.commonmark", name = "commonmark", version.ref="commonMark" }
+commonmark-strikethrough = { group = "org.commonmark", name = "commonmark-ext-gfm-strikethrough", version.ref="commonMark" }
 hilt-android-core = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" }
 hilt-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "hilt" }
 hilt-ext-compiler = { group = "androidx.hilt", name = "hilt-compiler", version.ref = "hiltExt" }
@@ -78,6 +92,7 @@ room-compiler = { group = "androidx.room", name = "room-compiler", version.ref =
 room-ext = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
 truth = { group = "com.google.truth", name = "truth", version.ref = "truth" }
 dokka-versioning = { group = "org.jetbrains.dokka", name = "versioning-plugin", version.ref = "dokka" }
+arcore = { group = "com.google.ar", name = "core", version.ref = "arcore" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
@@ -89,13 +104,26 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 gradle-secrets = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version = "2.0.1"}
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 gmazzo-test-aggregation = { id = "io.github.gmazzo.test.aggregation.results", version = "2.2.0" }
 
 [bundles]
+camerax = [
+    "androidx-camera-core",
+    "androidx-camera-camera2",
+    "androidx-camera-lifecycle",
+    "androidx-camera-view"
+]
+
 core = [
     "androidx-core-ktx"
 ]
 
+commonmark = [
+    "commonmark",
+    "commonmark-strikethrough"
+]
+
 composeCore = [
     "androidx-compose-material3",
     "androidx-compose-ui",
@@ -107,22 +135,22 @@ composeCore = [
 composeTest = [
     "androidx-test-ext",
     "androidx-test-espresso-core",
-    "androidx-compose-ui-test"
+    "androidx-compose-ui-test",
+    "truth"
 ]
 
 debug = [
     "androidx-compose-ui-tooling",
     "androidx-compose-ui-test-manifest"
 ]
 
-serialization = [
-    "kotlinx-serialization-core",
-    "kotlinx-serialization-json",
-    "kotlin-reflect"
-]
-
 unitTest = [
     "junit",
     "kotlinx-coroutines-test",
     "truth"
 ]
+
+androidXTest = [
+    "androidx-test-runner",
+    "androidx-test-rules"
+]
@@ -23,13 +23,6 @@ plugins {
 }
 
 val versionNumber: String by project
-val buildNumber: String by project
-val ignoreBuildNumber: String by project
-val artifactVersion: String = if (ignoreBuildNumber == "true") {
-    versionNumber
-} else {
-    "$versionNumber-$buildNumber"
-}
 
 // make this project get evaluated after all the other projects
 // so that we can be sure the logic to determine released components