Esri
diff --git a/‎README.md‎
Lines changed: 41 additions & 3 deletions b/‎README.md‎
Lines changed: 41 additions & 3 deletions
diff --git a/‎build.gradle.kts‎
Lines changed: 22 additions & 0 deletions b/‎build.gradle.kts‎
Lines changed: 22 additions & 0 deletions
diff --git a/‎ci/publish.sh‎
Lines changed: 9 additions & 4 deletions b/‎ci/publish.sh‎
Lines changed: 9 additions & 4 deletions
diff --git a/‎gradle.properties‎
Lines changed: 1 addition & 4 deletions b/‎gradle.properties‎
Lines changed: 1 addition & 4 deletions
diff --git a/‎gradle/libs.versions.toml‎
Lines changed: 20 additions & 18 deletions b/‎gradle/libs.versions.toml‎
Lines changed: 20 additions & 18 deletions
diff --git a/‎gradle/wrapper/gradle-wrapper.jar‎
-19.7 KB b/‎gradle/wrapper/gradle-wrapper.jar‎
-19.7 KB
diff --git a/‎gradle/wrapper/gradle-wrapper.properties‎
Lines changed: 1 addition & 1 deletion b/‎gradle/wrapper/gradle-wrapper.properties‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎gradlew‎
Lines changed: 4 additions & 2 deletions b/‎gradlew‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎gradlew.bat‎
Lines changed: 12 additions & 10 deletions b/‎gradlew.bat‎
Lines changed: 12 additions & 10 deletions
diff --git a/‎microapps/ArFlyoverApp/.gitignore‎
Lines changed: 15 additions & 0 deletions b/‎microapps/ArFlyoverApp/.gitignore‎
Lines changed: 15 additions & 0 deletions
@@ -4,18 +4,23 @@ The ArcGIS Maps SDK for Kotlin Toolkit contains components that will simplify yo
 
 ## Toolkit Components
 
+* **[Augmented Reality](toolkit/ar)** - Provides components to "augment" the physical world with virtual content.
+  * **[FlyoverSceneView](toolkit/ar#flyoversceneview)** - Allows you to explore a scene using your device as a window into the virtual world.
+  * **[TableTopSceneView](toolkit/ar#tabletopsceneview)** - Allows you to anchor scene content to a physical surface, as if it were a 3D-printed model.
+  * **[WorldScaleSceneView](toolkit/ar#worldscalesceneview)** - Allows you to integrate scene content with the real world features like streets and buildings.
 * **[Authenticator](toolkit/authentication)** - Displays a user interface when network and ArcGIS authentication challenges occur.
 * **[Basemap Gallery](toolkit/basemapgallery)** - Provides a control for selecting basemaps
 * **[Compass](toolkit/compass)** - Shows a compass direction when the map is rotated. Auto-hides when the map points north.
 * **[FeatureForms](toolkit/featureforms)** - Provides a UI for editing feature attributes.
 * **[FloorFilter](toolkit/indoors)** - Allows filtering of floor plan data in a geo view by a site, a facility in the site, or a floor in the facility.
 * **[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.
+  * **[OverviewMap](toolkit/geoview-compose#display-an-overviewmap)** - Displays the visible extent of a GeoView in a small "inset" map.
 * **[Legend](toolkit/legend)** - Displays a legend for a map or a scene.  
+* **[OfflineMapAreas](toolkit/offline)** - Allows you to take a web map offline by downloading map areas ahead-of-time or on-demand.
 * **[Popup](toolkit/popup)** - View field values of features in a layer using the Popup API.
 * **[Scalebar](toolkit/scalebar)** - Displays current scale reference.
 * **[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
 
@@ -48,13 +53,14 @@ 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.7.0"))
+implementation(platform("com.esri:arcgis-maps-kotlin-toolkit-bom:200.8.0"))
 implementation("com.esri:arcgis-maps-kotlin-toolkit-authentication")
 implementation("com.esri:arcgis-maps-kotlin-toolkit-basemapgallery")
 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-legend")
+implementation("com.esri:arcgis-maps-kotlin-toolkit-offline")
 implementation("com.esri:arcgis-maps-kotlin-toolkit-indoors")
 implementation("com.esri:arcgis-maps-kotlin-toolkit-popup")
 implementation("com.esri:arcgis-maps-kotlin-toolkit-scalebar")
@@ -66,6 +72,38 @@ The template and TemplateApp modules are for bootstrapping new modules.
 
 Please see the [package structure](doc/general/developer_setup.md#package-structure) documentation for more details.
 
+## Accessing Esri location services
+
+Some toolkit components may require access to Esri location services, including basemaps, routing,
+and geocoding, which requires authentication using either an API Key or an ArcGIS identity. The
+toolkit code is set up to easily use an API key.
+
+### API key
+
+A long-lived access token that gives your application access to ArcGIS location services. Go to
+the [Create an API key](https://links.esri.com/create-an-api-key) tutorial to obtain a new API key
+access token. Ensure that the following privileges are enabled:
+
+* **Location services** > **Basemaps**
+* **Location services** > **Geocoding**
+* **Location services** > **Routing**
+
+The components in this repository have been structured to use an access token, set once.
+Set your access token in the `local.properties` in the same folder as the
+`secrets.defaults.properties` as shown below.
+
+```gradle
+API_KEY=YOUR_ACCESS_TOKEN
+```
+
+### ArcGIS identity
+
+An ArcGIS named user account that is a member of an organization in ArcGIS Online or ArcGIS
+Enterprise can be used as an alternative to API keys. Most toolkit micro apps don't make use of
+named user authentication.
+See [User authentication](https://developers.arcgis.com/kotlin/security-and-authentication/#user-authentication)
+for more information.
+
 ## Issues
 
 Find a bug or want to request a new feature enhancement? Please let us know by [submitting an issue](https://github.com/Esri/arcgis-maps-sdk-kotlin-toolkit/issues/new).
@@ -132,7 +170,7 @@ The test reports for connected tests can be located under `arcgis-maps-sdk-kotli
 
 ## Licensing
 
-Copyright 2019-2022 Esri
+Copyright 2019-2025 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
 
 
@@ -39,6 +39,28 @@ buildscript {
         // before any dependent subproject uses its symbols to configure a dokka task.
         classpath(libs.dokka.versioning)
     }
+    val localProperties = java.util.Properties().apply {
+        val localPropertiesFile = file("local.properties")
+        if (localPropertiesFile.exists()) {
+            load(localPropertiesFile.inputStream())
+        }
+    }
+    // Find these in properties passed through command line or read from local.properties and
+    // set them as project properties
+    val artifactoryUrl: String? = project.findProperty("artifactoryUrl") as String?
+        ?: localProperties.getProperty("artifactoryUrl")
+        ?: "https://esri.jfrog.io/artifactory/arcgis"
+    val artifactoryUsername: String? = project.findProperty("artifactoryUsername") as String?
+        ?: localProperties.getProperty("artifactoryUsername")
+        ?: ""
+    val artifactoryPassword: String? = project.findProperty("artifactoryPassword") as String?
+        ?: localProperties.getProperty("artifactoryPassword")
+        ?: ""
+
+    project.extra.set("artifactoryUrl", artifactoryUrl)
+    project.extra.set("artifactoryUsername", artifactoryUsername)
+    project.extra.set("artifactoryPassword", artifactoryPassword)
+
     val finalBuild: Boolean = (project.properties["finalBuild"] ?: "false")
         .run { this == "true" }
 
 
@@ -27,9 +27,9 @@ function _display_help_dialog() {
   echo "              and publishes the build to artifactory. It will build the"
   echo "              artifacts if any build dependency is not up to date"
   echo
-  echo "              This script requires the ARTIFACTORY_USR and ARTIFACTORY_PSW "
-  echo "              environment variables to be set to the artifactory username"
-  echo "              and encrypted password"
+  echo "              This script requires the ARTIFACTORY_URL, ARTIFACTORY_USR,"
+  echo "              and ARTIFACTORY_PSW environment variables to be set to the"
+  echo "              Artifactory url, username and encrypted password"
   echo
   echo " -h      Displays this help dialog."
   echo "          Optional"
@@ -46,6 +46,11 @@ function _display_help() {
 }
 
 function _check_options_and_set_variables() {
+  if [ -z "${ARTIFACTORY_URL}" ]; then
+    echo "error: ARTIFACTORY_URL is empty but publishing is being requested"
+    exit 1
+  fi
+
   if [ -z "${ARTIFACTORY_USR}" ]; then
     echo "error: ARTIFACTORY_USR is empty but publishing is being requested"
     exit 1
@@ -70,7 +75,7 @@ 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 -t publish -x "-PartifactoryUsername=${ARTIFACTORY_USR} -PartifactoryPassword=${ARTIFACTORY_PSW} -PversionNumber=${BUILDVER} -PbuildNumber=${BUILDNUM} -PfinalBuild=${FINAL_BUILD}" ; then
+  if ! ${apps_path}/arcgis-maps-sdk-kotlin-toolkit/ci/run_gradle_task.sh -t publish -x "-PartifactoryUrl=${ARTIFACTORY_URL} -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
 
@@ -39,11 +39,8 @@ kotlin.code.style=official
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-artifactoryUrl=https://olympus.esri.com/artifactory/arcgisruntime-snapshot-local
 artifactoryGroupId=com.esri
 artifactoryArtifactBaseId=arcgis-maps-kotlin-toolkit
-artifactoryUsername=""
-artifactoryPassword=""
 
 # These versions define the dependency of the ArcGIS Maps SDK for Kotlin dependency
 # when building the toolkit locally, typically from Android Studio.
@@ -52,4 +49,4 @@ artifactoryPassword=""
 # sdkBuildNumber=4446
 # When building the toolkit with CI, these versions are obtained from command line provided properties,
 # see sdkVersionNumber in settings.gradle.kts.
-sdkVersionNumber=200.7.0
+sdkVersionNumber=200.8.0
@@ -1,41 +1,43 @@
 [versions]
-activityCompose = "1.9.3"
-androidGradlePlugin = "8.7.3"
+activityCompose = "1.10.1"
+androidGradlePlugin = "8.9.2"
 androidXBrowser = "1.8.0"
 coilBOM = "2.5.0"
-composeBOM = "2024.11.00"
+composeBOM = "2025.04.01"
 androidxCamera = "1.4.2"
 androidxComposeCompiler = "1.5.12"
-androidxCore = "1.15.0"
+androidxCore = "1.16.0"
 androidxEspresso = "3.6.1"
 androidxHiltNavigationCompose = "1.2.0"
-androidxLifecycle = "2.8.7"
-androidxMaterialIcons = "1.7.5"
+androidxMaterialIcons = "1.7.8"
 androidxTestExt = "1.2.1"
 androidXTestRunner = "1.6.2"
 androidXTestRules = "1.6.1"
 androidxWindow = "1.3.0"
+workVersion = "2.10.0"
 binaryCompatibilityValidator = "0.17.0"
-compileSdk = "35"
-compose-navigation = "2.8.4"
+compileSdk = "36"
+compose-navigation = "2.8.9"
 commonMark = "0.22.0"
 dokka = "2.0.0"
 hilt = "2.55"
 hiltExt = "1.2.0"
 junit = "4.13.2"
-kotlin = "2.1.0"
-ksp = "2.1.0-1.0.29"
-media3Exoplayer = "1.5.0"
-minSdk = "26"
+kotlin = "2.1.20"
+ksp = "2.1.20-1.0.32"
+media3Exoplayer = "1.6.1"
+minSdk = "28"
 mlkitBarcodeScanning = "17.3.0"
 kotlinxCoroutinesTest = "1.8.0"
 kotlinxSerializationJson = "1.8.0"
-mockkAndroid = "1.13.12"
-room = "2.6.1"
+mockkAndroid = "1.14.0"
+room = "2.7.0"
 truth = "1.4.4"
 uiautomator = "2.3.0"
-arcore = "1.47.0"
+arcore = "1.48.0"
 playServicesLocation = "21.3.0"
+gmazzo = "2.4.4"
+gradleSecrets = "2.0.1"
 
 [libraries]
 androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose"}
@@ -57,7 +59,6 @@ androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "u
 androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest"}
 androidx-compose-ui-util = { group = "androidx.compose.ui", name = "ui-util"}
 androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" }
-androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidxLifecycle" }
 androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose"}
 androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose"}
 androidx-material-icons = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "androidxMaterialIcons"}
@@ -71,6 +72,7 @@ androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "
 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" }
+androidx-work-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "workVersion" }
 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" }
@@ -104,10 +106,10 @@ dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 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"}
+gradle-secrets = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "gradleSecrets"}
 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" }
+gmazzo-test-aggregation = { id = "io.github.gmazzo.test.aggregation.results", version.ref = "gmazzo" }
 
 [bundles]
 camerax = [
 
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
 
@@ -0,0 +1,15 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`# See the License for the specific language governing permissions and`
`16`	`16`	`# limitations under the License.`
`17`	`17`	`#`
	`18`	`+# SPDX-License-Identifier: Apache-2.0`
	`19`	`+#`
`18`	`20`
`19`	`21`	`##############################################################################`
`20`	`22`	`#`
`@@ -55,7 +57,7 @@`
`55`	`57`	`# Darwin, MinGW, and NonStop.`
`56`	`58`	`#`
`57`	`59`	`# (3) This script is generated from the Groovy template`
`58`		`-# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt`
	`60`	`+# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt`
`59`	`61`	`# within the Gradle project.`
`60`	`62`	`#`
`61`	`63`	`# You can find Gradle at https://github.com/gradle/gradle/.`
`@@ -84,7 +86,7 @@ done`
`84`	`86`	`# shellcheck disable=SC2034`
`85`	`87`	`APP_BASE_NAME=${0##*/}`
`86`	`88`	`# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)`
`87`		`-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) \|\| exit`
	`89`	`+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) \|\| exit`
`88`	`90`
`89`	`91`	`# Use the maximum available, or set MAX_FD != -1 to use that value.`
`90`	`92`	`MAX_FD=maximum`