diff --git a/bom/build.gradle.kts b/bom/build.gradle.kts
index 941902952..326cc2bca 100644
--- a/bom/build.gradle.kts
+++ b/bom/build.gradle.kts
@@ -17,79 +17,7 @@
  */
 
 plugins {
-    id("maven-publish")
-    id("java-platform")
+    `maven-publish`
+    `java-platform`
+    alias(libs.plugins.arcgismaps.kotlin.bom.convention)
 }
-
-// Find these in properties passed through command line or read from GRADLE_HOME/gradle.properties
-// or local gradle.properties
-val artifactoryGroupId: String by project
-val artifactoryArtifactBaseId: String by project
-val artifactoryArtifactId: String = "$artifactoryArtifactBaseId-${project.name}"
-val artifactoryUrl: String by project
-val artifactoryUsername: String by project
-val artifactoryPassword: String by project
-val versionNumber: String by project
-val buildNumber: String by project
-val finalBuild: Boolean = (project.properties["finalBuild"] ?: "false")
-    .run { this == "true" }
-val artifactVersion: String = if (finalBuild) {
-    versionNumber
-} else {
-    "$versionNumber-$buildNumber"
-}
-
-// ensure that the evaluation of the bom project happens after all other projects
-// so that plugins are applied to all projects, and can be used to identify
-// which projects should get written into the BOM's pom file.
-rootProject.subprojects.filter {
-    it.name != project.name
-}.forEach {
-    evaluationDependsOn(":${it.name}")
-}
-
-// now find projects which are publishable based on their inclusion
-// of the publishing plugin, and add them as api dependencies.
-dependencies {
-    constraints {
-        project.rootProject.subprojects.filter {
-            it.plugins.findPlugin("artifact-deploy") != null
-        }.forEach { subproject ->
-            // add all the intended library projects as api dependencies.
-            api(subproject)
-        }
-    }
-}
-
-afterEvaluate {
-    /**
-     * Maven publication configuration for aar and pom file. Run as follows:
-     * ./gradlew publishAarPublicationToMavenRepository -PartifactoryUsername=<username> -PartifactoryPassword=<password>
-     *
-     * More details:
-     * https://docs.gradle.org/current/userguide/publishing_maven.html
-     */
-    publishing {
-        publications {
-            create<MavenPublication>("bom") {
-                groupId = artifactoryGroupId
-                artifactId = artifactoryArtifactId
-                version = artifactVersion
-                
-                from(components["javaPlatform"])
-            }
-        }
-        
-        repositories {
-            maven {
-                url = uri(artifactoryUrl)
-                credentials {
-                    username = artifactoryUsername
-                    password = artifactoryPassword
-                }
-            }
-        }
-    }
-}
-
-
diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
index fac128bb2..80fe41e8e 100644
--- a/build-logic/convention/build.gradle.kts
+++ b/build-logic/convention/build.gradle.kts
@@ -19,10 +19,12 @@ tasks.withType<KotlinCompile>().configureEach {
 }
 
 dependencies {
+    compileOnly(gradleApi())
     compileOnly(libs.android.gradlePlugin)
     compileOnly(libs.android.tools.common)
     compileOnly(libs.kotlin.gradlePlugin)
     compileOnly(libs.ksp.gradlePlugin)
+    implementation(libs.dokka.gradle.plugin)
 }
 
 tasks {
@@ -58,5 +60,21 @@ gradlePlugin {
             id = "arcgismaps.kotlin.microapp"
             implementationClass = "ArcGISMapsKotlinMicroappConventionPlugin"
         }
+        register("arcGISMapsKotlinSDK") {
+            id = "arcgismaps.kotlin.sdk"
+            implementationClass = "ArcGISMapsKotlinSDKConventionPlugin"
+        }
+        register("arcGISMapsRootConventionPlugin") {
+            id = "arcgismaps.kotlin.root.convention"
+            implementationClass = "ArcGISMapsRootConventionPlugin"
+        }
+        register("arcGISMapsKdocConventionPlugin") {
+            id = "arcgismaps.kotlin.kdoc.convention"
+            implementationClass = "ArcGISMapsKdocConventionPlugin"
+        }
+        register("arcGISMapsBomConventionPlugin") {
+            id = "arcgismaps.kotlin.bom.convention"
+            implementationClass = "ArcGISMapsBomConventionPlugin"
+        }
     }
 }
diff --git a/build-logic/convention/src/main/java/AndroidApplicationComposeConventionPlugin.kt b/build-logic/convention/src/main/java/AndroidApplicationComposeConventionPlugin.kt
index 06dc52b38..ef6e46266 100644
--- a/build-logic/convention/src/main/java/AndroidApplicationComposeConventionPlugin.kt
+++ b/build-logic/convention/src/main/java/AndroidApplicationComposeConventionPlugin.kt
@@ -1,19 +1,35 @@
 import com.android.build.api.dsl.ApplicationExtension
 import com.esri.arcgismaps.kotlin.build_logic.convention.configureAndroidCompose
+import com.esri.arcgismaps.kotlin.build_logic.convention.configureKotlinAndroid
+import com.esri.arcgismaps.kotlin.build_logic.extensions.debugImplementation
+import com.esri.arcgismaps.kotlin.build_logic.extensions.implementation
+import com.esri.arcgismaps.kotlin.build_logic.extensions.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.getByType
 
 class AndroidApplicationComposeConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
             with(pluginManager) {
-                apply("com.android.application")
-                apply("org.jetbrains.kotlin.android")
-                apply("org.jetbrains.kotlin.plugin.compose")
+                apply(libs.findPlugin("android-application").get().get().pluginId)
+                apply(libs.findPlugin("kotlin-android").get().get().pluginId)
+                apply(libs.findPlugin("compose-compiler").get().get().pluginId)
             }
             val extension = extensions.getByType<ApplicationExtension>()
+            configureKotlinAndroid(extension)
             configureAndroidCompose(extension)
+
+            // Add common Compose dependencies for application modules
+            dependencies {
+                implementation(platform(libs.findLibrary("androidx-compose-bom").get()))
+                implementation(libs.findBundle("composeCore").get())
+                implementation(libs.findBundle("core").get())
+                implementation(libs.findLibrary("androidx-activity-compose").get())
+                implementation(libs.findLibrary("androidx-lifecycle-viewmodel-compose").get())
+                debugImplementation(libs.findBundle("debug").get())
+            }
         }
     }
 }
diff --git a/build-logic/convention/src/main/java/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/java/AndroidApplicationConventionPlugin.kt
index 67049682e..03bdc1f2e 100644
--- a/build-logic/convention/src/main/java/AndroidApplicationConventionPlugin.kt
+++ b/build-logic/convention/src/main/java/AndroidApplicationConventionPlugin.kt
@@ -1,32 +1,34 @@
 import com.android.build.api.dsl.ApplicationExtension
 import com.esri.arcgismaps.kotlin.build_logic.convention.configureKotlinAndroid
-import com.esri.arcgismaps.kotlin.build_logic.convention.libs
+import com.esri.arcgismaps.kotlin.build_logic.extensions.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.get
 
-class AndroidApplicationConventionPlugin: Plugin<Project> {
+class AndroidApplicationConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
             with(pluginManager) {
-                apply("com.android.application")
-                apply("org.jetbrains.kotlin.android")
+                apply(libs.findPlugin("android-application").get().get().pluginId)
+                apply(libs.findPlugin("kotlin-android").get().get().pluginId)
             }
 
             extensions.configure<ApplicationExtension> {
                 configureKotlinAndroid(this)
-                compileSdk = 35
                 defaultConfig {
-
                     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
                     vectorDrawables {
                         useSupportLibrary = true
                     }
                     minSdk = libs.findVersion("minSdk").get().toString().toInt()
-                    targetSdk = libs.findVersion("targetSdk").get().toString().toInt()
-                    versionCode = libs.findVersion("versionCode").get().toString().toInt()
-                    versionName = libs.findVersion("versionName").get().toString()
+                    targetSdk = libs.findVersion("compileSdk").get().toString().toInt()
+                    versionCode = 1
+                    versionName = "1.0"
+                }
+
+                buildFeatures {
+                    buildConfig = true
                 }
 
                 buildTypes {
diff --git a/build-logic/convention/src/main/java/AndroidLibraryComposeConventionPlugin.kt b/build-logic/convention/src/main/java/AndroidLibraryComposeConventionPlugin.kt
index c20d05e75..629ccf508 100644
--- a/build-logic/convention/src/main/java/AndroidLibraryComposeConventionPlugin.kt
+++ b/build-logic/convention/src/main/java/AndroidLibraryComposeConventionPlugin.kt
@@ -1,19 +1,44 @@
 import com.android.build.api.dsl.LibraryExtension
 import com.esri.arcgismaps.kotlin.build_logic.convention.configureAndroidCompose
+import com.esri.arcgismaps.kotlin.build_logic.convention.configureKotlinAndroid
+import com.esri.arcgismaps.kotlin.build_logic.extensions.implementation
+import com.esri.arcgismaps.kotlin.build_logic.extensions.libs
+import com.esri.arcgismaps.kotlin.build_logic.extensions.testImplementation
+import com.esri.arcgismaps.kotlin.build_logic.extensions.androidTestImplementation
+import com.esri.arcgismaps.kotlin.build_logic.extensions.debugImplementation
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.getByType
 
 class AndroidLibraryComposeConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
             with(pluginManager) {
-                apply("com.android.library")
-                apply("org.jetbrains.kotlin.android")
-                apply("org.jetbrains.kotlin.plugin.compose")
+                apply(libs.findPlugin("android-library").get().get().pluginId)
+                apply(libs.findPlugin("kotlin-android").get().get().pluginId)
+                apply(libs.findPlugin("compose-compiler").get().get().pluginId)
+                apply(libs.findPlugin("kotlin-parcelize").get().get().pluginId)
+                apply(libs.findPlugin("kotlin-serialization").get().get().pluginId)
             }
             val extension = extensions.getByType<LibraryExtension>()
+            configureKotlinAndroid(extension)
             configureAndroidCompose(extension)
+
+            // Add common Compose dependencies for library modules
+            dependencies {
+                implementation(platform(libs.findLibrary("androidx-compose-bom").get()))
+                implementation(libs.findBundle("composeCore").get())
+                implementation(libs.findBundle("core").get())
+                implementation(libs.findLibrary("androidx-lifecycle-runtime-compose").get())
+                implementation(libs.findLibrary("androidx-activity-compose").get())
+                implementation(libs.findLibrary("androidx-material-icons").get())
+                implementation(libs.findLibrary("kotlinx-serialization-json").get())
+                testImplementation(libs.findBundle("unitTest").get())
+                androidTestImplementation(libs.findBundle("composeTest").get())
+                androidTestImplementation(libs.findBundle("androidXTest").get())
+                debugImplementation(libs.findBundle("debug").get())
+            }
         }
     }
 }
diff --git a/build-logic/convention/src/main/java/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/java/AndroidLibraryConventionPlugin.kt
index 53d5fc774..44514aec1 100644
--- a/build-logic/convention/src/main/java/AndroidLibraryConventionPlugin.kt
+++ b/build-logic/convention/src/main/java/AndroidLibraryConventionPlugin.kt
@@ -1,8 +1,7 @@
 import com.android.build.gradle.LibraryExtension
 import com.esri.arcgismaps.kotlin.build_logic.convention.configureKotlinAndroid
-import com.esri.arcgismaps.kotlin.build_logic.convention.implementation
-import com.esri.arcgismaps.kotlin.build_logic.convention.libs
-import com.esri.arcgismaps.kotlin.build_logic.convention.testImplementation
+import com.esri.arcgismaps.kotlin.build_logic.extensions.libs
+import com.esri.arcgismaps.kotlin.build_logic.extensions.testImplementation
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
@@ -13,20 +12,20 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
             with(pluginManager) {
-                apply("com.android.library")
-                apply("org.jetbrains.kotlin.android")
+                apply(libs.findPlugin("android-library").get().get().pluginId)
+                apply(libs.findPlugin("kotlin-android").get().get().pluginId)
             }
 
             extensions.configure<LibraryExtension> {
                 configureKotlinAndroid(this)
-                compileSdk = 35
                 defaultConfig {
                     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
                     vectorDrawables {
                         useSupportLibrary = true
                     }
                     minSdk = libs.findVersion("minSdk").get().toString().toInt()
-                    lint.targetSdk = libs.findVersion("targetSdk").get().toString().toInt()
+                    lint.targetSdk = libs.findVersion("compileSdk").get().toString().toInt()
+                    consumerProguardFiles("consumer-rules.pro")
                 }
 
                 buildTypes {
@@ -48,10 +47,6 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
 
             dependencies {
                 testImplementation(kotlin("test"))
-                // External libraries
-                implementation(libs.findLibrary("androidx-constraintlayout").get())
-                implementation(libs.findLibrary("androidx-appcompat").get())
-                implementation(libs.findLibrary("android-material").get())
             }
         }
     }
diff --git a/build-logic/convention/src/main/java/ArcGISMapsBomConventionPlugin.kt b/build-logic/convention/src/main/java/ArcGISMapsBomConventionPlugin.kt
new file mode 100644
index 000000000..f99edca73
--- /dev/null
+++ b/build-logic/convention/src/main/java/ArcGISMapsBomConventionPlugin.kt
@@ -0,0 +1,74 @@
+import com.esri.arcgismaps.kotlin.build_logic.extensions.ToolkitRegistryExtension
+import com.esri.arcgismaps.kotlin.build_logic.extensions.api
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.publish.PublishingExtension
+import org.gradle.api.publish.maven.MavenPublication
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.get
+import org.gradle.kotlin.dsl.provideDelegate
+
+class ArcGISMapsBomConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) = with(target) {
+        // Platform  publishing
+        pluginManager.apply("maven-publish")
+        pluginManager.apply("java-platform")
+
+        // Find these in properties passed through command line or read from GRADLE_HOME/gradle.properties
+        // or local gradle.properties
+        val artifactoryGroupId: String by project
+        val artifactoryArtifactBaseId: String by project
+        val artifactoryUrl: String by project
+        val artifactoryUsername: String by project
+        val artifactoryPassword: String by project
+        val versionNumber: String by project
+        val buildNumber: String by project
+        val finalBuild: Boolean = (project.properties["finalBuild"] ?: "false").toString() == "true"
+        val artifactVersion = if (finalBuild) versionNumber else "$versionNumber-$buildNumber"
+        val artifactoryArtifactId = "$artifactoryArtifactBaseId-${project.name}"
+
+        // now find projects which are publishable based on their inclusion  of the toolkit plugin,
+        // and add them as api dependencies.
+        afterEvaluate {
+            dependencies {
+                constraints {
+                    // grab the populated set
+                    val registry = rootProject.extensions.getByType(ToolkitRegistryExtension::class.java)
+                    registry.toolkitProjects.forEach { p ->
+                        val moduleArtifactId = "$artifactoryArtifactBaseId-${p.name}"
+                        // add the toolkit project as api
+                        api("$artifactoryGroupId:$moduleArtifactId:$artifactVersion")
+                    }
+                }
+            }
+        }
+
+        /**
+         * Maven publication configuration for aar and pom file. Run as follows:
+         * ./gradlew publishAarPublicationToMavenRepository -PartifactoryUsername=<username> -PartifactoryPassword=<password>
+         *
+         * More details:
+         * https://docs.gradle.org/current/userguide/publishing_maven.html
+         */
+        extensions.configure(PublishingExtension::class.java) {
+            publications {
+                create("bom", MavenPublication::class.java) {
+                    groupId = artifactoryGroupId
+                    artifactId = artifactoryArtifactId
+                    version = artifactVersion
+
+                    from(components["javaPlatform"])
+                }
+            }
+            repositories {
+                maven {
+                    url = uri(artifactoryUrl)
+                    credentials {
+                        username = artifactoryUsername
+                        password = artifactoryPassword
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/build-logic/convention/src/main/java/ArcGISMapsKdocConventionPlugin.kt b/build-logic/convention/src/main/java/ArcGISMapsKdocConventionPlugin.kt
new file mode 100644
index 000000000..14c6ba42a
--- /dev/null
+++ b/build-logic/convention/src/main/java/ArcGISMapsKdocConventionPlugin.kt
@@ -0,0 +1,70 @@
+import com.esri.arcgismaps.kotlin.build_logic.extensions.ToolkitRegistryExtension
+import com.esri.arcgismaps.kotlin.build_logic.extensions.implementation
+import com.esri.arcgismaps.kotlin.build_logic.extensions.libs
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.invoke
+import org.gradle.kotlin.dsl.provideDelegate
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.dokka.gradle.DokkaExtension
+import org.jetbrains.dokka.gradle.engine.plugins.DokkaVersioningPluginParameters
+import java.io.File
+
+class ArcGISMapsKdocConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) = with(target) {
+        with(pluginManager) {
+            apply(libs.findPlugin("arcgismaps-android-library").get().get().pluginId)
+            apply(libs.findPlugin("dokka").get().get().pluginId)
+            // Put exposed dependencies in dokka's classpath
+            apply(libs.findPlugin("arcgismaps.kotlin.sdk").get().get().pluginId)
+        }
+
+        dependencies {
+            // Puts the version in the KDoc
+            add("dokkaPlugin", libs.findLibrary("dokka.versioning").get())
+            // Put exposed dependencies in dokka's classpath
+            implementation(platform(libs.findLibrary("androidx-compose-bom").get()))
+            implementation(libs.findBundle("composeCore").get())
+        }
+
+        val versionNumber: String by project
+        // Create the toolkit sources provider
+        val registry = rootProject.extensions.getByType(ToolkitRegistryExtension::class.java)
+        val sourceRootsProvider = providers.provider {
+            registry.toolkitProjects.map { p ->
+                File(rootDir, "toolkit/${p.name}/src/main/java").canonicalPath
+            }
+        }
+
+        //./gradlew :kdoc:dokkaGenerate
+        // doc output will be under `kdoc/build/dokka/html`
+        extensions.configure<DokkaExtension> {
+            pluginsConfiguration.withType<DokkaVersioningPluginParameters>().configureEach {
+                version.set(versionNumber)
+            }
+
+            moduleName.set("arcgis-maps-kotlin-toolkit")
+
+            dokkaSourceSets {
+                if (findByName("main") == null) {
+                    register("main")
+                }
+
+                named("main") {
+                    sourceRoots.from(files(sourceRootsProvider))
+                }
+                configureEach {
+                    perPackageOption {
+                        matchingRegex.set(".*internal.*")
+                        suppress.set(true)
+                    }
+                    perPackageOption {
+                        reportUndocumented.set(true)
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/build-logic/convention/src/main/java/ArcGISMapsKotlinMicroappConventionPlugin.kt b/build-logic/convention/src/main/java/ArcGISMapsKotlinMicroappConventionPlugin.kt
index 40db7dd42..4cdd8ad4e 100644
--- a/build-logic/convention/src/main/java/ArcGISMapsKotlinMicroappConventionPlugin.kt
+++ b/build-logic/convention/src/main/java/ArcGISMapsKotlinMicroappConventionPlugin.kt
@@ -1,28 +1,46 @@
-import com.esri.arcgismaps.kotlin.build_logic.convention.implementation
-import com.esri.arcgismaps.kotlin.build_logic.convention.libs
+import com.android.build.api.dsl.ApplicationExtension
+import com.esri.arcgismaps.kotlin.build_logic.convention.ArcGISMapsKotlinSDKDependency
+import com.esri.arcgismaps.kotlin.build_logic.extensions.implementation
+import com.esri.arcgismaps.kotlin.build_logic.extensions.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.project
 
 class ArcGISMapsKotlinMicroappConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
-            dependencies {
-                dependencies {
-                    // if a "build" property is set from the command line like: "-D build=300.X.X-XXXX"
-                    val buildVersion = System.getProperty("build")
-                    // Override version in libs.versions.toml file
-                    if (buildVersion != null) {
-                        implementation("com.esri:arcgis-maps-kotlin:$buildVersion")
-                    } else {
-                        // Use version catalog when no build flag is provided
-                        implementation(libs.findLibrary("arcgis-maps-kotlin").get())
+            with(pluginManager) {
+                apply(libs.findPlugin("arcgismaps-android-application").get().get().pluginId)
+                apply(libs.findPlugin("arcgismaps-android-application-compose").get().get().pluginId)
+                apply(libs.findPlugin("gradle-secrets").get().get().pluginId)
+            }
+
+
+            // Configure secrets plugin defaults and custom BuildConfig fields
+            extensions.configure<ApplicationExtension> {
+                val defaultPropertiesFile = rootProject.file("secrets.defaults.properties")
+                if (defaultPropertiesFile.exists()) {
+                    val properties = java.util.Properties()
+                    defaultPropertiesFile.inputStream().use { properties.load(it) }
+                    defaultConfig {
+                        // Add each property as a BuildConfig field
+                        properties.forEach { (key, value) ->
+                            val escapedValue = value.toString().replace("\"", "\\\"")
+                            buildConfigField("String", key.toString(), "\"${escapedValue}\"")
+                        }
                     }
-                    // Local project common microapps library
-                    implementation(project(":microapps-lib"))
                 }
             }
+
+            dependencies {
+                // Configure the ArcGIS Maps SDK dependency
+                ArcGISMapsKotlinSDKDependency.configureArcGISMapsDependencies(target)
+
+                // Local project common microapps library
+                implementation(project(":microapps-lib"))
+            }
         }
     }
 }
diff --git a/build-logic/convention/src/main/java/ArcGISMapsKotlinSDKConventionPlugin.kt b/build-logic/convention/src/main/java/ArcGISMapsKotlinSDKConventionPlugin.kt
new file mode 100644
index 000000000..953931809
--- /dev/null
+++ b/build-logic/convention/src/main/java/ArcGISMapsKotlinSDKConventionPlugin.kt
@@ -0,0 +1,12 @@
+import com.esri.arcgismaps.kotlin.build_logic.convention.ArcGISMapsKotlinSDKDependency
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+
+class ArcGISMapsKotlinSDKConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            // Configure the ArcGIS Maps SDK dependency
+            ArcGISMapsKotlinSDKDependency.configureArcGISMapsDependencies(target)
+        }
+    }
+}
diff --git a/build-logic/convention/src/main/java/ArcGISMapsKotlinToolkitConventionPlugin.kt b/build-logic/convention/src/main/java/ArcGISMapsKotlinToolkitConventionPlugin.kt
index 00a8dd343..26d415e91 100644
--- a/build-logic/convention/src/main/java/ArcGISMapsKotlinToolkitConventionPlugin.kt
+++ b/build-logic/convention/src/main/java/ArcGISMapsKotlinToolkitConventionPlugin.kt
@@ -1,26 +1,104 @@
-import com.esri.arcgismaps.kotlin.build_logic.convention.implementation
-import com.esri.arcgismaps.kotlin.build_logic.convention.libs
+import com.android.build.api.dsl.LibraryExtension
+import com.esri.arcgismaps.kotlin.build_logic.convention.ArcGISMapsKotlinSDKDependency
+import com.esri.arcgismaps.kotlin.build_logic.convention.ArtifactPublisher
+import com.esri.arcgismaps.kotlin.build_logic.extensions.ToolkitModuleExtension
+import com.esri.arcgismaps.kotlin.build_logic.extensions.ToolkitRegistryExtension
+import com.esri.arcgismaps.kotlin.build_logic.extensions.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.tasks.testing.Test
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.create
 import org.gradle.kotlin.dsl.dependencies
-import org.gradle.kotlin.dsl.project
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import java.io.File
 
 class ArcGISMapsKotlinToolkitConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
-            dependencies {
-                dependencies {
-                    // if a "build" property is set from the command line like: "-D build=300.X.X-XXXX"
-                    val buildVersion = System.getProperty("build")
-                    // Override version in libs.versions.toml file
-                    if (buildVersion != null) {
-                        implementation("com.esri:arcgis-maps-kotlin:$buildVersion")
-                    } else {
-                        // Use version catalog when no build flag is provided
-                        implementation(libs.findLibrary("arcgis-maps-kotlin").get())
+            val toolkitExt = extensions.create<ToolkitModuleExtension>("toolkit").apply {
+                applyDefaults() // releasable = true by default
+            }
+
+            with(pluginManager) {
+                apply(libs.findPlugin("arcgismaps-android-library").get().get().pluginId)
+                apply(libs.findPlugin("arcgismaps-android-library-compose").get().get().pluginId)
+                if (toolkitExt.releasable.get()) {
+                    apply(libs.findPlugin("binary-compatibility-validator").get().get().pluginId)
+                }
+            }
+            // Provide maven publication for releasable toolkit projects
+            ArtifactPublisher.configureArtifactPublisher(this)
+
+            afterEvaluate {
+                val registry = rootProject.extensions.getByType(ToolkitRegistryExtension::class.java)
+                if (toolkitExt.releasable.orNull == true) {
+                    logger.warn("SETTING RELEASABLE: ${this.name}")
+                    registry.toolkitProjects.add(this)
+                } else {
+                    registry.toolkitProjects.remove(this)
+                }
+            }
+
+            extensions.configure<LibraryExtension> {
+                packaging {
+                    resources {
+                        excludes += setOf(
+                            "META-INF/LICENSE-notice.md",
+                            "META-INF/LICENSE.md"
+                        )
+                    }
+                }
+
+                testOptions {
+                    targetSdk = libs.findVersion("compileSdk").get().toString().toInt()
+                    val connectedTestReportsPath = target.findProperty("connectedTestReportsPath") as? String
+                        ?: "${target.rootProject.rootDir}/connectedTestReports"
+                    reportDir = "$connectedTestReportsPath/${target.name}"
+                }
+
+                publishing {
+                    singleVariant("release") {
+                        // This is the default variant.
+                    }
+                }
+            }
+
+            // Automatic detection of androidTest sources
+            val androidTestDir = File(projectDir, "src/androidTest")
+            val hasInstrumentedTests = androidTestDir.exists() && androidTestDir.walkTopDown().any {
+                it.isFile && (it.extension == "kt")
+            }
+            // Filter out generating test reports for modules without tests
+            if (!hasInstrumentedTests) {
+                // Disable unit tests
+                tasks.withType<Test>()
+                    .configureEach { enabled = false }
+                // Disable connected Android tests
+                tasks.matching { it.name.startsWith("connected") && it.name.endsWith("AndroidTest") }
+                    .configureEach { enabled = false }
+            }
+
+            // Explicit API configuration for toolkit modules
+            tasks.withType<KotlinCompile> {
+                // Only toolkit modules, exclude tests
+                if ("Test" !in name) {
+                    compilerOptions {
+                        freeCompilerArgs.addAll(
+                            listOf(
+                                "-Xexplicit-api=strict",
+                                "-Xcontext-receivers"
+                            )
+                        )
                     }
                 }
             }
+
+            dependencies {
+                // Configure the ArcGIS Maps SDK dependency
+                ArcGISMapsKotlinSDKDependency.configureArcGISMapsDependencies(target)
+            }
         }
     }
 }
diff --git a/build-logic/convention/src/main/java/ArcGISMapsRootConventionPlugin.kt b/build-logic/convention/src/main/java/ArcGISMapsRootConventionPlugin.kt
new file mode 100644
index 000000000..f3eb9c75e
--- /dev/null
+++ b/build-logic/convention/src/main/java/ArcGISMapsRootConventionPlugin.kt
@@ -0,0 +1,14 @@
+import com.esri.arcgismaps.kotlin.build_logic.extensions.ToolkitRegistryExtension
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.create
+
+class ArcGISMapsRootConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        require(target == target.rootProject) {
+            "The ArcGISMapsRootConventionPlugin must be applied to the root project only."
+        }
+        // Create the single registry extension on the root project
+        target.extensions.create<ToolkitRegistryExtension>("toolkitRegistry")
+    }
+}
diff --git a/build-logic/convention/src/main/java/com/esri/arcgismaps/kotlin/build_logic/convention/AndroidCompose.kt b/build-logic/convention/src/main/java/com/esri/arcgismaps/kotlin/build_logic/convention/AndroidCompose.kt
index be21e4159..344d27795 100644
--- a/build-logic/convention/src/main/java/com/esri/arcgismaps/kotlin/build_logic/convention/AndroidCompose.kt
+++ b/build-logic/convention/src/main/java/com/esri/arcgismaps/kotlin/build_logic/convention/AndroidCompose.kt
@@ -1,6 +1,10 @@
 package com.esri.arcgismaps.kotlin.build_logic.convention
 
 import com.android.build.api.dsl.CommonExtension
+import com.esri.arcgismaps.kotlin.build_logic.extensions.androidTestImplementation
+import com.esri.arcgismaps.kotlin.build_logic.extensions.debugImplementation
+import com.esri.arcgismaps.kotlin.build_logic.extensions.implementation
+import com.esri.arcgismaps.kotlin.build_logic.extensions.libs
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
 
@@ -16,7 +20,7 @@ internal fun Project.configureAndroidCompose(
         }
 
         composeOptions {
-            kotlinCompilerExtensionVersion = libs.findVersion("kotlinVersion").get().toString()
+            kotlinCompilerExtensionVersion = libs.findVersion("kotlin").get().toString()
         }
 
         dependencies {
@@ -27,11 +31,8 @@ internal fun Project.configureAndroidCompose(
             implementation(libs.findLibrary("androidx-compose-material3").get())
             implementation(libs.findLibrary("androidx-lifecycle-viewmodel-compose").get())
             implementation(libs.findLibrary("androidx-compose-ui-tooling-preview").get())
-            debugImplementation(libs.findLibrary("androidx-compose-ui-tooling").get())
-            debugImplementation(libs.findLibrary("androidx-compose-ui-test-manifest").get())
+            debugImplementation(libs.findBundle("debug").get())
             androidTestImplementation(libs.findLibrary("androidx-compose-ui-test").get())
-            androidTestImplementation(libs.findLibrary("androidx-compose-ui-test-junit4").get())
-
         }
     }
 }
diff --git a/build-logic/convention/src/main/java/com/esri/arcgismaps/kotlin/build_logic/convention/ArcGISMapsKotlinSDKDependency.kt b/build-logic/convention/src/main/java/com/esri/arcgismaps/kotlin/build_logic/convention/ArcGISMapsKotlinSDKDependency.kt
new file mode 100644
index 000000000..12ef0023e
--- /dev/null
+++ b/build-logic/convention/src/main/java/com/esri/arcgismaps/kotlin/build_logic/convention/ArcGISMapsKotlinSDKDependency.kt
@@ -0,0 +1,77 @@
+package com.esri.arcgismaps.kotlin.build_logic.convention
+
+import com.esri.arcgismaps.kotlin.build_logic.extensions.api
+import com.esri.arcgismaps.kotlin.build_logic.extensions.libs
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.dependencies
+import java.io.File
+
+/**
+ * A helper object to configure the logic for applying the ArcGIS Maps SDK dependency,
+ * allowing for simple one-line calls in convention plugins or build scripts.
+ * It also handles dynamic versioning based on Gradle properties.
+ */
+object ArcGISMapsKotlinSDKDependency {
+
+    /**
+     * Applies the ArcGIS Maps SDK for Kotlin dependency to the project.
+     *
+     * This function checks for Gradle properties (`versionNumber` or `sdkVersionNumber`)
+     * to determine the SDK version. If a version is provided, it can be combined with a
+     * `buildNumber` to specify a specific build. If no version property is found,
+     * it falls back to the version defined in `libs.versions.toml`.
+     *
+     * @param target The Gradle Project to which the dependency will be added.
+     */
+    fun configureArcGISMapsDependencies(target: Project) {
+        target.dependencies {
+
+            val localProperties = java.util.Properties().apply {
+                val localPropertiesFile = File("local.properties")
+                if (localPropertiesFile.exists()) {
+                    load(localPropertiesFile.inputStream())
+                }
+            }
+
+            // For finalBuilds ignore the build number and pick up the released version of the SDK dependency
+            val finalBuild: Boolean = (target.rootProject.providers.gradleProperty("finalBuild").orNull ?: "false")
+                .toBoolean()
+
+            // First look for the version number provided via command line (for CI builds), if not found,
+            // take the one defined in gradle.properties.
+            // CI builds pass -PversionNumber=${BUILDVER}
+            val sdkVersionNumber: String? =
+                target.rootProject.providers.gradleProperty("versionNumber").orNull
+                    ?: target.rootProject.providers.gradleProperty("sdkVersionNumber").orNull
+                    ?: localProperties["sdkVersionNumber"] as? String
+
+            // The build number of the ArcGIS Maps SDK for Kotlin dependency.
+            // First look for the version number provided via command line (for CI builds), if not found,
+            // take the one defined in local.properties.
+            // CI builds pass -PbuildNumber=${BUILDNUM}
+            val sdkBuildNumber: String? =
+                target.rootProject.providers.gradleProperty("buildNumber").orNull
+                    ?: target.rootProject.providers.gradleProperty("sdkBuildNumber").orNull
+                    ?: localProperties["sdkBuildNumber"] as? String
+
+            // ArcGIS Maps SDK dependency with build override support
+            if (sdkVersionNumber != null) {
+                val dependencyVersion = if (finalBuild) {
+                    // For a final build, use the version number directly
+                    sdkVersionNumber
+                } else {
+                    // If a buildNumber is provided and not blank, append it to the version.
+                    if (!sdkBuildNumber.isNullOrBlank()) {
+                        "$sdkVersionNumber-$sdkBuildNumber"
+                    } else {
+                        sdkVersionNumber
+                    }
+                }
+                api("com.esri:arcgis-maps-kotlin:$dependencyVersion")
+            } else {
+                // Use libs.versions.toml if no gradle property is provided
+                api(target.libs.findLibrary("arcgis-maps-kotlin").get())
+            }
+        }
+    }
+}
diff --git a/gradle-plugins/src/main/kotlin/com/arcgismaps/ArtifactPublisher.kt b/build-logic/convention/src/main/java/com/esri/arcgismaps/kotlin/build_logic/convention/ArtifactPublisher.kt
similarity index 77%
rename from gradle-plugins/src/main/kotlin/com/arcgismaps/ArtifactPublisher.kt
rename to build-logic/convention/src/main/java/com/esri/arcgismaps/kotlin/build_logic/convention/ArtifactPublisher.kt
index 72ce61f73..a1b0b7323 100644
--- a/gradle-plugins/src/main/kotlin/com/arcgismaps/ArtifactPublisher.kt
+++ b/build-logic/convention/src/main/java/com/esri/arcgismaps/kotlin/build_logic/convention/ArtifactPublisher.kt
@@ -16,14 +16,13 @@
  *
  */
 
-package deploy
+package com.esri.arcgismaps.kotlin.build_logic.convention
 
-import org.gradle.api.Plugin
+import com.esri.arcgismaps.kotlin.build_logic.extensions.ToolkitRegistryExtension
 import org.gradle.api.Project
 import org.gradle.api.publish.PublishingExtension
 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
@@ -39,8 +38,8 @@ import java.net.URI
  *
  * @since 200.2.0
  */
-class ArtifactPublisher : Plugin<Project> {
-    override fun apply(project: Project) {
+object ArtifactPublisher {
+    fun configureArtifactPublisher(project: Project) {
         val artifactoryGroupId: String by project
         val artifactoryArtifactBaseId: String by project
         val artifactoryUrl: String by project
@@ -55,13 +54,18 @@ class ArtifactPublisher : Plugin<Project> {
         } else {
             "$versionNumber-$buildNumber"
         }
-        val artifactoryArtifactId: String = "$artifactoryArtifactBaseId-${project.name}"
-        
+        val artifactoryArtifactId = "$artifactoryArtifactBaseId-${project.name}"
+
         project.pluginManager.apply(MavenPublishPlugin::class.java)
+
         project.afterEvaluate {
+            val registry = rootProject.extensions.getByType(ToolkitRegistryExtension::class.java)
+            if (!registry.toolkitProjects.contains(project)) return@afterEvaluate
+
+
             project.extensions.configure<PublishingExtension> {
                 repositories {
-                    repositories.maven {
+                    maven {
                         url = URI.create(artifactoryUrl)
                         credentials {
                             username = artifactoryUsername
@@ -70,22 +74,19 @@ class ArtifactPublisher : Plugin<Project> {
                     }
                 }
                 publications {
-                    publications.create(
-                        project.name,
-                        MavenPublication::class.java
-                    ) {
+                    create(project.name, MavenPublication::class.java) {
                         groupId = artifactoryGroupId
                         artifactId = artifactoryArtifactId
                         version = artifactVersion
-                        
+
                         from(project.components["release"])
                     }
                 }
             }
 
-            tasks.findByName("publish${project.name.replaceFirstChar { it.uppercase() }}PublicationToMavenRepository")
+            project.tasks.findByName("publish${project.name.replaceFirstChar { it.uppercase() }}PublicationToMavenRepository")
                 ?.dependsOn("assembleRelease")
-            tasks.findByName("publishToMavenLocal")?.dependsOn("assembleRelease")
+            project.tasks.findByName("publishToMavenLocal")?.dependsOn("assembleRelease")
         }
     }
 }
diff --git a/build-logic/convention/src/main/java/com/esri/arcgismaps/kotlin/build_logic/convention/KotlinAndroid.kt b/build-logic/convention/src/main/java/com/esri/arcgismaps/kotlin/build_logic/convention/KotlinAndroid.kt
index 5dcdab882..f80fad946 100644
--- a/build-logic/convention/src/main/java/com/esri/arcgismaps/kotlin/build_logic/convention/KotlinAndroid.kt
+++ b/build-logic/convention/src/main/java/com/esri/arcgismaps/kotlin/build_logic/convention/KotlinAndroid.kt
@@ -1,6 +1,7 @@
 package com.esri.arcgismaps.kotlin.build_logic.convention
 
 import com.android.build.api.dsl.CommonExtension
+import com.esri.arcgismaps.kotlin.build_logic.extensions.libs
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.provideDelegate
@@ -15,11 +16,9 @@ internal fun Project.configureKotlinAndroid(
     commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     commonExtension.apply {
-        compileSdk = libs.findVersion("targetSdk").get().toString().toInt()
+        compileSdk = libs.findVersion("compileSdk").get().toString().toInt()
 
         defaultConfig {
-            buildConfigField("String", "ACCESS_TOKEN", project.properties["ACCESS_TOKEN"].toString())
-            manifestPlaceholders["GOOGLE_API_KEY"] = project.properties["GOOGLE_API_KEY"].toString()
             minSdk = libs.findVersion("minSdk").get().toString().toInt()
         }
 
@@ -43,15 +42,6 @@ private fun Project.configureKotlin() {
             // Override by setting warningsAsErrors=true in your ~/.gradle/gradle.properties
             val warningsAsErrors: String? by project
             allWarningsAsErrors.set(warningsAsErrors.toBoolean())
-            freeCompilerArgs.set(
-                listOf(
-                    "-opt-in=kotlin.RequiresOptIn",
-                    // Enable experimental coroutines APIs, including Flow
-                    "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-                    "-opt-in=kotlinx.coroutines.FlowPreview",
-                    "-Xcontext-receivers",
-                )
-            )
         }
     }
 }
diff --git a/build-logic/convention/src/main/java/com/esri/arcgismaps/kotlin/build_logic/convention/ProjectExtensions.kt b/build-logic/convention/src/main/java/com/esri/arcgismaps/kotlin/build_logic/extensions/ProjectExtensions.kt
similarity index 86%
rename from build-logic/convention/src/main/java/com/esri/arcgismaps/kotlin/build_logic/convention/ProjectExtensions.kt
rename to build-logic/convention/src/main/java/com/esri/arcgismaps/kotlin/build_logic/extensions/ProjectExtensions.kt
index 26af71d39..013572ce4 100644
--- a/build-logic/convention/src/main/java/com/esri/arcgismaps/kotlin/build_logic/convention/ProjectExtensions.kt
+++ b/build-logic/convention/src/main/java/com/esri/arcgismaps/kotlin/build_logic/extensions/ProjectExtensions.kt
@@ -1,4 +1,4 @@
-package com.esri.arcgismaps.kotlin.build_logic.convention
+package com.esri.arcgismaps.kotlin.build_logic.extensions
 
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Dependency
@@ -16,6 +16,9 @@ fun DependencyHandler.testRuntimeOnly(dependencyNotation: Any): Dependency? =
 fun DependencyHandler.implementation(dependencyNotation: Any): Dependency? =
     add("implementation", dependencyNotation)
 
+fun DependencyHandler.api(dependencyNotation: Any): Dependency? =
+    add("api", dependencyNotation)
+
 fun DependencyHandler.androidTestImplementation(dependencyNotation: Any): Dependency? =
     add("androidTestImplementation", dependencyNotation)
 
diff --git a/build-logic/convention/src/main/java/com/esri/arcgismaps/kotlin/build_logic/extensions/ToolkitModuleExtension.kt b/build-logic/convention/src/main/java/com/esri/arcgismaps/kotlin/build_logic/extensions/ToolkitModuleExtension.kt
new file mode 100644
index 000000000..0dbe36725
--- /dev/null
+++ b/build-logic/convention/src/main/java/com/esri/arcgismaps/kotlin/build_logic/extensions/ToolkitModuleExtension.kt
@@ -0,0 +1,30 @@
+package com.esri.arcgismaps.kotlin.build_logic.extensions
+
+import org.gradle.api.NamedDomainObjectSet
+import org.gradle.api.Project
+import org.gradle.api.model.ObjectFactory
+import org.gradle.api.provider.Property
+import javax.inject.Inject
+
+
+abstract class ToolkitModuleExtension @Inject constructor(objects: ObjectFactory) {
+
+    /** Can/should this module be published as an artifact? */
+    val releasable: Property<Boolean> = objects.property(Boolean::class.java)
+
+
+    internal fun applyDefaults() {
+        releasable.convention(true)
+    }
+
+}
+
+
+abstract class ToolkitRegistryExtension @Inject constructor(objects: ObjectFactory) {
+// Live set that will receive projects as they apply the toolkit plugin
+    val toolkitProjects: NamedDomainObjectSet<Project> =
+        objects.namedDomainObjectSet(Project::class.java)
+
+}
+
+
diff --git a/build-logic/gradle.properties b/build-logic/gradle.properties
index 6977b7191..bf586e553 100644
--- a/build-logic/gradle.properties
+++ b/build-logic/gradle.properties
@@ -1,3 +1,4 @@
 org.gradle.parallel=true
 org.gradle.caching=true
-org.gradle.configureondemand=true
\ No newline at end of file
+org.gradle.configureondemand=true
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 87f35d3c2..401b6ad52 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,6 +18,7 @@
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
+    alias(libs.plugins.arcgismaps.kotlin.root.convention)
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.binary.compatibility.validator) apply false
@@ -32,13 +33,6 @@ plugins {
 }
 
 buildscript {
-    dependencies {
-        // there doesn't appear to be a better way to provide this to subprojects.
-        // this is what lets us put the version number dropdown list in the generated dokka.
-        // it is a "dokka plugin" which is not a gradle plugin, it needs to be on the classpath
-        // 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()) {
@@ -57,16 +51,23 @@ buildscript {
         ?: localProperties.getProperty("artifactoryPassword")
         ?: ""
 
+    val sdkVersionNumber = project.findProperty("sdkVersionNumber") as String?
+        ?: localProperties.getProperty("sdkVersionNumber")
+    val sdkBuildNumber = project.findProperty("sdkBuildNumber") as String?
+        ?: localProperties.getProperty("sdkBuildNumber")
+
     project.extra.set("artifactoryUrl", artifactoryUrl)
     project.extra.set("artifactoryUsername", artifactoryUsername)
     project.extra.set("artifactoryPassword", artifactoryPassword)
+    project.extra.set("sdkVersionNumber", sdkVersionNumber)
+    project.extra.set("sdkBuildNumber", sdkBuildNumber)
 
     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"]}")
+        project.logger.warn("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 {
@@ -84,7 +85,7 @@ buildscript {
                 }
                 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"]}")
+                project.logger.warn("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")
@@ -95,9 +96,6 @@ buildscript {
     }
 }
 
-// Path to the centralized folder in root directory where test reports for connected tests end up
-val connectedTestReportsPath by extra("${rootDir}/connectedTestReports")
-
 /**
  * Configures the [gmazzo test aggregation plugin](https://github.com/gmazzo/gradle-android-test-aggregation-plugin)
  * with all local tests to be aggregated into a single test report.
@@ -109,27 +107,5 @@ val connectedTestReportsPath by extra("${rootDir}/connectedTestReports")
  * Test report to be found under `arcgis-maps-sdk-kotlin-toolkit/build/reports`.
  */
 testAggregation {
-    getModulesExcept(
-        "bom",
-        "kdoc",
-        "template",
-        "microapps-lib",
-        "composable-map"
-    ).forEach {
-        this.modules.include(project(":$it"))
-    }
+    // TODO: getAllToolkitProjects(project).forEach { this.modules.include(project(":$it")) }
 }
-
-/**
- * Returns all modules in this project, except the ones specified by [modulesToExclude].
- */
-fun getModulesExcept(vararg modulesToExclude: String): List<String> =
-    with(File("$rootDir/settings.gradle.kts")) {
-        readLines()
-            .filter { it.startsWith("include") }
-            .map {
-                it.removePrefix("include(\":").removeSuffix("\")")
-            }
-            .filter { !modulesToExclude.contains(it) } // exclude specified modules
-    }
-
diff --git a/doc/README.md b/doc/README.md
index 21b4627b7..6bc80c768 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -4,7 +4,6 @@
 
 - [Design Patterns and Best Practices](./general/design_patterns.md)
 - [Developer Setup](./general/developer_setup.md)
-- [Composable Map](./general/design_patterns.md#composable-map)
 
 ## Release
 
diff --git a/gradle-plugins/build.gradle.kts b/gradle-plugins/build.gradle.kts
deleted file mode 100644
index c48fdef85..000000000
--- a/gradle-plugins/build.gradle.kts
+++ /dev/null
@@ -1,24 +0,0 @@
-repositories {
-    google()
-    mavenCentral()
-}
-
-plugins {
-    `kotlin-dsl`
-    `maven-publish`
-}
-
-gradlePlugin {
-    plugins {
-        create("artifactDeploy") {
-            group = "internal"
-            id = "artifact-deploy"
-            version = "1.0"
-            implementationClass = "deploy.ArtifactPublisher"
-        }
-    }
-}
-
-dependencies {
-    implementation(libs.kotlinx.serialization.json)
-}
diff --git a/gradle-plugins/settings.gradle.kts b/gradle-plugins/settings.gradle.kts
deleted file mode 100644
index b474f08dd..000000000
--- a/gradle-plugins/settings.gradle.kts
+++ /dev/null
@@ -1,13 +0,0 @@
-rootProject.name = "gradle-plugins"
-
-dependencyResolutionManagement {
-    repositories {
-        google()
-        mavenCentral()
-    }
-    versionCatalogs {
-        create("libs") {
-            from(files("../gradle/libs.versions.toml"))
-        }
-    }
-}
diff --git a/gradle.properties b/gradle.properties
index 6e4d49328..001209493 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -41,12 +41,4 @@ kotlin.code.style=official
 android.nonTransitiveRClass=true
 artifactoryGroupId=com.esri
 artifactoryArtifactBaseId=arcgis-maps-kotlin-toolkit
-
-# These versions define the dependency of the ArcGIS Maps SDK for Kotlin dependency
-# when building the toolkit locally, typically from Android Studio.
-# You will need to specify the build version in local.properties.
-# Example:
-# sdkBuildNumber=4678
-# When building the toolkit with CI, these versions are obtained from command line provided properties,
-# see sdkVersionNumber in settings.gradle.kts.
-sdkVersionNumber=300.0.0
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2EnabledWithHelpers
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9b043ea7f..9033c9dcd 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,13 +1,12 @@
 [versions]
 
 # ArcGIS Maps SDK for Kotlin version
-arcgisMapsKotlinVersion = "300.0.0-4689"
+arcgisMapsKotlinVersion = "200.8.0"
 
 ### Android versions
 androidGradlePlugin = "8.9.2"
 androidXBrowser = "1.8.0"
 androidxCamera = "1.4.2"
-androidxComposeCompiler = "1.5.12"
 androidxCore = "1.16.0"
 androidxEspresso = "3.6.1"
 androidxHiltNavigationCompose = "1.2.0"
@@ -79,7 +78,6 @@ play-services-location = { group = "com.google.android.gms", name = "play-servic
 ### Kotlin libs
 kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin"}
 kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinxCoroutinesTest" }
-kotlinx-serialization-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version.ref = "kotlinxSerializationJson" }
 kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
 
 ### Compose libs
@@ -112,16 +110,15 @@ truth = { group = "com.google.truth", name = "truth", version.ref = "truth" }
 
 ### Third party libs
 coil = { group = "io.coil-kt", name = "coil" }
-coil-base = { group = "io.coil-kt", name = "coil-base" }
 coil-bom = { group = "io.coil-kt", name = "coil-bom", version.ref = "coilBOM" }
 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" }
-dokka-versioning = { group = "org.jetbrains.dokka", name = "versioning-plugin", version.ref = "dokka" }
+dokka-all-modules = { module = "org.jetbrains.dokka:all-modules-page-plugin", version.ref = "dokka" }
+dokka-versioning    = { module = "org.jetbrains.dokka:versioning-plugin",   version.ref = "dokka" }
+dokka-gradle-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
 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" }
-hilt-ext-work = { group = "androidx.hilt", name = "hilt-work", version.ref = "hiltExt" }
 room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
 room-ext = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
 room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
@@ -139,6 +136,7 @@ binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibil
 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" }
+kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 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" }
@@ -146,12 +144,16 @@ compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "
 gmazzo-test-aggregation = { id = "io.github.gmazzo.test.aggregation.results", version.ref = "gmazzo" }
 
 # Plugins defined by the project build-logic
-arcgismaps-android-application = { id = "arcgismaps.android.application", version = "unspecified" }
-arcgismaps-android-application-compose = { id = "arcgismaps.android.application.compose", version = "unspecified" }
-arcgismaps-android-library-compose = { id = "arcgismaps.android.library.compose", version = "unspecified" }
-arcgismaps-android-library = { id = "arcgismaps.android.library", version = "unspecified" }
-arcgismaps-kotlin-microapp = { id = "arcgismaps.kotlin.microapp", version = "unspecified" }
-arcgismaps-kotlin-toolkit = { id = "arcgismaps.kotlin.toolkit", version = "unspecified" }
+arcgismaps-android-application = { id = "arcgismaps.android.application" }
+arcgismaps-android-application-compose = { id = "arcgismaps.android.application.compose" }
+arcgismaps-android-library-compose = { id = "arcgismaps.android.library.compose" }
+arcgismaps-android-library = { id = "arcgismaps.android.library" }
+arcgismaps-kotlin-root-convention = { id = "arcgismaps.kotlin.root.convention" }
+arcgismaps-kotlin-kdoc-convention = { id = "arcgismaps.kotlin.kdoc.convention" }
+arcgismaps-kotlin-bom-convention = { id = "arcgismaps.kotlin.bom.convention" }
+arcgismaps-kotlin-sdk = { id = "arcgismaps.kotlin.sdk"}
+arcgismaps-kotlin-microapp = { id = "arcgismaps.kotlin.microapp" }
+arcgismaps-kotlin-toolkit = { id = "arcgismaps.kotlin.toolkit" }
 
 [bundles]
 camerax = [
diff --git a/kdoc/build.gradle.kts b/kdoc/build.gradle.kts
index 13f34fc19..b6ff85306 100644
--- a/kdoc/build.gradle.kts
+++ b/kdoc/build.gradle.kts
@@ -17,80 +17,14 @@
  */
 
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    alias(libs.plugins.dokka) apply true
-}
-
-val versionNumber: String by project
-
-// make this project get evaluated after all the other projects
-// so that we can be sure the logic to determine released components
-// below works
-rootProject.subprojects.filter {
-    it.name != project.name && it.name != "bom"
-}.forEach {
-    evaluationDependsOn(":${it.name}")
-}
-
-// only run kdoc on components which are released. Only modules that apply
-// the `artifact-deploy` plugin are released.
-// TODO: flag released modules directly.
-val releasedModules = project.rootProject.subprojects.filter {
-    it.plugins.findPlugin("artifact-deploy") != null
-}
-
-// determine the released toolkit components
-val releasedSourceSetPaths = releasedModules.map { subproject ->
-    // add all the intended library projects as sourceSets below
-    File(rootDir, "toolkit/${subproject.name}/src/main/java").canonicalPath
-}
-
-tasks {
-    //./gradlew :kdoc:dokkaHtml
-    // doc output will be under `documentation/build/dokka/html`.
-    dokkaHtml {
-        pluginConfiguration<org.jetbrains.dokka.versioning.VersioningPlugin, org.jetbrains.dokka.versioning.VersioningConfiguration> {
-            version = versionNumber
-        }
-
-        moduleName.set("arcgis-maps-kotlin-toolkit")
-        dokkaSourceSets {
-            named("main") {
-                sourceRoots.from(releasedSourceSetPaths)
-            }
-
-            configureEach {
-                platform.set(org.jetbrains.dokka.Platform.jvm)
-                perPackageOption {
-                    matchingRegex.set(".*internal.*")
-                    suppress.set(true)
-                }
-                
-                perPackageOption {
-                    reportUndocumented.set(true)
-                }
-            }
-        }
-    }
+    alias(libs.plugins.arcgismaps.kotlin.kdoc.convention)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.doc"
     compileSdk = libs.versions.compileSdk.get().toInt()
-    
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
         consumerProguardFiles("consumer-rules.pro")
     }
 }
-
-dependencies {
-    // Puts the version in the KDoc
-    dokkaPlugin(libs.dokka.versioning)
-    // put exposed dependencies in dokka's classpath
-    implementation(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-}
-
diff --git a/microapps/ArFlyoverApp/app/build.gradle.kts b/microapps/ArFlyoverApp/app/build.gradle.kts
index 226721397..fca9ddff7 100644
--- a/microapps/ArFlyoverApp/app/build.gradle.kts
+++ b/microapps/ArFlyoverApp/app/build.gradle.kts
@@ -17,79 +17,20 @@
  */
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-}
-
-secrets {
-    // this file doesn't contain secrets, it just provides defaults which can be committed into git.
-    defaultPropertiesFileName = "secrets.defaults.properties"
+    alias(libs.plugins.arcgismaps.kotlin.microapp)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.arflyoverapp"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
+    
     defaultConfig {
-        applicationId ="com.arcgismaps.toolkit.arflyoverapp"
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner ="androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            //proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),("proguard-rules.pro"
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
+        applicationId = "com.arcgismaps.toolkit.arflyoverapp"
     }
 }
 
 dependencies {
-    implementation(project(":geoview-compose"))
-    implementation(project(":microapps-lib"))
+    // Module-specific dependencies go here
     implementation(project(":ar"))
+    implementation(project(":geoview-compose"))
     implementation(libs.arcore)
-    implementation(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
 }
diff --git a/microapps/ArFlyoverApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/microapps/ArFlyoverApp/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from microapps/ArFlyoverApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to microapps/ArFlyoverApp/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/microapps/ArTabletopApp/app/build.gradle.kts b/microapps/ArTabletopApp/app/build.gradle.kts
index 48015402b..a2a18edc0 100644
--- a/microapps/ArTabletopApp/app/build.gradle.kts
+++ b/microapps/ArTabletopApp/app/build.gradle.kts
@@ -17,78 +17,20 @@
  */
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-}
-
-secrets {
-    // this file doesn't contain secrets, it just provides defaults which can be committed into git.
-    defaultPropertiesFileName = "secrets.defaults.properties"
+    alias(libs.plugins.arcgismaps.kotlin.microapp)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.artabletopapp"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
+    
     defaultConfig {
-        applicationId ="com.arcgismaps.toolkit.artabletopapp"
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner ="androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            //proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),("proguard-rules.pro"
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
+        applicationId = "com.arcgismaps.toolkit.artabletopapp"
     }
 }
 
 dependencies {
-    implementation(project(":geoview-compose"))
-    implementation(project(":microapps-lib"))
+    // Module-specific dependencies go here
     implementation(project(":ar"))
+    implementation(project(":geoview-compose"))
     implementation(libs.arcore)
-    implementation(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    implementation(libs.androidx.lifecycle.runtime.compose)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
 }
diff --git a/microapps/ArTabletopApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/microapps/ArTabletopApp/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from microapps/ArTabletopApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to microapps/ArTabletopApp/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/microapps/ArWorldScaleApp/app/build.gradle.kts b/microapps/ArWorldScaleApp/app/build.gradle.kts
index d9875206d..e9ab6c9d8 100644
--- a/microapps/ArWorldScaleApp/app/build.gradle.kts
+++ b/microapps/ArWorldScaleApp/app/build.gradle.kts
@@ -17,79 +17,19 @@
  */
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-}
-
-secrets {
-    // this file doesn't contain secrets, it just provides defaults which can be committed into git.
-    defaultPropertiesFileName = "secrets.defaults.properties"
+    alias(libs.plugins.arcgismaps.kotlin.microapp)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.arworldscaleapp"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
+    
     defaultConfig {
-        applicationId ="com.arcgismaps.toolkit.arworldscaleapp"
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner ="androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            //proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),("proguard-rules.pro"
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
+        applicationId = "com.arcgismaps.toolkit.arworldscaleapp"
     }
 }
 
 dependencies {
-    implementation(project(":geoview-compose"))
-    implementation(project(":microapps-lib"))
+    // Module-specific dependencies go here
     implementation(project(":ar"))
     implementation(libs.arcore)
-    implementation(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
 }
diff --git a/microapps/ArWorldScaleApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/microapps/ArWorldScaleApp/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from microapps/ArWorldScaleApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to microapps/ArWorldScaleApp/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/microapps/AuthenticationApp/app/build.gradle.kts b/microapps/AuthenticationApp/app/build.gradle.kts
index 3f82e53a9..1545f60a8 100644
--- a/microapps/AuthenticationApp/app/build.gradle.kts
+++ b/microapps/AuthenticationApp/app/build.gradle.kts
@@ -17,77 +17,18 @@
  */
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-}
-
-secrets {
-    defaultPropertiesFileName = "secrets.defaults.properties"
+    alias(libs.plugins.arcgismaps.kotlin.microapp)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.authenticationapp"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
+    
     defaultConfig {
-        applicationId ="com.arcgismaps.toolkit.authenticationapp"
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner ="androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            //proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),("proguard-rules.pro"
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-        // context receivers are used by the MapInterface for gesture events
-        freeCompilerArgs = freeCompilerArgs + "-Xcontext-receivers"
-    }
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
+        applicationId = "com.arcgismaps.toolkit.authenticationapp"
     }
 }
 
 dependencies {
+    // Module-specific dependencies go here
     implementation(project(":authentication"))
-    implementation(project(":microapps-lib"))
-    implementation(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
 }
diff --git a/microapps/AuthenticationApp/app/src/main/java/com/arcgismaps/toolkit/authenticationapp/MainActivity.kt b/microapps/AuthenticationApp/app/src/main/java/com/arcgismaps/toolkit/authenticationapp/MainActivity.kt
index 04b4c2e75..e437ce23f 100644
--- a/microapps/AuthenticationApp/app/src/main/java/com/arcgismaps/toolkit/authenticationapp/MainActivity.kt
+++ b/microapps/AuthenticationApp/app/src/main/java/com/arcgismaps/toolkit/authenticationapp/MainActivity.kt
@@ -45,7 +45,6 @@ import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
@@ -105,7 +104,6 @@ private fun AuthenticationApp(authenticationAppViewModel: AuthenticationAppViewM
  * @param onLoadPortal called when the [url] should be loaded
  * @since 200.2.0
  */
-@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 private fun PortalDetails(
     url: String,
diff --git a/microapps/AuthenticationApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/microapps/AuthenticationApp/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from microapps/AuthenticationApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to microapps/AuthenticationApp/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/microapps/BasemapGalleryApp/app/build.gradle.kts b/microapps/BasemapGalleryApp/app/build.gradle.kts
index eecd7bc4c..0ad9719fe 100644
--- a/microapps/BasemapGalleryApp/app/build.gradle.kts
+++ b/microapps/BasemapGalleryApp/app/build.gradle.kts
@@ -17,78 +17,19 @@
  */
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-}
-
-secrets {
-    // this file doesn't contain secrets, it just provides defaults which can be committed into git.
-    defaultPropertiesFileName = "secrets.defaults.properties"
+    alias(libs.plugins.arcgismaps.kotlin.microapp)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.basemapgalleryapp"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
+    
     defaultConfig {
-        applicationId ="com.arcgismaps.toolkit.basemapgalleryapp"
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner ="androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            //proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),("proguard-rules.pro"
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
+        applicationId = "com.arcgismaps.toolkit.basemapgalleryapp"
     }
 }
 
 dependencies {
+    // Module-specific dependencies go here
     implementation(project(":basemapgallery"))
     implementation(project(":geoview-compose"))
-    implementation(project(":microapps-lib"))
-    implementation(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
 }
diff --git a/microapps/BasemapGalleryApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/microapps/BasemapGalleryApp/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from microapps/BasemapGalleryApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to microapps/BasemapGalleryApp/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/microapps/MapViewCalloutApp/.gitignore b/microapps/CalloutApp/.gitignore
similarity index 100%
rename from microapps/MapViewCalloutApp/.gitignore
rename to microapps/CalloutApp/.gitignore
diff --git a/microapps/CalloutApp/README.md b/microapps/CalloutApp/README.md
new file mode 100644
index 000000000..4cab21120
--- /dev/null
+++ b/microapps/CalloutApp/README.md
@@ -0,0 +1,13 @@
+# Callout Micro-app
+
+This micro-app demonstrates the use of `Callout` with a composable `MapView` or `SceneView`. `Callout` is a composable function which renders an empty composable Box placed at a given point or GeoElement on a Map. The content of the composable Box is customizable, while the container of the Box is a stylable rectangular shape with a leader line positioned at the point of the tap or GeoElement passed into the `Callout` composable functions. The default `LeaderPosition` is set to `Automatic` which dynamically positions the leader to keep the callout as much as possible within the bounds of the `GeoView`.
+
+## Usage
+
+The application starts with a choice of two screens
+* A `GeoView` that displays a `Callout` at the location where the user taps on the screen.
+* A `MapView` with `Callout`s placed on GeoElements tapped by the user.
+* For more information on the composable `Callout` component and how it works, see the relevant section in the composable GeoView [Readme](../../toolkit/geoview-compose#display-a-callout).
+
+![Callout-geoelement](https://github.com/user-attachments/assets/d6fd278a-c773-45f3-9ecd-a76852b71192)
+
diff --git a/microapps/MapViewCalloutApp/app/.gitignore b/microapps/CalloutApp/app/.gitignore
similarity index 100%
rename from microapps/MapViewCalloutApp/app/.gitignore
rename to microapps/CalloutApp/app/.gitignore
diff --git a/microapps/CalloutApp/app/build.gradle.kts b/microapps/CalloutApp/app/build.gradle.kts
new file mode 100644
index 000000000..a7585beb2
--- /dev/null
+++ b/microapps/CalloutApp/app/build.gradle.kts
@@ -0,0 +1,35 @@
+/*
+ *
+ *  Copyright 2024 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.
+ *
+ */
+
+plugins {
+    alias(libs.plugins.arcgismaps.kotlin.microapp)
+}
+
+android {
+    namespace = "com.arcgismaps.toolkit.calloutapp"
+    
+    defaultConfig {
+        applicationId = "com.arcgismaps.toolkit.calloutapp"
+    }
+}
+
+dependencies {
+    // Module-specific dependencies go here
+    implementation(project(":geoview-compose"))
+    implementation(libs.androidx.compose.navigation)
+}
diff --git a/microapps/MapViewCalloutApp/app/proguard-rules.pro b/microapps/CalloutApp/app/proguard-rules.pro
similarity index 100%
rename from microapps/MapViewCalloutApp/app/proguard-rules.pro
rename to microapps/CalloutApp/app/proguard-rules.pro
diff --git a/microapps/MapViewCalloutApp/app/src/main/AndroidManifest.xml b/microapps/CalloutApp/app/src/main/AndroidManifest.xml
similarity index 93%
rename from microapps/MapViewCalloutApp/app/src/main/AndroidManifest.xml
rename to microapps/CalloutApp/app/src/main/AndroidManifest.xml
index 940864f19..333472ce0 100644
--- a/microapps/MapViewCalloutApp/app/src/main/AndroidManifest.xml
+++ b/microapps/CalloutApp/app/src/main/AndroidManifest.xml
@@ -30,12 +30,12 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.MapViewCalloutApp"
+        android:theme="@style/Theme.CalloutApp"
         tools:targetApi="31">
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:theme="@style/Theme.MapViewCalloutApp">
+            android:theme="@style/Theme.CalloutApp">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/microapps/MapViewCalloutApp/app/src/main/java/com/arcgismaps/toolkit/mapviewcalloutapp/MainActivity.kt b/microapps/CalloutApp/app/src/main/java/com/arcgismaps/toolkit/calloutapp/MainActivity.kt
similarity index 87%
rename from microapps/MapViewCalloutApp/app/src/main/java/com/arcgismaps/toolkit/mapviewcalloutapp/MainActivity.kt
rename to microapps/CalloutApp/app/src/main/java/com/arcgismaps/toolkit/calloutapp/MainActivity.kt
index 95d6196e3..af6c6c37f 100644
--- a/microapps/MapViewCalloutApp/app/src/main/java/com/arcgismaps/toolkit/mapviewcalloutapp/MainActivity.kt
+++ b/microapps/CalloutApp/app/src/main/java/com/arcgismaps/toolkit/calloutapp/MainActivity.kt
@@ -16,7 +16,7 @@
  *
  */
 
-package com.arcgismaps.toolkit.mapviewcalloutapp
+package com.arcgismaps.toolkit.calloutapp
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
@@ -24,7 +24,7 @@ import androidx.activity.compose.setContent
 import androidx.compose.runtime.Composable
 import com.arcgismaps.ApiKey
 import com.arcgismaps.ArcGISEnvironment
-import com.arcgismaps.toolkit.mapviewcalloutapp.screens.MainScreen
+import com.arcgismaps.toolkit.calloutapp.screens.MainScreen
 import com.esri.microappslib.theme.MicroAppTheme
 
 class MainActivity : ComponentActivity() {
@@ -33,13 +33,13 @@ class MainActivity : ComponentActivity() {
         ArcGISEnvironment.apiKey = ApiKey.create(BuildConfig.API_KEY)
         setContent {
             MicroAppTheme {
-                MapViewCalloutApp()
+                CalloutApp()
             }
         }
     }
 }
 
 @Composable
-fun MapViewCalloutApp() {
+fun CalloutApp() {
     MainScreen()
 }
diff --git a/microapps/MapViewCalloutApp/app/src/main/java/com/arcgismaps/toolkit/mapviewcalloutapp/screens/FeatureScreen.kt b/microapps/CalloutApp/app/src/main/java/com/arcgismaps/toolkit/calloutapp/screens/FeatureScreen.kt
similarity index 94%
rename from microapps/MapViewCalloutApp/app/src/main/java/com/arcgismaps/toolkit/mapviewcalloutapp/screens/FeatureScreen.kt
rename to microapps/CalloutApp/app/src/main/java/com/arcgismaps/toolkit/calloutapp/screens/FeatureScreen.kt
index f36b2c28e..aa1d11f65 100644
--- a/microapps/MapViewCalloutApp/app/src/main/java/com/arcgismaps/toolkit/mapviewcalloutapp/screens/FeatureScreen.kt
+++ b/microapps/CalloutApp/app/src/main/java/com/arcgismaps/toolkit/calloutapp/screens/FeatureScreen.kt
@@ -16,7 +16,7 @@
  *
  */
 
-package com.arcgismaps.toolkit.mapviewcalloutapp.screens
+package com.arcgismaps.toolkit.calloutapp.screens
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -59,6 +59,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import com.arcgismaps.toolkit.geoviewcompose.LeaderPosition
 import com.arcgismaps.toolkit.geoviewcompose.MapView
 
 /**
@@ -66,7 +67,13 @@ import com.arcgismaps.toolkit.geoviewcompose.MapView
  */
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun FeatureScreen(viewModel: MapViewModel) {
+fun FeatureScreen(
+    viewModel: GeoViewModel,
+    screenTitle: String,
+    canNavigateBack: Boolean,
+    navigateUp: () -> Unit
+) {
+    val tapLocationGraphicsOverlay = viewModel.tapLocationGraphicsOverlay.collectAsState().value
     val selectedGeoElement = viewModel.selectedGeoElement.collectAsState().value
     val selectedLayerName = viewModel.selectedLayerName.collectAsState().value
     var calloutVisibility by rememberSaveable { mutableStateOf(true) }
@@ -75,6 +82,7 @@ fun FeatureScreen(viewModel: MapViewModel) {
     var showBottomSheet by remember { mutableStateOf(false) }
 
     Scaffold(
+        topBar = { CalloutAppBar(screenTitle, canNavigateBack, navigateUp) },
         floatingActionButton = {
             Box(
                 Modifier
@@ -97,7 +105,7 @@ fun FeatureScreen(viewModel: MapViewModel) {
             arcGISMap = viewModel.arcGISMapWithFeatureLayer,
             mapViewProxy = viewModel.mapViewProxy,
             insets = PaddingValues(horizontal = 12.dp),
-            graphicsOverlays = remember { listOf(viewModel.tapLocationGraphicsOverlay) },
+            graphicsOverlays = remember { listOf(tapLocationGraphicsOverlay) },
             onSingleTapConfirmed = { singleTapConfirmedEvent ->
                 viewModel.apply {
                     // clears the tapped location and graphic
@@ -116,6 +124,7 @@ fun FeatureScreen(viewModel: MapViewModel) {
                             .height(200.dp)
                             .widthIn(max = 300.dp),
                         geoElement = selectedGeoElement,
+                        leaderPosition = LeaderPosition.Automatic,
                         tapLocation = viewModel.tapLocation.value,
                     ) {
                         CalloutContent(
diff --git a/microapps/MapViewCalloutApp/app/src/main/java/com/arcgismaps/toolkit/mapviewcalloutapp/screens/MapViewModel.kt b/microapps/CalloutApp/app/src/main/java/com/arcgismaps/toolkit/calloutapp/screens/GeoViewModel.kt
similarity index 67%
rename from microapps/MapViewCalloutApp/app/src/main/java/com/arcgismaps/toolkit/mapviewcalloutapp/screens/MapViewModel.kt
rename to microapps/CalloutApp/app/src/main/java/com/arcgismaps/toolkit/calloutapp/screens/GeoViewModel.kt
index d1b8d8e58..8fa6ec209 100644
--- a/microapps/MapViewCalloutApp/app/src/main/java/com/arcgismaps/toolkit/mapviewcalloutapp/screens/MapViewModel.kt
+++ b/microapps/CalloutApp/app/src/main/java/com/arcgismaps/toolkit/calloutapp/screens/GeoViewModel.kt
@@ -16,7 +16,7 @@
  *
  */
 
-package com.arcgismaps.toolkit.mapviewcalloutapp.screens
+package com.arcgismaps.toolkit.calloutapp.screens
 
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.unit.dp
@@ -25,6 +25,7 @@ import androidx.lifecycle.viewModelScope
 import com.arcgismaps.Color
 import com.arcgismaps.geometry.Point
 import com.arcgismaps.mapping.ArcGISMap
+import com.arcgismaps.mapping.ArcGISScene
 import com.arcgismaps.mapping.BasemapStyle
 import com.arcgismaps.mapping.GeoElement
 import com.arcgismaps.mapping.Viewpoint
@@ -34,15 +35,17 @@ import com.arcgismaps.mapping.view.Graphic
 import com.arcgismaps.mapping.view.GraphicsOverlay
 import com.arcgismaps.mapping.view.SingleTapConfirmedEvent
 import com.arcgismaps.toolkit.geoviewcompose.MapViewProxy
+import com.arcgismaps.toolkit.geoviewcompose.SceneViewProxy
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 
-class MapViewModel : ViewModel() {
+class GeoViewModel : ViewModel() {
 
     val mapViewProxy = MapViewProxy()
+    val sceneViewProxy = SceneViewProxy()
 
     val arcGISMap = ArcGISMap(BasemapStyle.ArcGISTopographic).apply {
         initialViewpoint = Viewpoint(
@@ -52,6 +55,14 @@ class MapViewModel : ViewModel() {
         )
     }
 
+    val arcGISScene = ArcGISScene(BasemapStyle.ArcGISTopographic).apply {
+        initialViewpoint = Viewpoint(
+            latitude = 39.8,
+            longitude = -98.6,
+            scale = 10e7
+        )
+    }
+
     val arcGISMapWithFeatureLayer = ArcGISMap(
         uri = "https://www.arcgis.com/home/item.html?id=16f1b8ba37b44dc3884afc8d5f454dd2"
     ).apply {
@@ -61,8 +72,12 @@ class MapViewModel : ViewModel() {
         )
     }
 
-    private val _mapPoint = MutableStateFlow<Point?>(null)
-    val mapPoint: StateFlow<Point?> = _mapPoint.asStateFlow()
+
+    private val _geoViewType = MutableStateFlow<GeoViewType>(GeoViewType.SceneViewType)
+    val geoViewType: StateFlow<GeoViewType> = _geoViewType.asStateFlow()
+
+    private val _point = MutableStateFlow<Point?>(null)
+    val point: StateFlow<Point?> = _point.asStateFlow()
 
     private val _selectedGeoElement = MutableStateFlow<GeoElement?>(null)
     val selectedGeoElement: StateFlow<GeoElement?> = _selectedGeoElement.asStateFlow()
@@ -76,34 +91,47 @@ class MapViewModel : ViewModel() {
     private val _offset = MutableStateFlow(Offset.Zero)
     val offset: StateFlow<Offset> = _offset
 
-    val tapLocationGraphicsOverlay: GraphicsOverlay = GraphicsOverlay()
+    private val _tapLocationGraphicsOverlay = MutableStateFlow(GraphicsOverlay())
+    val tapLocationGraphicsOverlay: StateFlow<GraphicsOverlay> = _tapLocationGraphicsOverlay.asStateFlow()
 
     private var currentIdentifyJob: Job? = null
 
-    fun clearMapPoint() {
-        _mapPoint.value = null
-        tapLocationGraphicsOverlay.graphics.clear()
+    fun clearPoint() {
+        _point.value = null
+        _tapLocationGraphicsOverlay.value.graphics.clear()
+        _tapLocationGraphicsOverlay.value = GraphicsOverlay()
     }
 
     fun setOffset(offset: Offset) {
         _offset.value = offset
     }
 
-    fun setMapPoint(singleTapConfirmedEvent: SingleTapConfirmedEvent) {
-        _mapPoint.value = singleTapConfirmedEvent.mapPoint
+    fun setPoint(singleTapConfirmedEvent: SingleTapConfirmedEvent) {
+        if (_geoViewType.value == GeoViewType.MapViewType)
+            _point.value = singleTapConfirmedEvent.mapPoint
+        else
+            _point.value = sceneViewProxy.screenToBaseSurface(singleTapConfirmedEvent.screenCoordinate)
 
-        tapLocationGraphicsOverlay.graphics.clear()
-        tapLocationGraphicsOverlay.graphics.add(
+        _tapLocationGraphicsOverlay.value.graphics.clear()
+        _tapLocationGraphicsOverlay.value.graphics.add(
             Graphic(
-                geometry = _mapPoint.value,
+                geometry = _point.value,
                 symbol = SimpleMarkerSymbol(SimpleMarkerSymbolStyle.Cross, Color.red, 12.0f)
             )
         )
     }
 
+    fun toggleGeoView() {
+        clearPoint()
+        _geoViewType.value = if (_geoViewType.value == GeoViewType.MapViewType)
+            GeoViewType.SceneViewType
+        else
+            GeoViewType.MapViewType
+    }
+
     fun clearTapLocationAndGraphic() {
         _tapLocation.value = null
-        tapLocationGraphicsOverlay.graphics.clear()
+        _tapLocationGraphicsOverlay.value.graphics.clear()
     }
 
     fun clearSelectedGeoElement() {
@@ -113,8 +141,8 @@ class MapViewModel : ViewModel() {
     fun setTapLocation(tapLocation: Point?, nullTapLocation: Boolean) {
         _tapLocation.value = if (nullTapLocation) null else tapLocation
 
-        tapLocationGraphicsOverlay.graphics.clear()
-        tapLocationGraphicsOverlay.graphics.add(
+        _tapLocationGraphicsOverlay.value.graphics.clear()
+        _tapLocationGraphicsOverlay.value.graphics.add(
             Graphic(
                 geometry = tapLocation,
                 symbol = SimpleMarkerSymbol(SimpleMarkerSymbolStyle.Cross, Color.red, 12.0f)
@@ -146,3 +174,7 @@ class MapViewModel : ViewModel() {
         }
     }
 }
+sealed class GeoViewType {
+    object MapViewType : GeoViewType()
+    object SceneViewType : GeoViewType()
+}
diff --git a/microapps/MapViewCalloutApp/app/src/main/java/com/arcgismaps/toolkit/mapviewcalloutapp/screens/MainScreen.kt b/microapps/CalloutApp/app/src/main/java/com/arcgismaps/toolkit/calloutapp/screens/MainScreen.kt
similarity index 83%
rename from microapps/MapViewCalloutApp/app/src/main/java/com/arcgismaps/toolkit/mapviewcalloutapp/screens/MainScreen.kt
rename to microapps/CalloutApp/app/src/main/java/com/arcgismaps/toolkit/calloutapp/screens/MainScreen.kt
index cc38a84d7..3e6730eac 100644
--- a/microapps/MapViewCalloutApp/app/src/main/java/com/arcgismaps/toolkit/mapviewcalloutapp/screens/MainScreen.kt
+++ b/microapps/CalloutApp/app/src/main/java/com/arcgismaps/toolkit/calloutapp/screens/MainScreen.kt
@@ -16,7 +16,7 @@
  *
  */
 
-package com.arcgismaps.toolkit.mapviewcalloutapp.screens
+package com.arcgismaps.toolkit.calloutapp.screens
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -73,16 +73,23 @@ fun MainScreen() {
 
     CalloutAppNavHost(
         navController = navController,
-        calloutScreenNames = calloutAppScreens,
-        currentScreen = currentScreen
+        calloutScreenNames = calloutAppScreens
     ) {
         composable(route = calloutAppScreens[0]) {
-            val tapLocationViewModel: MapViewModel = viewModel()
-            TapLocationScreen(tapLocationViewModel)
+            val tapLocationViewModel: GeoViewModel = viewModel()
+            TapLocationScreen(
+                viewModel = tapLocationViewModel,
+                screenTitle = currentScreen,
+                canNavigateBack = navController.previousBackStackEntry != null,
+                navigateUp = { navController.navigateUp() })
         }
         composable(route = calloutAppScreens[1]) {
-            val featureViewModel: MapViewModel = viewModel()
-            FeatureScreen(featureViewModel)
+            val featureViewModel: GeoViewModel = viewModel()
+            FeatureScreen(
+                viewModel = featureViewModel,
+                screenTitle = currentScreen,
+                canNavigateBack = navController.previousBackStackEntry != null,
+                navigateUp = { navController.navigateUp() })
         }
     }
 }
@@ -92,33 +99,22 @@ fun MainScreen() {
 fun CalloutAppNavHost(
     navController: NavHostController,
     calloutScreenNames: MutableList<String>,
-    currentScreen: String,
     builder: NavGraphBuilder.() -> Unit
 ) {
-    Scaffold(
-        topBar = {
-            CalloutAppBar(
-                currentScreen = currentScreen,
-                canNavigateBack = navController.previousBackStackEntry != null,
-                navigateUp = { navController.navigateUp() }
+    NavHost(
+        modifier = Modifier,
+        navController = navController,
+        startDestination = "Callout App",
+    ) {
+        composable(route = "Callout App") {
+            NavScreenSwitcher(
+                calloutScreenNames = calloutScreenNames,
+                onScreenSelected = { selectedScreen ->
+                    navController.navigate(selectedScreen)
+                }
             )
         }
-    ) { innerPadding ->
-        NavHost(
-            modifier = Modifier.padding(innerPadding),
-            navController = navController,
-            startDestination = "Callout App",
-        ) {
-            composable(route = "Callout App") {
-                NavScreenSwitcher(
-                    calloutScreenNames = calloutScreenNames,
-                    onScreenSelected = { selectedScreen ->
-                        navController.navigate(selectedScreen)
-                    }
-                )
-            }
-            builder.invoke(this)
-        }
+        builder.invoke(this)
     }
 }
 
diff --git a/microapps/MapViewCalloutApp/app/src/main/java/com/arcgismaps/toolkit/mapviewcalloutapp/screens/TapLocationScreen.kt b/microapps/CalloutApp/app/src/main/java/com/arcgismaps/toolkit/calloutapp/screens/TapLocationScreen.kt
similarity index 58%
rename from microapps/MapViewCalloutApp/app/src/main/java/com/arcgismaps/toolkit/mapviewcalloutapp/screens/TapLocationScreen.kt
rename to microapps/CalloutApp/app/src/main/java/com/arcgismaps/toolkit/calloutapp/screens/TapLocationScreen.kt
index 2f19b3283..3ba8194b8 100644
--- a/microapps/MapViewCalloutApp/app/src/main/java/com/arcgismaps/toolkit/mapviewcalloutapp/screens/TapLocationScreen.kt
+++ b/microapps/CalloutApp/app/src/main/java/com/arcgismaps/toolkit/calloutapp/screens/TapLocationScreen.kt
@@ -16,7 +16,7 @@
  *
  */
 
-package com.arcgismaps.toolkit.mapviewcalloutapp.screens
+package com.arcgismaps.toolkit.calloutapp.screens
 
 import android.widget.TextView
 import androidx.compose.animation.AnimatedVisibility
@@ -47,6 +47,9 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SegmentedButton
+import androidx.compose.material3.SegmentedButtonDefaults
+import androidx.compose.material3.SingleChoiceSegmentedButtonRow
 import androidx.compose.material3.Text
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
@@ -68,7 +71,10 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.text.HtmlCompat
 import com.arcgismaps.geometry.Point
+import com.arcgismaps.toolkit.geoviewcompose.GeoViewScope
+import com.arcgismaps.toolkit.geoviewcompose.LeaderPosition
 import com.arcgismaps.toolkit.geoviewcompose.MapView
+import com.arcgismaps.toolkit.geoviewcompose.SceneView
 import kotlin.math.roundToInt
 
 /**
@@ -76,21 +82,27 @@ import kotlin.math.roundToInt
  */
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun TapLocationScreen(viewModel: MapViewModel) {
-
-    val mapPoint = viewModel.mapPoint.collectAsState().value
+fun TapLocationScreen(
+    viewModel: GeoViewModel,
+    screenTitle: String,
+    canNavigateBack: Boolean,
+    navigateUp: () -> Unit
+) {
+    val point = viewModel.point.collectAsState().value
     val offset = viewModel.offset.collectAsState().value
-
+    val tapLocationGraphicsOverlay = viewModel.tapLocationGraphicsOverlay.collectAsState().value
+    val geoViewType = viewModel.geoViewType.collectAsState().value
     var rotateOffsetWithGeoView by rememberSaveable { mutableStateOf(false) }
     var calloutVisibility by rememberSaveable { mutableStateOf(true) }
     var showBottomSheet by remember { mutableStateOf(false) }
     val modalBottomSheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
     // animate to a visible transition state
     val calloutVisibleState = remember { MutableTransitionState(false) }.apply {
-        targetState = mapPoint != null && calloutVisibility
+        targetState = point != null && calloutVisibility
     }
 
     Scaffold(
+        topBar = { CalloutAppBar(screenTitle, canNavigateBack, navigateUp) },
         floatingActionButton = {
             Box(
                 Modifier
@@ -106,44 +118,43 @@ fun TapLocationScreen(viewModel: MapViewModel) {
             }
         }
     ) { contentPadding ->
-        MapView(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(contentPadding),
-            arcGISMap = viewModel.arcGISMap,
-            graphicsOverlays = remember { listOf(viewModel.tapLocationGraphicsOverlay) },
-            onSingleTapConfirmed = viewModel::setMapPoint,
-            content = {
-                val lastMapPoint = remember { Ref<Point>() }
-                lastMapPoint.value = mapPoint ?: lastMapPoint.value
-
-                AnimatedVisibility(
-                    calloutVisibleState,
-                    enter = fadeIn(),
-                    exit = fadeOut()
-                ) {
-                    lastMapPoint.value?.let {
-                        Callout(
-                            modifier = Modifier.wrapContentSize(),
-                            location = it,
-                            rotateOffsetWithGeoView = rotateOffsetWithGeoView,
-                            offset = offset
-                        ) {
-                            Column(Modifier.padding(4.dp)) {
-                                HtmlText(
-                                    html = "<b>Tapped location</b>:<br>" +
-                                            "<i>x</i>    = ${it.x.roundToInt()}<br>" +
-                                            "<i>y</i>    = ${it.y.roundToInt()}<br>" +
-                                            "<i>wkid</i> = ${it.spatialReference?.wkid}",
-                                    htmlFlag = HtmlCompat.FROM_HTML_MODE_COMPACT,
-                                    textColor = MaterialTheme.colorScheme.onBackground,
-                                )
-                            }
-                        }
-                    }
+        if (geoViewType == GeoViewType.MapViewType) {
+            MapView(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .padding(contentPadding),
+                arcGISMap = viewModel.arcGISMap,
+                mapViewProxy = viewModel.mapViewProxy,
+                graphicsOverlays = listOf(tapLocationGraphicsOverlay),
+                onSingleTapConfirmed = viewModel::setPoint,
+                content = {
+                    GeoViewScopeContent(
+                        mapPoint = point,
+                        calloutVisibleState = calloutVisibleState,
+                        rotateOffsetWithGeoView = rotateOffsetWithGeoView,
+                        offset = offset
+                    )
                 }
-            }
-        )
+            )
+        } else {
+            SceneView(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .padding(contentPadding),
+                arcGISScene = viewModel.arcGISScene,
+                sceneViewProxy = viewModel.sceneViewProxy,
+                graphicsOverlays = listOf(tapLocationGraphicsOverlay),
+                onSingleTapConfirmed = viewModel::setPoint,
+                content = {
+                    GeoViewScopeContent(
+                        mapPoint = point,
+                        calloutVisibleState = calloutVisibleState,
+                        rotateOffsetWithGeoView = rotateOffsetWithGeoView,
+                        offset = offset
+                    )
+                }
+            )
+        }
 
         if (showBottomSheet) {
             ModalBottomSheet(
@@ -153,13 +164,15 @@ fun TapLocationScreen(viewModel: MapViewModel) {
             ) {
                 Box(Modifier.navigationBarsPadding()) {
                     CalloutOptions(
+                        isGeoViewMapView = geoViewType == GeoViewType.MapViewType,
                         calloutVisibility = calloutVisibility,
                         isCalloutRotationEnabled = rotateOffsetWithGeoView,
                         offset = offset,
-                        mapPoint = mapPoint,
+                        mapPoint = point,
                         onOffsetChange = { viewModel.setOffset(it) },
+                        onGeoViewToggled = { viewModel.toggleGeoView() },
                         onVisibilityToggled = { calloutVisibility = !calloutVisibility },
-                        onClearMapPointRequest = { viewModel.clearMapPoint() },
+                        onClearMapPointRequest = { viewModel.clearPoint() },
                         onCalloutOffsetRotationToggled = {
                             rotateOffsetWithGeoView = !rotateOffsetWithGeoView
                         }
@@ -170,6 +183,51 @@ fun TapLocationScreen(viewModel: MapViewModel) {
     }
 }
 
+
+/**
+ * Displays the callout at the tapped location on the map or scene.
+ *
+ * This function is responsible for managing callout at the coordinates of the [mapPoint].
+ * It uses animated visibility to show or hide the callout based on the state provided.
+ */
+@Composable
+fun GeoViewScope.GeoViewScopeContent(
+    mapPoint: Point?,
+    calloutVisibleState: MutableTransitionState<Boolean>,
+    rotateOffsetWithGeoView: Boolean,
+    offset: Offset
+) {
+    val lastMapPoint = remember { Ref<Point>() }
+    lastMapPoint.value = mapPoint ?: lastMapPoint.value
+
+    AnimatedVisibility(
+        calloutVisibleState,
+        enter = fadeIn(),
+        exit = fadeOut()
+    ) {
+        lastMapPoint.value?.let {
+            Callout(
+                modifier = Modifier.wrapContentSize(),
+                location = it,
+                leaderPosition = LeaderPosition.Automatic,
+                rotateOffsetWithGeoView = rotateOffsetWithGeoView,
+                offset = offset
+            ) {
+                Column(Modifier.padding(4.dp)) {
+                    HtmlText(
+                        html = "<b>Tapped location</b>:<br>" +
+                                "<i>x</i>    = ${it.x.roundToInt()}<br>" +
+                                "<i>y</i>    = ${it.y.roundToInt()}<br>" +
+                                "<i>wkid</i> = ${it.spatialReference?.wkid}",
+                        htmlFlag = HtmlCompat.FROM_HTML_MODE_COMPACT,
+                        textColor = MaterialTheme.colorScheme.onBackground,
+                    )
+                }
+            }
+        }
+    }
+}
+
 /**
  * AndroidView wrapper for the view-based [TextView] which is able to display a styled spannable [html].
  * Currently, Compose does not provide a tool to buildAnnotatedString for HTML styled spannable text.
@@ -191,31 +249,68 @@ fun HtmlText(modifier: Modifier = Modifier, html: String, htmlFlag: Int, textCol
  */
 @Composable
 fun CalloutOptions(
+    isGeoViewMapView: Boolean,
     calloutVisibility: Boolean,
     isCalloutRotationEnabled: Boolean,
     offset: Offset,
     mapPoint: Point?,
+    onGeoViewToggled: () -> Unit,
     onVisibilityToggled: () -> Unit,
     onOffsetChange: (Offset) -> Unit,
     onCalloutOffsetRotationToggled: () -> Unit,
     onClearMapPointRequest: () -> Unit,
 ) {
     Column(Modifier.padding(8.dp), horizontalAlignment = Alignment.CenterHorizontally) {
-        Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
+        Row(
+            modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Text(text = "Select GeoView")
+            SingleChoiceSegmentedButtonRow {
+                SegmentedButton(
+                    onClick = onGeoViewToggled,
+                    selected = isGeoViewMapView,
+                    label = { Text("MapView") },
+                    shape = SegmentedButtonDefaults.itemShape(
+                        index = 0,
+                        count = 2
+                    )
+                )
+                SegmentedButton(
+                    onClick = onGeoViewToggled,
+                    selected = !isGeoViewMapView,
+                    label = { Text("SceneView") },
+                    shape = SegmentedButtonDefaults.itemShape(
+                        index = 1,
+                        count = 2
+                    )
+                )
+            }
+        }
+        Row(
+            modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically
+        ) {
             Text(text = "Show Callout")
             Checkbox(
                 checked = calloutVisibility,
                 onCheckedChange = { onVisibilityToggled() }
             )
         }
-        Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
+        Row(
+            modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically
+        ) {
             Text(text = "Rotate offset")
             Checkbox(
                 checked = isCalloutRotationEnabled,
                 onCheckedChange = { onCalloutOffsetRotationToggled() }
             )
         }
-        Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceAround) {
+        Row(
+            modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceAround,
+            verticalAlignment = Alignment.CenterVertically
+        ) {
             OutlinedTextField(
                 modifier = Modifier.weight(1f),
                 value = offset.x.toString(),
diff --git a/microapps/MapViewCalloutApp/app/src/main/res/drawable/ic_launcher_background.xml b/microapps/CalloutApp/app/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from microapps/MapViewCalloutApp/app/src/main/res/drawable/ic_launcher_background.xml
rename to microapps/CalloutApp/app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/microapps/MapViewCalloutApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/microapps/CalloutApp/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from microapps/MapViewCalloutApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to microapps/CalloutApp/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/microapps/MapViewCalloutApp/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/microapps/CalloutApp/app/src/main/res/mipmap-hdpi/ic_launcher.webp
similarity index 100%
rename from microapps/MapViewCalloutApp/app/src/main/res/mipmap-hdpi/ic_launcher.webp
rename to microapps/CalloutApp/app/src/main/res/mipmap-hdpi/ic_launcher.webp
diff --git a/microapps/MapViewCalloutApp/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/microapps/CalloutApp/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
similarity index 100%
rename from microapps/MapViewCalloutApp/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
rename to microapps/CalloutApp/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
diff --git a/microapps/MapViewCalloutApp/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/microapps/CalloutApp/app/src/main/res/mipmap-mdpi/ic_launcher.webp
similarity index 100%
rename from microapps/MapViewCalloutApp/app/src/main/res/mipmap-mdpi/ic_launcher.webp
rename to microapps/CalloutApp/app/src/main/res/mipmap-mdpi/ic_launcher.webp
diff --git a/microapps/MapViewCalloutApp/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/microapps/CalloutApp/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
similarity index 100%
rename from microapps/MapViewCalloutApp/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
rename to microapps/CalloutApp/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
diff --git a/microapps/MapViewCalloutApp/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/microapps/CalloutApp/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
similarity index 100%
rename from microapps/MapViewCalloutApp/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
rename to microapps/CalloutApp/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
diff --git a/microapps/MapViewCalloutApp/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/microapps/CalloutApp/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
similarity index 100%
rename from microapps/MapViewCalloutApp/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
rename to microapps/CalloutApp/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
diff --git a/microapps/MapViewCalloutApp/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/microapps/CalloutApp/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
similarity index 100%
rename from microapps/MapViewCalloutApp/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
rename to microapps/CalloutApp/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
diff --git a/microapps/MapViewCalloutApp/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/microapps/CalloutApp/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
similarity index 100%
rename from microapps/MapViewCalloutApp/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
rename to microapps/CalloutApp/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
diff --git a/microapps/MapViewCalloutApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/microapps/CalloutApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
similarity index 100%
rename from microapps/MapViewCalloutApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
rename to microapps/CalloutApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
diff --git a/microapps/MapViewCalloutApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/microapps/CalloutApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
similarity index 100%
rename from microapps/MapViewCalloutApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
rename to microapps/CalloutApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
diff --git a/microapps/MapViewCalloutApp/app/src/main/res/values/colors.xml b/microapps/CalloutApp/app/src/main/res/values/colors.xml
similarity index 100%
rename from microapps/MapViewCalloutApp/app/src/main/res/values/colors.xml
rename to microapps/CalloutApp/app/src/main/res/values/colors.xml
diff --git a/microapps/MapViewCalloutApp/app/src/main/res/values/strings.xml b/microapps/CalloutApp/app/src/main/res/values/strings.xml
similarity index 92%
rename from microapps/MapViewCalloutApp/app/src/main/res/values/strings.xml
rename to microapps/CalloutApp/app/src/main/res/values/strings.xml
index 70a05bfd1..1c1d8c5a2 100644
--- a/microapps/MapViewCalloutApp/app/src/main/res/values/strings.xml
+++ b/microapps/CalloutApp/app/src/main/res/values/strings.xml
@@ -17,5 +17,5 @@
   -->
 
 <resources>
-    <string name="app_name">MapViewCalloutApp</string>
+    <string name="app_name">CalloutApp</string>
 </resources>
diff --git a/microapps/MapViewCalloutApp/app/src/main/res/values/themes.xml b/microapps/CalloutApp/app/src/main/res/values/themes.xml
similarity index 87%
rename from microapps/MapViewCalloutApp/app/src/main/res/values/themes.xml
rename to microapps/CalloutApp/app/src/main/res/values/themes.xml
index 456bece1e..7eebad38e 100644
--- a/microapps/MapViewCalloutApp/app/src/main/res/values/themes.xml
+++ b/microapps/CalloutApp/app/src/main/res/values/themes.xml
@@ -19,5 +19,5 @@
 
 <resources>
 
-    <style name="Theme.MapViewCalloutApp" parent="android:Theme.Material.Light.NoActionBar" />
+    <style name="Theme.CalloutApp" parent="android:Theme.Material.Light.NoActionBar" />
 </resources>
diff --git a/microapps/MapViewCalloutApp/app/src/main/res/xml/backup_rules.xml b/microapps/CalloutApp/app/src/main/res/xml/backup_rules.xml
similarity index 100%
rename from microapps/MapViewCalloutApp/app/src/main/res/xml/backup_rules.xml
rename to microapps/CalloutApp/app/src/main/res/xml/backup_rules.xml
diff --git a/microapps/MapViewCalloutApp/app/src/main/res/xml/data_extraction_rules.xml b/microapps/CalloutApp/app/src/main/res/xml/data_extraction_rules.xml
similarity index 100%
rename from microapps/MapViewCalloutApp/app/src/main/res/xml/data_extraction_rules.xml
rename to microapps/CalloutApp/app/src/main/res/xml/data_extraction_rules.xml
diff --git a/microapps/CompassApp/app/build.gradle.kts b/microapps/CompassApp/app/build.gradle.kts
index 956e04ef2..1af5b0d36 100644
--- a/microapps/CompassApp/app/build.gradle.kts
+++ b/microapps/CompassApp/app/build.gradle.kts
@@ -17,76 +17,19 @@
  */
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-}
-
-secrets {
-    defaultPropertiesFileName = "secrets.defaults.properties"
+    alias(libs.plugins.arcgismaps.kotlin.microapp)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.compassapp"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
+    
     defaultConfig {
-        applicationId ="com.arcgismaps.toolkit.compassapp"
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner ="androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            //proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),("proguard-rules.pro"
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
+        applicationId = "com.arcgismaps.toolkit.compassapp"
     }
 }
 
 dependencies {
+    // Module-specific dependencies go here
     implementation(project(":compass"))
     implementation(project(":geoview-compose"))
-    implementation(project(":microapps-lib"))
-    implementation(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
 }
diff --git a/microapps/CompassApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/microapps/CompassApp/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from microapps/CompassApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to microapps/CompassApp/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/microapps/FeatureFormsApp/app/build.gradle.kts b/microapps/FeatureFormsApp/app/build.gradle.kts
index e8aed9eb0..05c0bc688 100644
--- a/microapps/FeatureFormsApp/app/build.gradle.kts
+++ b/microapps/FeatureFormsApp/app/build.gradle.kts
@@ -17,93 +17,36 @@
  */
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-    id("com.google.dagger.hilt.android")
-    id("com.google.devtools.ksp")
+    alias(libs.plugins.arcgismaps.kotlin.microapp)
+    alias(libs.plugins.hilt)
+    alias(libs.plugins.ksp)
 }
 
-secrets {
-    defaultPropertiesFileName = "secrets.defaults.properties"
+hilt {
+    enableAggregatingTask = true
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.featureformsapp"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
+    
     defaultConfig {
-        applicationId ="com.arcgismaps.toolkit.featureformsapp"
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner ="androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-    }
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            //proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),("proguard-rules.pro"
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
+        applicationId = "com.arcgismaps.toolkit.featureformsapp"
     }
 }
 
 dependencies {
+    // Module-specific dependencies go here
     implementation(project(":authentication"))
     implementation(project(":featureforms"))
     implementation(project(":geoview-compose"))
-    // sdk
-    implementation(arcgis.mapsSdk)
-    // hilt
+    implementation(libs.androidx.compose.navigation)
     implementation(libs.hilt.android.core)
     implementation(libs.androidx.hilt.navigation.compose)
     ksp(libs.hilt.compiler)
-    // room
     implementation(libs.room.runtime)
     annotationProcessor(libs.room.compiler)
     implementation(libs.room.ext)
     ksp(libs.room.compiler)
-    // jetpack window manager
     implementation(libs.androidx.window)
     implementation(libs.androidx.window.core)
-    // compose
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.compose.navigation)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    testImplementation(libs.bundles.unitTest)
-    testImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.bundles.composeTest)
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    debugImplementation(libs.bundles.debug)
 }
diff --git a/microapps/FeatureFormsApp/app/src/main/java/com/arcgismaps/toolkit/featureformsapp/screens/bottomsheet/SheetLayout.kt b/microapps/FeatureFormsApp/app/src/main/java/com/arcgismaps/toolkit/featureformsapp/screens/bottomsheet/SheetLayout.kt
index a6a283797..be476ee15 100644
--- a/microapps/FeatureFormsApp/app/src/main/java/com/arcgismaps/toolkit/featureformsapp/screens/bottomsheet/SheetLayout.kt
+++ b/microapps/FeatureFormsApp/app/src/main/java/com/arcgismaps/toolkit/featureformsapp/screens/bottomsheet/SheetLayout.kt
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+@file:Suppress("DEPRECATION")
+
 package com.arcgismaps.toolkit.featureformsapp.screens.bottomsheet
 
 import android.content.res.Configuration
diff --git a/microapps/FeatureFormsApp/app/src/main/java/com/arcgismaps/toolkit/featureformsapp/screens/map/MapScreen.kt b/microapps/FeatureFormsApp/app/src/main/java/com/arcgismaps/toolkit/featureformsapp/screens/map/MapScreen.kt
index e70f63a7d..b8d41bc12 100644
--- a/microapps/FeatureFormsApp/app/src/main/java/com/arcgismaps/toolkit/featureformsapp/screens/map/MapScreen.kt
+++ b/microapps/FeatureFormsApp/app/src/main/java/com/arcgismaps/toolkit/featureformsapp/screens/map/MapScreen.kt
@@ -546,7 +546,7 @@ fun ErrorDialog(
         properties = DialogProperties(dismissOnBackPress = true, dismissOnClickOutside = true)
     )
 }
-
+@Suppress("DEPRECATION")
 fun getWindowSize(context: Context): WindowSizeClass {
     val metrics = WindowMetricsCalculator.getOrCreate().computeCurrentWindowMetrics(context)
     val width = metrics.bounds.width()
diff --git a/microapps/FeatureFormsApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/microapps/FeatureFormsApp/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from microapps/FeatureFormsApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to microapps/FeatureFormsApp/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/microapps/FloorFilterApp/app/build.gradle.kts b/microapps/FloorFilterApp/app/build.gradle.kts
index dd97b3deb..c1ead411c 100644
--- a/microapps/FloorFilterApp/app/build.gradle.kts
+++ b/microapps/FloorFilterApp/app/build.gradle.kts
@@ -1,75 +1,17 @@
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-}
-
-secrets {
-    // this file doesn't contain secrets, it just provides defaults which can be committed into git.
-    defaultPropertiesFileName = "secrets.defaults.properties"
+    alias(libs.plugins.arcgismaps.kotlin.microapp)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.floorfilterapp"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
+    
     defaultConfig {
-        applicationId ="com.arcgismaps.toolkit.floorfilterapp"
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner ="androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            //proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),("proguard-rules.pro"
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
+        applicationId = "com.arcgismaps.toolkit.floorfilterapp"
     }
 }
 
 dependencies {
+    // Module-specific dependencies go here
     implementation(project(":indoors"))
     implementation(project(":geoview-compose"))
-    implementation(project(":microapps-lib"))
-    implementation(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
 }
diff --git a/microapps/FloorFilterApp/app/src/main/java/com/arcgismaps/toolkit/floorfilterapp/screens/MainScreen.kt b/microapps/FloorFilterApp/app/src/main/java/com/arcgismaps/toolkit/floorfilterapp/screens/MainScreen.kt
index 6522bef5d..6d2a84bf5 100644
--- a/microapps/FloorFilterApp/app/src/main/java/com/arcgismaps/toolkit/floorfilterapp/screens/MainScreen.kt
+++ b/microapps/FloorFilterApp/app/src/main/java/com/arcgismaps/toolkit/floorfilterapp/screens/MainScreen.kt
@@ -32,7 +32,7 @@ import com.arcgismaps.toolkit.indoors.FloorFilter
 fun MainScreen(modifier: Modifier = Modifier, viewModel: FloorFilterViewModel = viewModel()) {
 
     MapView(
-        viewModel.floorAwareWebMap,
+        arcGISMap = viewModel.floorAwareWebMap,
         modifier = modifier.fillMaxSize(),
         mapViewProxy = viewModel.mapViewProxy
     )
diff --git a/microapps/FloorFilterApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/microapps/FloorFilterApp/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from microapps/FloorFilterApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to microapps/FloorFilterApp/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/microapps/LegendApp/app/build.gradle.kts b/microapps/LegendApp/app/build.gradle.kts
index c6f011210..631bd32cc 100644
--- a/microapps/LegendApp/app/build.gradle.kts
+++ b/microapps/LegendApp/app/build.gradle.kts
@@ -17,78 +17,19 @@
  */
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-}
-
-secrets {
-    // this file doesn't contain secrets, it just provides defaults which can be committed into git.
-    defaultPropertiesFileName = "secrets.defaults.properties"
+    alias(libs.plugins.arcgismaps.kotlin.microapp)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.legendapp"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
+    
     defaultConfig {
-        applicationId ="com.arcgismaps.toolkit.legendapp"
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner ="androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            //proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),("proguard-rules.pro"
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
+        applicationId = "com.arcgismaps.toolkit.legendapp"
     }
 }
 
 dependencies {
+    // Module-specific dependencies go here
     implementation(project(":legend"))
     implementation(project(":geoview-compose"))
-    implementation(project(":microapps-lib"))
-    implementation(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
 }
diff --git a/microapps/LegendApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/microapps/LegendApp/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from microapps/LegendApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to microapps/LegendApp/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/microapps/MapViewCalloutApp/README.md b/microapps/MapViewCalloutApp/README.md
deleted file mode 100644
index 6a34078f1..000000000
--- a/microapps/MapViewCalloutApp/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# MapView Callout Micro-app
-
-This micro-app demonstrates the use of `Callout` with a composable `MapView`. `Callout` is a composable function which renders an empty composable Box placed at a given point or GeoElement on a Map. The content of the composable Box is customizable, while the container of the Box is a stylable rectangular shape with a leader line positioned at the point of the tap or GeoElement passed into the `Callout` composable functions.
-
-## Usage
-
-The application starts with a choice of two screens
-* A `MapView` that displays a `Callout` at the location where the user taps on the screen.
-* A `MapView` with `Callout`s placed on GeoElements tapped by the user.
-* For more information on the composable `Callout` component and how it works, see the relevant section in the composable GeoView [Readme](../../toolkit/geoview-compose#display-a-callout).
-
-![Callout-geoelement](https://github.com/user-attachments/assets/d6fd278a-c773-45f3-9ecd-a76852b71192)
-
diff --git a/microapps/MapViewCalloutApp/app/build.gradle.kts b/microapps/MapViewCalloutApp/app/build.gradle.kts
deleted file mode 100644
index 3dcc8938b..000000000
--- a/microapps/MapViewCalloutApp/app/build.gradle.kts
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- *
- *  Copyright 2024 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.
- *
- */
-
-plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-}
-
-secrets {
-    // this file doesn't contain secrets, it just provides defaults which can be committed into git.
-    defaultPropertiesFileName = "secrets.defaults.properties"
-}
-
-android {
-    namespace = "com.arcgismaps.toolkit.mapviewcalloutapp"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
-    defaultConfig {
-        applicationId ="com.arcgismaps.toolkit.mapviewcalloutapp"
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner ="androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            //proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),("proguard-rules.pro"
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
-    }
-}
-
-dependencies {
-    implementation(project(":geoview-compose"))
-    implementation(project(":microapps-lib"))
-    implementation(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    implementation(libs.androidx.compose.navigation)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
-}
diff --git a/microapps/MapViewCalloutApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/microapps/MapViewCalloutApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index 6b4a339aa..000000000
--- a/microapps/MapViewCalloutApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~
-  ~  Copyright 2024 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.
-  ~
-  -->
-
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
diff --git a/microapps/MapViewCalloutApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/microapps/MapViewCalloutApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index 6b4a339aa..000000000
--- a/microapps/MapViewCalloutApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~
-  ~  Copyright 2024 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.
-  ~
-  -->
-
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
diff --git a/microapps/MapViewGeometryEditorApp/app/build.gradle.kts b/microapps/MapViewGeometryEditorApp/app/build.gradle.kts
index 67ea51616..0eb0e53fe 100644
--- a/microapps/MapViewGeometryEditorApp/app/build.gradle.kts
+++ b/microapps/MapViewGeometryEditorApp/app/build.gradle.kts
@@ -17,78 +17,18 @@
  */
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-}
-
-secrets {
-    // this file doesn't contain secrets, it just provides defaults which can be committed into git.
-    defaultPropertiesFileName = "secrets.defaults.properties"
+    alias(libs.plugins.arcgismaps.kotlin.microapp)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.mapviewgeometryeditorapp"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
+    
     defaultConfig {
-        applicationId ="com.arcgismaps.toolkit.mapviewgeometryeditorapp"
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner ="androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            //proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),("proguard-rules.pro"
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    @Suppress("UnstableApiUsage")
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
+        applicationId = "com.arcgismaps.toolkit.mapviewgeometryeditorapp"
     }
 }
 
 dependencies {
+    // Module-specific dependencies go here
     implementation(project(":geoview-compose"))
-    implementation(project(":microapps-lib"))
-    implementation(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    testImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
 }
diff --git a/microapps/MapViewGeometryEditorApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/microapps/MapViewGeometryEditorApp/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from microapps/MapViewGeometryEditorApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to microapps/MapViewGeometryEditorApp/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/microapps/MapViewIdentifyApp/app/build.gradle.kts b/microapps/MapViewIdentifyApp/app/build.gradle.kts
index 99d0184a6..7439ed816 100644
--- a/microapps/MapViewIdentifyApp/app/build.gradle.kts
+++ b/microapps/MapViewIdentifyApp/app/build.gradle.kts
@@ -17,78 +17,18 @@
  */
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-}
-
-secrets {
-    // this file doesn't contain secrets, it just provides defaults which can be committed into git.
-    defaultPropertiesFileName = "secrets.defaults.properties"
+    alias(libs.plugins.arcgismaps.kotlin.microapp)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.mapviewidentifyapp"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
+    
     defaultConfig {
-        applicationId ="com.arcgismaps.toolkit.mapviewidentifyapp"
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner ="androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            //proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),("proguard-rules.pro"
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    @Suppress("UnstableApiUsage")
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
+        applicationId = "com.arcgismaps.toolkit.mapviewidentifyapp"
     }
 }
 
 dependencies {
+    // Module-specific dependencies go here
     implementation(project(":geoview-compose"))
-    implementation(project(":microapps-lib"))
-    implementation(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    testImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
 }
diff --git a/microapps/MapViewIdentifyApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/microapps/MapViewIdentifyApp/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from microapps/MapViewIdentifyApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to microapps/MapViewIdentifyApp/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/microapps/MapViewInsetsApp/app/build.gradle.kts b/microapps/MapViewInsetsApp/app/build.gradle.kts
index 7605d6288..071eb6751 100644
--- a/microapps/MapViewInsetsApp/app/build.gradle.kts
+++ b/microapps/MapViewInsetsApp/app/build.gradle.kts
@@ -17,78 +17,18 @@
  */
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-}
-
-secrets {
-    // this file doesn't contain secrets, it just provides defaults which can be committed into git.
-    defaultPropertiesFileName = "secrets.defaults.properties"
+    alias(libs.plugins.arcgismaps.kotlin.microapp)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.mapviewinsetsapp"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
+    
     defaultConfig {
-        applicationId ="com.arcgismaps.toolkit.mapviewinsetsapp"
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner ="androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            //proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),("proguard-rules.pro"
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    @Suppress("UnstableApiUsage")
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
+        applicationId = "com.arcgismaps.toolkit.mapviewinsetsapp"
     }
 }
 
 dependencies {
+    // Module-specific dependencies go here
     implementation(project(":geoview-compose"))
-    implementation(project(":microapps-lib"))
-    implementation(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    testImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
 }
diff --git a/microapps/MapViewInsetsApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/microapps/MapViewInsetsApp/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from microapps/MapViewInsetsApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to microapps/MapViewInsetsApp/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/microapps/MapViewLocationDisplayApp/app/build.gradle.kts b/microapps/MapViewLocationDisplayApp/app/build.gradle.kts
index a571f3138..a2abcc5bf 100644
--- a/microapps/MapViewLocationDisplayApp/app/build.gradle.kts
+++ b/microapps/MapViewLocationDisplayApp/app/build.gradle.kts
@@ -17,78 +17,18 @@
  */
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-}
-
-secrets {
-    // this file doesn't contain secrets, it just provides defaults which can be committed into git.
-    defaultPropertiesFileName = "secrets.defaults.properties"
+    alias(libs.plugins.arcgismaps.kotlin.microapp)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.mapviewlocationdisplayapp"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
+    
     defaultConfig {
-        applicationId ="com.arcgismaps.toolkit.mapviewlocationdisplayapp"
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner ="androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            //proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),("proguard-rules.pro"
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    @Suppress("UnstableApiUsage")
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
+        applicationId = "com.arcgismaps.toolkit.mapviewlocationdisplayapp"
     }
 }
 
 dependencies {
+    // Module-specific dependencies go here
     implementation(project(":geoview-compose"))
-    implementation(project(":microapps-lib"))
-    implementation(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    testImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
 }
diff --git a/microapps/MapViewLocationDisplayApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/microapps/MapViewLocationDisplayApp/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from microapps/MapViewLocationDisplayApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to microapps/MapViewLocationDisplayApp/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/microapps/MapViewSetViewpointApp/app/build.gradle.kts b/microapps/MapViewSetViewpointApp/app/build.gradle.kts
index befcf9b33..8c8966fec 100644
--- a/microapps/MapViewSetViewpointApp/app/build.gradle.kts
+++ b/microapps/MapViewSetViewpointApp/app/build.gradle.kts
@@ -17,78 +17,18 @@
  */
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-}
-
-secrets {
-    // this file doesn't contain secrets, it just provides defaults which can be committed into git.
-    defaultPropertiesFileName = "secrets.defaults.properties"
+    alias(libs.plugins.arcgismaps.kotlin.microapp)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.mapviewsetviewpointapp"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
+    
     defaultConfig {
-        applicationId ="com.arcgismaps.toolkit.mapviewsetviewpointapp"
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner ="androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            //proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),("proguard-rules.pro"
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    @Suppress("UnstableApiUsage")
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
+        applicationId = "com.arcgismaps.toolkit.mapviewsetviewpointapp"
     }
 }
 
 dependencies {
+    // Module-specific dependencies go here
     implementation(project(":geoview-compose"))
-    implementation(project(":microapps-lib"))
-    implementation(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    testImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
 }
diff --git a/microapps/MapViewSetViewpointApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/microapps/MapViewSetViewpointApp/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from microapps/MapViewSetViewpointApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to microapps/MapViewSetViewpointApp/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/microapps/MicroappsLib/build.gradle.kts b/microapps/MicroappsLib/build.gradle.kts
index ab42f1e14..202c7d2cd 100644
--- a/microapps/MicroappsLib/build.gradle.kts
+++ b/microapps/MicroappsLib/build.gradle.kts
@@ -17,52 +17,13 @@
  */
 
 plugins {
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.arcgismaps.android.library.compose)
 }
 
 android {
     namespace = "com.esri.microappslib"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
-    defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt()
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    buildFeatures {
-        compose = true
-    }
-    @Suppress("UnstableApiUsage")
-    testOptions {
-        targetSdk = libs.versions.compileSdk.get().toInt()
-    }
 }
 
 dependencies {
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.lifecycle.runtime.compose)
-    implementation(libs.androidx.activity.compose)
-    debugImplementation(libs.bundles.debug)
+    // Module-specific dependencies go here
 }
diff --git a/microapps/OfflineMapAreasApp/app/build.gradle.kts b/microapps/OfflineMapAreasApp/app/build.gradle.kts
index 841c7bf79..7bbb8df6f 100644
--- a/microapps/OfflineMapAreasApp/app/build.gradle.kts
+++ b/microapps/OfflineMapAreasApp/app/build.gradle.kts
@@ -17,77 +17,19 @@
  */
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-}
-
-secrets {
-    // this file doesn't contain secrets, it just provides defaults which can be committed into git.
-    defaultPropertiesFileName = "secrets.defaults.properties"
+    alias(libs.plugins.arcgismaps.kotlin.microapp)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.offlinemapareasapp"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
+    
     defaultConfig {
-        applicationId ="com.arcgismaps.toolkit.offlinemapareasapp"
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner ="androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
+        applicationId = "com.arcgismaps.toolkit.offlinemapareasapp"
     }
 }
 
 dependencies {
-    implementation(project(":geoview-compose"))
-    implementation(arcgis.mapsSdk)
+    // Module-specific dependencies go here
     implementation(project(":offline"))
-    implementation(project(":microapps-lib"))
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
+    implementation(project(":geoview-compose"))
 }
diff --git a/microapps/OfflineMapAreasApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/microapps/OfflineMapAreasApp/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from microapps/OfflineMapAreasApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to microapps/OfflineMapAreasApp/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/microapps/OverviewMapApp/app/build.gradle.kts b/microapps/OverviewMapApp/app/build.gradle.kts
index 83b0f185a..589b749aa 100644
--- a/microapps/OverviewMapApp/app/build.gradle.kts
+++ b/microapps/OverviewMapApp/app/build.gradle.kts
@@ -17,77 +17,18 @@
  */
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-}
-
-secrets {
-    // this file doesn't contain secrets, it just provides defaults which can be committed into git.
-    defaultPropertiesFileName = "secrets.defaults.properties"
+    alias(libs.plugins.arcgismaps.kotlin.microapp)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.overviewmapapp"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
+    
     defaultConfig {
-        applicationId ="com.arcgismaps.toolkit.overviewmapapp"
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner ="androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            //proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),("proguard-rules.pro"
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
+        applicationId = "com.arcgismaps.toolkit.overviewmapapp"
     }
 }
 
 dependencies {
+    // Module-specific dependencies go here
     implementation(project(":geoview-compose"))
-    implementation(project(":microapps-lib"))
-    implementation(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
 }
diff --git a/microapps/OverviewMapApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/microapps/OverviewMapApp/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from microapps/OverviewMapApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to microapps/OverviewMapApp/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/microapps/PopupApp/app/build.gradle.kts b/microapps/PopupApp/app/build.gradle.kts
index 6b828b17a..12312e87a 100644
--- a/microapps/PopupApp/app/build.gradle.kts
+++ b/microapps/PopupApp/app/build.gradle.kts
@@ -17,82 +17,19 @@
  */
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-}
-
-secrets {
-    // this file doesn't contain secrets, it just provides defaults which can be committed into git.
-    defaultPropertiesFileName = "secrets.defaults.properties"
+    alias(libs.plugins.arcgismaps.kotlin.microapp)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.popupapp"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
+    
     defaultConfig {
-        applicationId ="com.arcgismaps.toolkit.popupapp"
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner ="androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = true
-            isShrinkResources = true
-
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
-    }
-
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
+        applicationId = "com.arcgismaps.toolkit.popupapp"
     }
 }
 
 dependencies {
-    implementation(project(":geoview-compose"))
-    implementation(arcgis.mapsSdk)
+    // Module-specific dependencies go here
     implementation(project(":popup"))
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
+    implementation(project(":geoview-compose"))
 }
diff --git a/microapps/PopupApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/microapps/PopupApp/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from microapps/PopupApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to microapps/PopupApp/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/microapps/ScalebarApp/app/build.gradle.kts b/microapps/ScalebarApp/app/build.gradle.kts
index f9aee08b5..a1747cb57 100644
--- a/microapps/ScalebarApp/app/build.gradle.kts
+++ b/microapps/ScalebarApp/app/build.gradle.kts
@@ -17,78 +17,19 @@
  */
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-}
-
-secrets {
-    // this file doesn't contain secrets, it just provides defaults which can be committed into git.
-    defaultPropertiesFileName = "secrets.defaults.properties"
+    alias(libs.plugins.arcgismaps.kotlin.microapp)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.scalebarapp"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
+    
     defaultConfig {
-        applicationId ="com.arcgismaps.toolkit.scalebarapp"
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner ="androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            //proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),("proguard-rules.pro"
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
+        applicationId = "com.arcgismaps.toolkit.scalebarapp"
     }
 }
 
 dependencies {
+    // Module-specific dependencies go here
     implementation(project(":scalebar"))
     implementation(project(":geoview-compose"))
-    implementation(project(":microapps-lib"))
-    implementation(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
 }
diff --git a/microapps/ScalebarApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/microapps/ScalebarApp/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from microapps/ScalebarApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to microapps/ScalebarApp/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/microapps/SceneViewAnalysisOverlayApp/app/build.gradle.kts b/microapps/SceneViewAnalysisOverlayApp/app/build.gradle.kts
index 5276b87d1..e62a530a1 100644
--- a/microapps/SceneViewAnalysisOverlayApp/app/build.gradle.kts
+++ b/microapps/SceneViewAnalysisOverlayApp/app/build.gradle.kts
@@ -17,77 +17,18 @@
  */
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-}
-
-secrets {
-    // this file doesn't contain secrets, it just provides defaults which can be committed into git.
-    defaultPropertiesFileName = "secrets.defaults.properties"
+    alias(libs.plugins.arcgismaps.kotlin.microapp)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.sceneviewanalysisoverlayapp"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
+    
     defaultConfig {
-        applicationId ="com.arcgismaps.toolkit.sceneviewanalysisoverlayapp"
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner ="androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            //proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),("proguard-rules.pro"
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    @Suppress("UnstableApiUsage")
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
+        applicationId = "com.arcgismaps.toolkit.sceneviewanalysisoverlayapp"
     }
 }
 
 dependencies {
+    // Module-specific dependencies go here
     implementation(project(":geoview-compose"))
-    implementation(project(":microapps-lib"))
-    implementation(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
 }
diff --git a/microapps/SceneViewAnalysisOverlayApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/microapps/SceneViewAnalysisOverlayApp/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from microapps/SceneViewAnalysisOverlayApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to microapps/SceneViewAnalysisOverlayApp/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/microapps/SceneViewCalloutApp/.gitignore b/microapps/SceneViewCalloutApp/.gitignore
deleted file mode 100644
index aa724b770..000000000
--- a/microapps/SceneViewCalloutApp/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-*.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
diff --git a/microapps/SceneViewCalloutApp/README.md b/microapps/SceneViewCalloutApp/README.md
deleted file mode 100644
index 8bd6838a5..000000000
--- a/microapps/SceneViewCalloutApp/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# SceneView Callout Micro-app
-
-This micro-app showcases the use of `Callout` with a composable `SceneView`. Callout is a composable function that renders an empty composable Box at a specified point or GeoElement on a Scene. The content of the composable Box is customizable, and the container is a stylable rectangular shape with a leader line positioned at the tap location or GeoElement passed into the `Callout` composable function.
-
-## Usage
-
-The application displays a screen containing a `SceneView` that, when tapped, shows a Callout and a red graphic cross marking the tapped location.
-For more information on the composable `Callout` component and how it works, see its section in the composable GeoView [Readme](../../toolkit/geoview-compose#display-a-callout).
-
-![scene-view-callout](https://github.com/user-attachments/assets/ed237ebf-3b69-4459-adde-2d7554326ba4)
diff --git a/microapps/SceneViewCalloutApp/app/.gitignore b/microapps/SceneViewCalloutApp/app/.gitignore
deleted file mode 100644
index 796b96d1c..000000000
--- a/microapps/SceneViewCalloutApp/app/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/microapps/SceneViewCalloutApp/app/build.gradle.kts b/microapps/SceneViewCalloutApp/app/build.gradle.kts
index 530c35804..0bbcf0e1d 100644
--- a/microapps/SceneViewCalloutApp/app/build.gradle.kts
+++ b/microapps/SceneViewCalloutApp/app/build.gradle.kts
@@ -17,76 +17,18 @@
  */
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-}
-
-secrets {
-    // this file doesn't contain secrets, it just provides defaults which can be committed into git.
-    defaultPropertiesFileName = "secrets.defaults.properties"
+    alias(libs.plugins.arcgismaps.kotlin.microapp)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.sceneviewcalloutapp"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
+    
     defaultConfig {
-        applicationId ="com.arcgismaps.toolkit.sceneviewcalloutapp"
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner ="androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            //proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),("proguard-rules.pro"
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
+        applicationId = "com.arcgismaps.toolkit.sceneviewcalloutapp"
     }
 }
 
 dependencies {
+    // Module-specific dependencies go here
     implementation(project(":geoview-compose"))
-    implementation(project(":microapps-lib"))
-    implementation(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
 }
diff --git a/microapps/SceneViewCalloutApp/app/proguard-rules.pro b/microapps/SceneViewCalloutApp/app/proguard-rules.pro
deleted file mode 100644
index f1b424510..000000000
--- a/microapps/SceneViewCalloutApp/app/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/microapps/SceneViewCalloutApp/app/src/main/AndroidManifest.xml b/microapps/SceneViewCalloutApp/app/src/main/AndroidManifest.xml
deleted file mode 100644
index f042e3a13..000000000
--- a/microapps/SceneViewCalloutApp/app/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~
-  ~  Copyright 2024 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.
-  ~
-  -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-
-    <application
-        android:allowBackup="true"
-        android:dataExtractionRules="@xml/data_extraction_rules"
-        android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/Theme.SceneViewCalloutApp"
-        tools:targetApi="31">
-        <activity
-            android:name=".MainActivity"
-            android:exported="true"
-            android:theme="@style/Theme.SceneViewCalloutApp">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
diff --git a/microapps/SceneViewCalloutApp/app/src/main/java/com/arcgismaps/toolkit/sceneviewcalloutapp/MainActivity.kt b/microapps/SceneViewCalloutApp/app/src/main/java/com/arcgismaps/toolkit/sceneviewcalloutapp/MainActivity.kt
deleted file mode 100644
index 09a153f9f..000000000
--- a/microapps/SceneViewCalloutApp/app/src/main/java/com/arcgismaps/toolkit/sceneviewcalloutapp/MainActivity.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *
- *  Copyright 2024 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.
- *
- */
-
-package com.arcgismaps.toolkit.sceneviewcalloutapp
-
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.activity.viewModels
-import androidx.compose.runtime.Composable
-import com.arcgismaps.ApiKey
-import com.arcgismaps.ArcGISEnvironment
-import com.arcgismaps.toolkit.sceneviewcalloutapp.screens.MainScreen
-import com.arcgismaps.toolkit.sceneviewcalloutapp.screens.SceneViewModel
-import com.esri.microappslib.theme.MicroAppTheme
-
-class MainActivity : ComponentActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        ArcGISEnvironment.apiKey = ApiKey.create(BuildConfig.API_KEY)
-        setContent {
-            MicroAppTheme {
-                SceneViewCalloutApp()
-            }
-        }
-    }
-}
-
-@Composable
-fun SceneViewCalloutApp() {
-    MainScreen()
-}
diff --git a/microapps/SceneViewCalloutApp/app/src/main/java/com/arcgismaps/toolkit/sceneviewcalloutapp/screens/MainScreen.kt b/microapps/SceneViewCalloutApp/app/src/main/java/com/arcgismaps/toolkit/sceneviewcalloutapp/screens/MainScreen.kt
deleted file mode 100644
index ad898c12b..000000000
--- a/microapps/SceneViewCalloutApp/app/src/main/java/com/arcgismaps/toolkit/sceneviewcalloutapp/screens/MainScreen.kt
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- *
- *  Copyright 2024 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.
- *
- */
-
-package com.arcgismaps.toolkit.sceneviewcalloutapp.screens
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.wrapContentSize
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material3.BottomSheetScaffold
-import androidx.compose.material3.Button
-import androidx.compose.material3.Checkbox
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.LocalTextStyle
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.SheetValue
-import androidx.compose.material3.Text
-import androidx.compose.material3.rememberBottomSheetScaffoldState
-import androidx.compose.material3.rememberStandardBottomSheetState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.text.input.KeyboardType
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.lifecycle.viewmodel.compose.viewModel
-import com.arcgismaps.toolkit.geoviewcompose.SceneView
-import kotlin.math.roundToInt
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun MainScreen(viewModel: SceneViewModel = viewModel()) {
-    val tapLocation = viewModel.tapLocation.collectAsState().value
-    val offset = viewModel.offset.collectAsState().value
-
-    val bottomSheetScaffoldState = rememberBottomSheetScaffoldState(
-        bottomSheetState = rememberStandardBottomSheetState(
-            initialValue = SheetValue.Expanded,
-            skipHiddenState = true
-        )
-    )
-
-    var calloutVisibility by rememberSaveable { mutableStateOf(true) }
-    var rotateOffsetWithGeoView by rememberSaveable { mutableStateOf(false) }
-
-    BottomSheetScaffold(
-        sheetContent = {
-            CalloutOptions(
-                calloutVisibility = calloutVisibility,
-                isCalloutRotationEnabled = rotateOffsetWithGeoView,
-                offset = offset,
-                onVisibilityToggled = { calloutVisibility = !calloutVisibility },
-                onCalloutOffsetRotationToggled = { rotateOffsetWithGeoView = !rotateOffsetWithGeoView },
-                onXAxisOffsetChanged = {
-                    viewModel.setOffset(Offset(it,offset.y))
-                },
-                onYAxisOffsetChanged = {
-                    viewModel.setOffset(Offset(offset.x,it))
-                },
-                onDismissCallout = viewModel::clearTapLocation
-            )
-        },
-        scaffoldState = bottomSheetScaffoldState,
-    ) {
-        SceneView(
-            modifier = Modifier
-                .fillMaxSize(),
-            arcGISScene = viewModel.arcGISScene,
-            graphicsOverlays = remember { listOf(viewModel.tapLocationGraphicsOverlay) },
-            sceneViewProxy = viewModel.sceneViewProxy,
-            onSingleTapConfirmed = viewModel::setTapLocation,
-            content = if (tapLocation != null && calloutVisibility) {
-                {
-                    Callout(
-                        modifier = Modifier.wrapContentSize(),
-                        location = tapLocation,
-                        rotateOffsetWithGeoView = rotateOffsetWithGeoView,
-                        offset = offset
-                    ) {
-                        Text("Tapped location:\n${tapLocation.x.roundToInt()},${tapLocation.y.roundToInt()}")
-                    }
-                }
-            } else {
-                null
-            }
-        )
-    }
-}
-
-@Composable
-fun CalloutOptions(
-    calloutVisibility: Boolean,
-    isCalloutRotationEnabled: Boolean,
-    offset: Offset,
-    onVisibilityToggled: () -> Unit,
-    onCalloutOffsetRotationToggled: () -> Unit,
-    onXAxisOffsetChanged: (Float) -> Unit,
-    onYAxisOffsetChanged: (Float) -> Unit,
-    onDismissCallout: () -> Unit
-) {
-    Column(Modifier.padding(8.dp), horizontalAlignment = Alignment.CenterHorizontally) {
-        Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
-            Text(text = "Show Callout")
-            Checkbox(
-                checked = calloutVisibility,
-                onCheckedChange = { onVisibilityToggled() }
-            )
-        }
-        Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
-            Text(text = "Rotate offset")
-            Checkbox(
-                checked = isCalloutRotationEnabled,
-                onCheckedChange = { onCalloutOffsetRotationToggled() }
-            )
-        }
-        Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceAround) {
-            OutlinedTextField(
-                modifier = Modifier.weight(1f),
-                value = offset.x.toString(),
-                onValueChange = { value ->
-                    onXAxisOffsetChanged(value.toFloat())
-                },
-                keyboardOptions = KeyboardOptions(
-                    keyboardType = KeyboardType.Decimal,
-                    imeAction = ImeAction.Done
-                ),
-                label = { Text("X-Axis offset") },
-                textStyle = LocalTextStyle.current.copy(textAlign = TextAlign.End)
-            )
-            Spacer(modifier = Modifier.size(10.dp))
-            OutlinedTextField(
-                modifier = Modifier.weight(1f),
-                value = offset.y.toString(),
-                onValueChange = { value ->
-                    onYAxisOffsetChanged(value.toFloat())
-                },
-                keyboardOptions = KeyboardOptions(
-                    keyboardType = KeyboardType.Decimal,
-                    imeAction = ImeAction.Done
-                ),
-                label = { Text("Y-Axis offset") },
-                textStyle = LocalTextStyle.current.copy(textAlign = TextAlign.End)
-            )
-        }
-        Button(onClick = onDismissCallout) {
-            Text(text = "Clear Tap Location")
-        }
-    }
-}
diff --git a/microapps/SceneViewCalloutApp/app/src/main/java/com/arcgismaps/toolkit/sceneviewcalloutapp/screens/SceneViewModel.kt b/microapps/SceneViewCalloutApp/app/src/main/java/com/arcgismaps/toolkit/sceneviewcalloutapp/screens/SceneViewModel.kt
deleted file mode 100644
index ff1146f44..000000000
--- a/microapps/SceneViewCalloutApp/app/src/main/java/com/arcgismaps/toolkit/sceneviewcalloutapp/screens/SceneViewModel.kt
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *
- *  Copyright 2024 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.
- *
- */
-
-package com.arcgismaps.toolkit.sceneviewcalloutapp.screens
-
-import androidx.compose.ui.geometry.Offset
-import androidx.lifecycle.ViewModel
-import com.arcgismaps.Color
-import com.arcgismaps.geometry.Point
-import com.arcgismaps.mapping.ArcGISScene
-import com.arcgismaps.mapping.BasemapStyle
-import com.arcgismaps.mapping.Viewpoint
-import com.arcgismaps.mapping.symbology.SimpleMarkerSymbol
-import com.arcgismaps.mapping.symbology.SimpleMarkerSymbolStyle
-import com.arcgismaps.mapping.view.Graphic
-import com.arcgismaps.mapping.view.GraphicsOverlay
-import com.arcgismaps.mapping.view.SingleTapConfirmedEvent
-import com.arcgismaps.toolkit.geoviewcompose.SceneViewProxy
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-
-class SceneViewModel : ViewModel() {
-
-    val sceneViewProxy = SceneViewProxy()
-
-    val arcGISScene = ArcGISScene(BasemapStyle.ArcGISImagery).apply {
-        initialViewpoint = Viewpoint(
-            latitude = 39.8,
-            longitude = -98.6,
-            scale = 10e7
-        )
-    }
-
-    private val _tapLocation = MutableStateFlow<Point?>(null)
-    val tapLocation: StateFlow<Point?> = _tapLocation.asStateFlow()
-
-    private val _offset = MutableStateFlow(Offset.Zero)
-    val offset: StateFlow<Offset> = _offset.asStateFlow()
-
-    val tapLocationGraphicsOverlay: GraphicsOverlay = GraphicsOverlay()
-
-    fun clearTapLocation() {
-        _tapLocation.value = null
-        tapLocationGraphicsOverlay.graphics.clear()
-    }
-
-    fun setOffset(offset: Offset) {
-        _offset.value = offset
-    }
-
-    fun setTapLocation(singleTapConfirmedEvent: SingleTapConfirmedEvent) {
-        _tapLocation.value =
-            sceneViewProxy.screenToBaseSurface(singleTapConfirmedEvent.screenCoordinate)
-
-        tapLocationGraphicsOverlay.graphics.clear()
-        tapLocationGraphicsOverlay.graphics.add(
-            Graphic(
-                geometry = _tapLocation.value,
-                symbol = SimpleMarkerSymbol(SimpleMarkerSymbolStyle.Cross, Color.red, 12.0f)
-            )
-        )
-    }
-}
diff --git a/microapps/SceneViewCalloutApp/app/src/main/res/drawable/ic_launcher_background.xml b/microapps/SceneViewCalloutApp/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index b51b347d8..000000000
--- a/microapps/SceneViewCalloutApp/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~
-  ~  Copyright 2024 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.
-  ~
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index 6b4a339aa..000000000
--- a/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~
-  ~  Copyright 2024 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.
-  ~
-  -->
-
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
diff --git a/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index 6b4a339aa..000000000
--- a/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~
-  ~  Copyright 2024 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.
-  ~
-  -->
-
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
diff --git a/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78ec..000000000
Binary files a/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ
diff --git a/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d1b..000000000
Binary files a/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d64e..000000000
Binary files a/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ
diff --git a/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611da0..000000000
Binary files a/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a3070f..000000000
Binary files a/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ
diff --git a/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a6956b..000000000
Binary files a/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 28d4b77f9..000000000
Binary files a/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9287f5083..000000000
Binary files a/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
deleted file mode 100644
index aa7d6427e..000000000
Binary files a/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9126ae37c..000000000
Binary files a/microapps/SceneViewCalloutApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/microapps/SceneViewCalloutApp/app/src/main/res/values/colors.xml b/microapps/SceneViewCalloutApp/app/src/main/res/values/colors.xml
deleted file mode 100644
index 6c58071d0..000000000
--- a/microapps/SceneViewCalloutApp/app/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~
-  ~  Copyright 2024 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.
-  ~
-  -->
-
-<resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
-</resources>
diff --git a/microapps/SceneViewCalloutApp/app/src/main/res/values/strings.xml b/microapps/SceneViewCalloutApp/app/src/main/res/values/strings.xml
deleted file mode 100644
index 44ec09bc1..000000000
--- a/microapps/SceneViewCalloutApp/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-  ~
-  ~  Copyright 2024 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.
-  ~
-  -->
-
-<resources>
-    <string name="app_name">SceneViewCalloutApp</string>
-</resources>
diff --git a/microapps/SceneViewCalloutApp/app/src/main/res/values/themes.xml b/microapps/SceneViewCalloutApp/app/src/main/res/values/themes.xml
deleted file mode 100644
index fd2a0b6a4..000000000
--- a/microapps/SceneViewCalloutApp/app/src/main/res/values/themes.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~
-  ~  Copyright 2024 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.
-  ~
-  -->
-
-<resources>
-
-    <style name="Theme.SceneViewCalloutApp" parent="android:Theme.Material.Light.NoActionBar" />
-</resources>
diff --git a/microapps/SceneViewCalloutApp/app/src/main/res/xml/backup_rules.xml b/microapps/SceneViewCalloutApp/app/src/main/res/xml/backup_rules.xml
deleted file mode 100644
index 8f9c01f08..000000000
--- a/microapps/SceneViewCalloutApp/app/src/main/res/xml/backup_rules.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~
-  ~  Copyright 2024 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.
-  ~
-  -->
-
-<!--
-   Sample backup rules file; uncomment and customize as necessary.
-   See https://developer.android.com/guide/topics/data/autobackup
-   for details.
-   Note: This file is ignored for devices older that API 31
-   See https://developer.android.com/about/versions/12/backup-restore
--->
-<full-backup-content>
-    <!--
-   <include domain="sharedpref" path="."/>
-   <exclude domain="sharedpref" path="device.xml"/>
--->
-</full-backup-content>
diff --git a/microapps/SceneViewCalloutApp/app/src/main/res/xml/data_extraction_rules.xml b/microapps/SceneViewCalloutApp/app/src/main/res/xml/data_extraction_rules.xml
deleted file mode 100644
index 06ddaf7b6..000000000
--- a/microapps/SceneViewCalloutApp/app/src/main/res/xml/data_extraction_rules.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~
-  ~  Copyright 2024 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.
-  ~
-  -->
-
-<!--
-   Sample data extraction rules file; uncomment and customize as necessary.
-   See https://developer.android.com/about/versions/12/backup-restore#xml-changes
-   for details.
--->
-<data-extraction-rules>
-    <cloud-backup>
-        <!-- TODO: Use <include> and <exclude> to control what is backed up.
-        <include .../>
-        <exclude .../>
-        -->
-    </cloud-backup>
-    <!--
-    <device-transfer>
-        <include .../>
-        <exclude .../>
-    </device-transfer>
-    -->
-</data-extraction-rules>
diff --git a/microapps/SceneViewCameraControllerApp/app/build.gradle.kts b/microapps/SceneViewCameraControllerApp/app/build.gradle.kts
index 9847ab80c..47dc4e22c 100644
--- a/microapps/SceneViewCameraControllerApp/app/build.gradle.kts
+++ b/microapps/SceneViewCameraControllerApp/app/build.gradle.kts
@@ -17,77 +17,18 @@
  */
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-}
-
-secrets {
-    // this file doesn't contain secrets, it just provides defaults which can be committed into git.
-    defaultPropertiesFileName = "secrets.defaults.properties"
+    alias(libs.plugins.arcgismaps.kotlin.microapp)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.sceneviewcameracontrollerapp"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
+    
     defaultConfig {
-        applicationId ="com.arcgismaps.toolkit.sceneviewcameracontrollerapp"
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner ="androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            //proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),("proguard-rules.pro"
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    @Suppress("UnstableApiUsage")
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
+        applicationId = "com.arcgismaps.toolkit.sceneviewcameracontrollerapp"
     }
 }
 
 dependencies {
+    // Module-specific dependencies go here
     implementation(project(":geoview-compose"))
-    implementation(project(":microapps-lib"))
-    implementation(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
 }
diff --git a/microapps/SceneViewCalloutApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/microapps/SceneViewCameraControllerApp/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from microapps/SceneViewCalloutApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to microapps/SceneViewCameraControllerApp/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/microapps/SceneViewLightingOptionsApp/app/build.gradle.kts b/microapps/SceneViewLightingOptionsApp/app/build.gradle.kts
index 2fd368ca8..83dafadae 100644
--- a/microapps/SceneViewLightingOptionsApp/app/build.gradle.kts
+++ b/microapps/SceneViewLightingOptionsApp/app/build.gradle.kts
@@ -17,77 +17,18 @@
  */
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-}
-
-secrets {
-    // this file doesn't contain secrets, it just provides defaults which can be committed into git.
-    defaultPropertiesFileName = "secrets.defaults.properties"
+    alias(libs.plugins.arcgismaps.kotlin.microapp)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.sceneviewlightingoptionsapp"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
+    
     defaultConfig {
-        applicationId ="com.arcgismaps.toolkit.sceneviewlightingoptionsapp"
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner ="androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            //proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),("proguard-rules.pro"
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    @Suppress("UnstableApiUsage")
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
+        applicationId = "com.arcgismaps.toolkit.sceneviewlightingoptionsapp"
     }
 }
 
 dependencies {
+    // Module-specific dependencies go here
     implementation(project(":geoview-compose"))
-    implementation(project(":microapps-lib"))
-    implementation(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
 }
diff --git a/microapps/SceneViewLightingOptionsApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/microapps/SceneViewLightingOptionsApp/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from microapps/SceneViewLightingOptionsApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to microapps/SceneViewLightingOptionsApp/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/microapps/SceneViewSetViewpointApp/app/build.gradle.kts b/microapps/SceneViewSetViewpointApp/app/build.gradle.kts
index 2fcdd3a0c..a7641a566 100644
--- a/microapps/SceneViewSetViewpointApp/app/build.gradle.kts
+++ b/microapps/SceneViewSetViewpointApp/app/build.gradle.kts
@@ -17,78 +17,18 @@
  */
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-}
-
-secrets {
-    // this file doesn't contain secrets, it just provides defaults which can be committed into git.
-    defaultPropertiesFileName = "secrets.defaults.properties"
+    alias(libs.plugins.arcgismaps.kotlin.microapp)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.sceneviewsetviewpointapp"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
+    
     defaultConfig {
-        applicationId ="com.arcgismaps.toolkit.sceneviewsetviewpointapp"
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner ="androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            //proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),("proguard-rules.pro"
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    @Suppress("UnstableApiUsage")
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
+        applicationId = "com.arcgismaps.toolkit.sceneviewsetviewpointapp"
     }
 }
 
 dependencies {
+    // Module-specific dependencies go here
     implementation(project(":geoview-compose"))
-    implementation(project(":microapps-lib"))
-    implementation(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    testImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
 }
diff --git a/microapps/SceneViewSetViewpointApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/microapps/SceneViewSetViewpointApp/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from microapps/SceneViewSetViewpointApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to microapps/SceneViewSetViewpointApp/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/microapps/TemplateApp/app/build.gradle.kts b/microapps/TemplateApp/app/build.gradle.kts
index 169034b9e..1fb685b05 100644
--- a/microapps/TemplateApp/app/build.gradle.kts
+++ b/microapps/TemplateApp/app/build.gradle.kts
@@ -17,77 +17,18 @@
  */
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-}
-
-secrets {
-    // this file doesn't contain secrets, it just provides defaults which can be committed into git.
-    defaultPropertiesFileName = "secrets.defaults.properties"
+    alias(libs.plugins.arcgismaps.kotlin.microapp)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.templateapp"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
+    
     defaultConfig {
-        applicationId ="com.arcgismaps.toolkit.templateapp"
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner ="androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            //proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),("proguard-rules.pro"
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
+        applicationId = "com.arcgismaps.toolkit.templateapp"
     }
 }
 
 dependencies {
+    // Module-specific dependencies go here
     implementation(project(":geoview-compose"))
-    implementation(project(":microapps-lib"))
-    implementation(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
 }
diff --git a/microapps/TemplateApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/microapps/TemplateApp/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from microapps/TemplateApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to microapps/TemplateApp/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/microapps/UtilityNetworkTraceApp/app/build.gradle.kts b/microapps/UtilityNetworkTraceApp/app/build.gradle.kts
index 3997c8323..a5c3329aa 100644
--- a/microapps/UtilityNetworkTraceApp/app/build.gradle.kts
+++ b/microapps/UtilityNetworkTraceApp/app/build.gradle.kts
@@ -17,75 +17,19 @@
  */
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-}
-
-secrets {
-    // this file doesn't contain secrets, it just provides defaults which can be committed into git.
-    defaultPropertiesFileName = "secrets.defaults.properties"
+    alias(libs.plugins.arcgismaps.kotlin.microapp)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.utilitynetworktraceapp"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
+    
     defaultConfig {
-        applicationId ="com.arcgismaps.toolkit.utilitynetworktraceapp"
-        minSdk = libs.versions.minSdk.get().toInt()
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner ="androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            //proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),("proguard-rules.pro"
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
+        applicationId = "com.arcgismaps.toolkit.utilitynetworktraceapp"
     }
 }
 
 dependencies {
-    implementation(project(":geoview-compose"))
-    implementation(project(":microapps-lib"))
+    // Module-specific dependencies go here
     implementation(project(":utilitynetworks"))
-    implementation(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    debugImplementation(libs.bundles.debug)
+    implementation(project(":geoview-compose"))
 }
diff --git a/microapps/UtilityNetworkTraceApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/microapps/UtilityNetworkTraceApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
deleted file mode 100644
index 92971e871..000000000
--- a/microapps/UtilityNetworkTraceApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
-  ~
-  ~  Copyright 2024 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.
-  ~
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>
diff --git a/microapps/SceneViewCameraControllerApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/microapps/UtilityNetworkTraceApp/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from microapps/SceneViewCameraControllerApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to microapps/UtilityNetworkTraceApp/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/secrets.defaults.properties b/secrets.defaults.properties
index 96a0e1ac7..3d47f693b 100644
--- a/secrets.defaults.properties
+++ b/secrets.defaults.properties
@@ -21,7 +21,6 @@
 # This file is tracked by git; `local.properties` is not.
 # To obtain a new API key access token, visit: https://links.esri.com/create-an-api-key.
 API_KEY=XX
-clientId=" "
 webMapUser=XX
 webMapPassword=XX
 traceToolUser=x
diff --git a/settings.gradle.kts b/settings.gradle.kts
index ed94651e2..3e6aea3c3 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -18,7 +18,6 @@
 
 pluginManagement {
     includeBuild("build-logic")
-    includeBuild("gradle-plugins")
     repositories {
         gradlePluginPortal()
         google()
@@ -26,9 +25,7 @@ pluginManagement {
     }
 }
 
-// For finalBuilds ignore the build number and pick up the released version of the SDK dependency
-val finalBuild: Boolean = (providers.gradleProperty("finalBuild").orNull ?: "false")
-    .run { this == "true" }
+rootProject.name = "arcgis-maps-sdk-kotlin-toolkit"
 
 val localProperties = java.util.Properties().apply {
     val localPropertiesFile = file("local.properties")
@@ -37,24 +34,6 @@ val localProperties = java.util.Properties().apply {
     }
 }
 
-// The version of the ArcGIS Maps SDK for Kotlin dependency.
-// First look for the version number provided via command line (for CI builds), if not found,
-// take the one defined in gradle.properties.
-// CI builds pass -PversionNumber=${BUILDVER}
-val sdkVersionNumber: String =
-    providers.gradleProperty("versionNumber").orNull
-        ?: providers.gradleProperty("sdkVersionNumber").orNull
-        ?: throw IllegalStateException("sdkVersionNumber must be set either via command line or in gradle.properties")
-
-// The build number of the ArcGIS Maps SDK for Kotlin dependency.
-// First look for the version number provided via command line (for CI builds), if not found,
-// take the one defined in local.properties.
-// CI builds pass -PbuildNumber=${BUILDNUM}
-val sdkBuildNumber: String =
-    providers.gradleProperty("buildNumber").orNull
-        ?: localProperties.getProperty("sdkBuildNumber")
-        ?: ""
-
 // The Artifactory credentials for the ArcGIS Maps SDK for Kotlin repository.
 // First look for the credentials provided via command line (for CI builds), if not found,
 // take the one defined in local.properties.
@@ -96,52 +75,89 @@ dependencyResolutionManagement {
             }
         }
     }
-
-    versionCatalogs {
-        create("arcgis") {
-            val versionAndBuild = if (finalBuild) {
-                logger.warn(
-                    "Requested release candidate for the SDK dependency $sdkVersionNumber"
-                )
-                sdkVersionNumber
-            } else {
-                if (sdkBuildNumber.isBlank()) {
-                    logger.warn("Maps SDK dependency: $sdkVersionNumber")
-                    sdkVersionNumber
-                } else {
-                    logger.warn("Maps SDK dependency: $sdkVersionNumber-$sdkBuildNumber")
-                    "$sdkVersionNumber-$sdkBuildNumber"
-                }
-            }
-
-            version("mapsSdk", versionAndBuild)
-            library("mapsSdk", "com.esri", "arcgis-maps-kotlin").versionRef("mapsSdk")
-        }
-    }
 }
 
 // This enables the "Type Safe Project Accessors" feature
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
-// Dynamically include all toolkit components
-File("toolkit").listFiles()?.filter { it.isDirectory }?.forEach { toolkitModule ->
-    include(":${toolkitModule.name}")
-    project(":${toolkitModule.name}").projectDir = file("toolkit/${toolkitModule.name}")
-}
-
-// Dynamically include all microapp components
-File("microapps").listFiles()?.filter { it.isDirectory && !it.name.contains("MicroappsLib") }?.forEach { microappFolder ->
-    val appDir = File(microappFolder, "app")
-    if (appDir.exists() && appDir.isDirectory) {
-        val microappName = microappFolder.name.toLowerCase().replace("app", "-app")
-        include(":$microappName")
-        project(":$microappName").projectDir = appDir
-    }
-}
-
-// Add any other specific includes here
 include(":bom")
 project(":bom").projectDir = File(rootDir, "bom")
 include(":kdoc")
 include(":microapps-lib")
 project(":microapps-lib").projectDir = File(rootDir, "microapps/MicroappsLib")
+include(":authentication-app")
+project(":authentication-app").projectDir = File(rootDir, "microapps/AuthenticationApp/app")
+include(":authentication")
+project(":authentication").projectDir = File(rootDir, "toolkit/authentication")
+include(":compass-app")
+project(":compass-app").projectDir = File(rootDir, "microapps/CompassApp/app")
+include(":compass")
+project(":compass").projectDir = File(rootDir, "toolkit/compass")
+include(":featureforms-app")
+project(":featureforms-app").projectDir = File(rootDir, "microapps/FeatureFormsApp/app")
+include(":featureforms")
+project(":featureforms").projectDir = File(rootDir, "toolkit/featureforms")
+include(":template-app")
+project(":template-app").projectDir = File(rootDir, "microapps/TemplateApp/app")
+include(":template")
+project(":template").projectDir = File(rootDir, "toolkit/template")
+include(":indoors")
+project(":indoors").projectDir = File(rootDir, "toolkit/indoors")
+include(":floor-filter-app")
+project(":floor-filter-app").projectDir = File(rootDir, "microapps/FloorFilterApp/app")
+include(":geoview-compose")
+project(":geoview-compose").projectDir = File(rootDir, "toolkit/geoview-compose")
+include(":callout-app")
+project(":callout-app").projectDir = File(rootDir, "microapps/CalloutApp/app")
+include(":map-view-location-display-app")
+project(":map-view-location-display-app").projectDir = File(rootDir, "microapps/mapviewlocationdisplayapp/app")
+include(":map-view-insets-app")
+project(":map-view-insets-app").projectDir = File(rootDir, "microapps/mapviewinsetsapp/app")
+include(":map-view-geometry-editor-app")
+project(":map-view-geometry-editor-app").projectDir = File(rootDir, "microapps/mapviewgeometryeditorapp/app")
+include(":map-view-set-viewpoint-app")
+project(":map-view-set-viewpoint-app").projectDir = File(rootDir, "microapps/mapviewsetviewpointapp/app")
+include(":map-view-identify-app")
+project(":map-view-identify-app").projectDir = File(rootDir, "microapps/mapviewidentifyapp/app")
+include(":scene-view-analysis-overlay-app")
+project(":scene-view-analysis-overlay-app").projectDir = File(rootDir, "microapps/sceneviewanalysisoverlayapp/app")
+include(":scene-view-set-viewpoint-app")
+project(":scene-view-set-viewpoint-app").projectDir = File(rootDir, "microapps/sceneviewsetviewpointapp/app")
+include(":scene-view-camera-controller-app")
+project(":scene-view-camera-controller-app").projectDir = File(rootDir, "microapps/sceneviewcameracontrollerapp/app")
+include(":scene-view-lighting-options-app")
+project(":scene-view-lighting-options-app").projectDir = File(rootDir, "microapps/sceneviewlightingoptionsapp/app")
+include(":popup")
+project(":popup").projectDir = File(rootDir, "toolkit/popup")
+include(":popup-app")
+project(":popup-app").projectDir = File(rootDir, "microapps/PopupApp/app")
+include(":utility-network-trace-app")
+project(":utility-network-trace-app").projectDir = File(rootDir, "microapps/UtilityNetworkTraceApp/app")
+include(":utilitynetworks")
+project(":utilitynetworks").projectDir = File(rootDir, "toolkit/utilitynetworks")
+include(":ar")
+project(":ar").projectDir = File(rootDir, "toolkit/ar")
+include(":ar-tabletop-app")
+project(":ar-tabletop-app").projectDir = File(rootDir, "microapps/ArTabletopApp/app")
+include(":ar-worldscale-app")
+project(":ar-worldscale-app").projectDir = File(rootDir, "microapps/ArWorldScaleApp/app")
+include(":scalebar-app")
+project(":scalebar-app").projectDir = File(rootDir, "microapps/ScalebarApp/app")
+include(":scalebar")
+project(":scalebar").projectDir = File(rootDir, "toolkit/scalebar")
+include(":legend")
+project(":legend").projectDir = File(rootDir, "toolkit/legend")
+include(":legend-app")
+project(":legend-app").projectDir = File(rootDir, "microapps/LegendApp/app")
+include(":basemapgallery-app")
+project(":basemapgallery-app").projectDir = File(rootDir, "microapps/BasemapGalleryApp/app")
+include(":basemapgallery")
+project(":basemapgallery").projectDir = File(rootDir, "toolkit/basemapgallery")
+include(":overviewmap-app")
+project(":overviewmap-app").projectDir = File(rootDir, "microapps/OverviewMapApp/app")
+include(":offline")
+project(":offline").projectDir = File(rootDir, "toolkit/offline")
+include(":offlinemapareas-app")
+project(":offlinemapareas-app").projectDir = File(rootDir, "microapps/OfflineMapAreasApp/app")
+include(":ar-flyover-app")
+project(":ar-flyover-app").projectDir = File(rootDir, "microapps/ArFlyoverApp/app")
diff --git a/toolkit/ar/api/ar.api b/toolkit/ar/api/ar.api
index 1c58ef852..a1653b597 100644
--- a/toolkit/ar/api/ar.api
+++ b/toolkit/ar/api/ar.api
@@ -40,8 +40,10 @@ public final class com/arcgismaps/toolkit/ar/FlyoverSceneViewProxyKt {
 
 public final class com/arcgismaps/toolkit/ar/FlyoverSceneViewScope {
 	public static final field $stable I
-	public final fun Callout (Lcom/arcgismaps/mapping/GeoElement;Landroidx/compose/ui/Modifier;Lcom/arcgismaps/geometry/Point;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutColors;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutShapes;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
-	public final fun Callout-jHo2IpA (Lcom/arcgismaps/geometry/Point;Landroidx/compose/ui/Modifier;JZLcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutColors;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutShapes;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+	public final fun Callout (Lcom/arcgismaps/mapping/GeoElement;Landroidx/compose/ui/Modifier;Lcom/arcgismaps/geometry/Point;Lcom/arcgismaps/toolkit/geoviewcompose/LeaderPosition;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutColors;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutShapes;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+	public final synthetic fun Callout (Lcom/arcgismaps/mapping/GeoElement;Landroidx/compose/ui/Modifier;Lcom/arcgismaps/geometry/Point;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutColors;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutShapes;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+	public final fun Callout-NZnvHFc (Lcom/arcgismaps/geometry/Point;Landroidx/compose/ui/Modifier;JLcom/arcgismaps/toolkit/geoviewcompose/LeaderPosition;ZLcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutColors;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutShapes;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+	public final synthetic fun Callout-jHo2IpA (Lcom/arcgismaps/geometry/Point;Landroidx/compose/ui/Modifier;JZLcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutColors;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutShapes;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
 }
 
 public abstract class com/arcgismaps/toolkit/ar/FlyoverSceneViewStatus {
@@ -106,8 +108,10 @@ public final class com/arcgismaps/toolkit/ar/TableTopSceneViewProxy {
 
 public final class com/arcgismaps/toolkit/ar/TableTopSceneViewScope {
 	public static final field $stable I
-	public final fun Callout (Lcom/arcgismaps/mapping/GeoElement;Landroidx/compose/ui/Modifier;Lcom/arcgismaps/geometry/Point;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutColors;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutShapes;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
-	public final fun Callout-jHo2IpA (Lcom/arcgismaps/geometry/Point;Landroidx/compose/ui/Modifier;JZLcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutColors;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutShapes;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+	public final fun Callout (Lcom/arcgismaps/mapping/GeoElement;Landroidx/compose/ui/Modifier;Lcom/arcgismaps/geometry/Point;Lcom/arcgismaps/toolkit/geoviewcompose/LeaderPosition;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutColors;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutShapes;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+	public final synthetic fun Callout (Lcom/arcgismaps/mapping/GeoElement;Landroidx/compose/ui/Modifier;Lcom/arcgismaps/geometry/Point;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutColors;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutShapes;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+	public final fun Callout-NZnvHFc (Lcom/arcgismaps/geometry/Point;Landroidx/compose/ui/Modifier;JLcom/arcgismaps/toolkit/geoviewcompose/LeaderPosition;ZLcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutColors;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutShapes;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+	public final synthetic fun Callout-jHo2IpA (Lcom/arcgismaps/geometry/Point;Landroidx/compose/ui/Modifier;JZLcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutColors;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutShapes;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
 }
 
 public abstract class com/arcgismaps/toolkit/ar/TableTopSceneViewStatus {
@@ -197,7 +201,6 @@ public final class com/arcgismaps/toolkit/ar/WorldScaleCalibrationViewTypography
 }
 
 public final class com/arcgismaps/toolkit/ar/WorldScaleSceneViewKt {
-	public static final synthetic fun WorldScaleSceneView--aEHHIo (Lcom/arcgismaps/mapping/ArcGISScene;Landroidx/compose/ui/Modifier;Lcom/arcgismaps/toolkit/ar/WorldScaleTrackingMode;Ljava/lang/Double;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Ljava/util/List;Lcom/arcgismaps/toolkit/ar/WorldScaleSceneViewProxy;Lcom/arcgismaps/mapping/view/ViewLabelProperties;Lcom/arcgismaps/mapping/view/SelectionProperties;ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Ljava/util/List;Ljava/util/List;Lcom/arcgismaps/mapping/TimeExtent;Lkotlin/jvm/functions/Function1;Ljava/time/Instant;Lcom/arcgismaps/mapping/view/LightingMode;JLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;IIIIII)V
 	public static final fun WorldScaleSceneView-63MYszw (Lcom/arcgismaps/mapping/ArcGISScene;Landroidx/compose/ui/Modifier;Lcom/arcgismaps/toolkit/ar/WorldScaleTrackingMode;Ljava/lang/Double;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Ljava/util/List;Lcom/arcgismaps/toolkit/ar/WorldScaleSceneViewProxy;Lcom/arcgismaps/mapping/view/ViewLabelProperties;Lcom/arcgismaps/mapping/view/SelectionProperties;ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Ljava/util/List;Ljava/util/List;Lcom/arcgismaps/mapping/TimeExtent;Lkotlin/jvm/functions/Function1;Ljava/time/Instant;Lcom/arcgismaps/mapping/view/LightingMode;JLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;IIIIII)V
 }
 
@@ -227,8 +230,10 @@ public final class com/arcgismaps/toolkit/ar/WorldScaleSceneViewProxy {
 public final class com/arcgismaps/toolkit/ar/WorldScaleSceneViewScope {
 	public static final field $stable I
 	public final fun CalibrationView (Lkotlin/jvm/functions/Function0;Landroidx/compose/ui/Modifier;Lcom/arcgismaps/toolkit/ar/WorldScaleCalibrationViewColorScheme;Lcom/arcgismaps/toolkit/ar/WorldScaleCalibrationViewTypography;Landroidx/compose/runtime/Composer;II)V
-	public final fun Callout (Lcom/arcgismaps/mapping/GeoElement;Landroidx/compose/ui/Modifier;Lcom/arcgismaps/geometry/Point;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutColors;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutShapes;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
-	public final fun Callout-jHo2IpA (Lcom/arcgismaps/geometry/Point;Landroidx/compose/ui/Modifier;JZLcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutColors;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutShapes;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+	public final fun Callout (Lcom/arcgismaps/mapping/GeoElement;Landroidx/compose/ui/Modifier;Lcom/arcgismaps/geometry/Point;Lcom/arcgismaps/toolkit/geoviewcompose/LeaderPosition;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutColors;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutShapes;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+	public final synthetic fun Callout (Lcom/arcgismaps/mapping/GeoElement;Landroidx/compose/ui/Modifier;Lcom/arcgismaps/geometry/Point;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutColors;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutShapes;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+	public final fun Callout-NZnvHFc (Lcom/arcgismaps/geometry/Point;Landroidx/compose/ui/Modifier;JLcom/arcgismaps/toolkit/geoviewcompose/LeaderPosition;ZLcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutColors;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutShapes;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+	public final synthetic fun Callout-jHo2IpA (Lcom/arcgismaps/geometry/Point;Landroidx/compose/ui/Modifier;JZLcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutColors;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutShapes;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
 }
 
 public abstract class com/arcgismaps/toolkit/ar/WorldScaleSceneViewStatus {
diff --git a/toolkit/ar/build.gradle.kts b/toolkit/ar/build.gradle.kts
index 611d253fc..c75e5ae43 100644
--- a/toolkit/ar/build.gradle.kts
+++ b/toolkit/ar/build.gradle.kts
@@ -16,75 +16,12 @@
  *
  */
 
-
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("artifact-deploy")
-    alias(libs.plugins.binary.compatibility.validator) apply true
+    alias(libs.plugins.arcgismaps.kotlin.toolkit)
 }
+
 android {
     namespace = "com.arcgismaps.toolkit.ar"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
-    defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt()
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    buildFeatures {
-        compose = true
-    }
-    packaging {
-        resources {
-            excludes += setOf(
-                "META-INF/LICENSE-notice.md",
-                "META-INF/LICENSE.md"
-            )
-        }
-    }
-    // If this were not an android project, we would just write `explicitApi()` in the Kotlin scope.
-    // but as an android project could write `freeCompilerArgs = listOf("-Xexplicit-api=strict")`
-    // in the kotlinOptions above, but that would enforce api rules on the test code, which we don't want.
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-        if ("Test" !in name) {
-            compilerOptions {
-                freeCompilerArgs.add("-Xexplicit-api=strict")
-            }
-        }
-    }
-
-    /**
-     * Configures the test report for connected (instrumented) tests to be copied to a central
-     * folder in the project's root directory.
-     */
-    @Suppress("UnstableApiUsage")
-    testOptions {
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        val connectedTestReportsPath: String by project
-        reportDir = "$connectedTestReportsPath/${project.name}"
-    }
-
-    publishing {
-        singleVariant("release") {
-            // This is the default variant.
-        }
-    }
 }
 
 apiValidation {
@@ -93,7 +30,7 @@ apiValidation {
     // compiler.
 
     // ComposableSingletons$WorldScaleSceneViewScopeKt is generated due to internal compose function CalibrationViewInternal(),
-    // we don't want to check binary compatiblity for this internal function
+    // we don't want to check binary compatibility for this internal function
     val composableSingletons = listOf(
         "com/arcgismaps/toolkit/ar/ComposableSingletons\$WorldScaleSceneViewScopeKt"
     )
@@ -102,17 +39,8 @@ apiValidation {
 }
 
 dependencies {
+    // Module-specific dependencies go here
     implementation(project(":geoview-compose"))
     implementation(libs.arcore)
-    api(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
     implementation(libs.play.services.location)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(libs.androidx.test.rules)
-    androidTestImplementation(libs.truth)
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
 }
diff --git a/toolkit/ar/src/main/java/com/arcgismaps/toolkit/ar/FlyoverSceneViewScope.kt b/toolkit/ar/src/main/java/com/arcgismaps/toolkit/ar/FlyoverSceneViewScope.kt
index 85f673d8b..8c4804ccd 100644
--- a/toolkit/ar/src/main/java/com/arcgismaps/toolkit/ar/FlyoverSceneViewScope.kt
+++ b/toolkit/ar/src/main/java/com/arcgismaps/toolkit/ar/FlyoverSceneViewScope.kt
@@ -25,6 +25,7 @@ import androidx.compose.ui.geometry.Offset
 import com.arcgismaps.geometry.Point
 import com.arcgismaps.mapping.GeoElement
 import com.arcgismaps.realtime.DynamicEntity
+import com.arcgismaps.toolkit.geoviewcompose.LeaderPosition
 import com.arcgismaps.toolkit.geoviewcompose.SceneViewScope
 import com.arcgismaps.toolkit.geoviewcompose.theme.CalloutColors
 import com.arcgismaps.toolkit.geoviewcompose.theme.CalloutDefaults
@@ -59,6 +60,10 @@ public class FlyoverSceneViewScope internal constructor(private val sceneViewSco
      * @param content the content of the Callout
      * @since 200.8.0
      */
+    @Deprecated(
+        message = "Use the Callout function with `leaderPosition` instead. This deprecated function remains to maintain binary compatibility",
+        level = DeprecationLevel.HIDDEN,
+    )
     @Composable
     public fun Callout(
         location: Point,
@@ -68,10 +73,11 @@ public class FlyoverSceneViewScope internal constructor(private val sceneViewSco
         colorScheme: CalloutColors = CalloutDefaults.colors(),
         shapes: CalloutShapes = CalloutDefaults.shapes(),
         content: @Composable BoxScope.() -> Unit
-    ): Unit = sceneViewScope.Callout(
+    ): Unit = Callout(
         location,
         modifier,
         offset,
+        LeaderPosition.LowerMiddle,
         rotateOffsetWithGeoView,
         colorScheme,
         shapes,
@@ -102,6 +108,10 @@ public class FlyoverSceneViewScope internal constructor(private val sceneViewSco
      * @param content the content of the Callout
      * @since 200.8.0
      */
+    @Deprecated(
+        message = "Use the Callout function with `leaderPosition` instead. This deprecated function remains to maintain binary compatibility",
+        level = DeprecationLevel.HIDDEN,
+    )
     @Composable
     public fun Callout(
         geoElement: GeoElement,
@@ -111,5 +121,93 @@ public class FlyoverSceneViewScope internal constructor(private val sceneViewSco
         shapes: CalloutShapes = CalloutDefaults.shapes(),
         content: @Composable BoxScope.() -> Unit
     ): Unit =
-        sceneViewScope.Callout(geoElement, modifier, tapLocation, colorScheme, shapes, content)
+        Callout(geoElement, modifier, tapLocation, LeaderPosition.LowerMiddle, colorScheme, shapes, content)
+
+    /**
+     * Displays a Callout at the specified geographical location on the [FlyoverSceneView]. The Callout
+     * is a composable that can be used to display additional information about a location on the
+     * scene. The additional information is passed as a content composable that contains text and/or
+     * other content. It has a leader that points to the location that the Callout refers to. The body of
+     * the Callout is a rectangular area with curved corners that contains the content lambda provided
+     * by the application. A thin border line is drawn around the entire Callout.
+     *
+     * Note: Only one Callout can be displayed at a time on the FlyoverSceneView.
+     *
+     * @param location the geographical location at which to display the Callout
+     * @param modifier Modifier to be applied to the composable Callout
+     * @param offset the offset in screen coordinates from the geographical location at which to
+     *        place the callout
+     * @param rotateOffsetWithGeoView specifies whether the screen offset is rotated with the
+     *        [FlyoverSceneView]. The Screen offset will be rotated with the [FlyoverSceneView] when
+     *        true, false otherwise. This is useful if you are showing the callout for elements with
+     *        symbology that does rotate with the [FlyoverSceneView]
+     * @param colorScheme the styling options for the Callout's color properties
+     * @param shapes the styling options for the Callout's container shape
+     * @param content the content of the Callout
+     * @since 300.0.0
+     */
+    @Composable
+    public fun Callout(
+        location: Point,
+        modifier: Modifier = Modifier,
+        offset: Offset = Offset.Zero,
+        leaderPosition: LeaderPosition = LeaderPosition.LowerMiddle,
+        rotateOffsetWithGeoView: Boolean = false,
+        colorScheme: CalloutColors = CalloutDefaults.colors(),
+        shapes: CalloutShapes = CalloutDefaults.shapes(),
+        content: @Composable BoxScope.() -> Unit
+    ): Unit = sceneViewScope.Callout(
+        location,
+        modifier,
+        offset,
+        leaderPosition,
+        rotateOffsetWithGeoView,
+        colorScheme,
+        shapes,
+        content
+    )
+
+    /**
+     * Creates a Callout at the specified [geoElement] or the [tapLocation] location on the
+     * [FlyoverSceneView]. The Callout is a composable that can be used to display additional
+     * information about a location on the scene. The additional information is passed as a [content]
+     * composable that contains text and/or other content. It has a leader that points to the location
+     * that the Callout refers to. The body of the Callout is a rectangular area with curved corners that
+     * contains the [content] lambda provided by the application. A thin border line is drawn around
+     * the entire Callout.
+     *
+     * If the given [GeoElement] is a [DynamicEntity] then the Callout automatically updates its location
+     * everytime the DynamicEntity changes. The content of the Callout however will not be automatically
+     * updated.
+     *
+     * Note: Only one Callout can be displayed at a time on the FlyoverSceneView.
+     *
+     * @param geoElement the [GeoElement] for which to display the Callout
+     * @param modifier Modifier to be applied to the composable Callout
+     * @param tapLocation a Point the user has tapped, or null if the Callout is not associated with
+     *        a tap
+     * @param leaderPosition the current position of the leader relative to the body of the Callout
+     * @param colorScheme the styling options for the Callout's shape and color properties
+     * @param shapes the styling options for the Callout's container shape
+     * @param content the content of the Callout
+     * @since 300.0.0
+     */
+    @Composable
+    public fun Callout(
+        geoElement: GeoElement,
+        modifier: Modifier = Modifier,
+        tapLocation: Point? = null,
+        leaderPosition: LeaderPosition = LeaderPosition.LowerMiddle,
+        colorScheme: CalloutColors = CalloutDefaults.colors(),
+        shapes: CalloutShapes = CalloutDefaults.shapes(),
+        content: @Composable BoxScope.() -> Unit
+    ): Unit = sceneViewScope.Callout(
+        geoElement,
+        modifier,
+        tapLocation,
+        leaderPosition,
+        colorScheme,
+        shapes,
+        content
+    )
 }
diff --git a/toolkit/ar/src/main/java/com/arcgismaps/toolkit/ar/TableTopSceneViewScope.kt b/toolkit/ar/src/main/java/com/arcgismaps/toolkit/ar/TableTopSceneViewScope.kt
index 7a970189f..44f8e62b8 100644
--- a/toolkit/ar/src/main/java/com/arcgismaps/toolkit/ar/TableTopSceneViewScope.kt
+++ b/toolkit/ar/src/main/java/com/arcgismaps/toolkit/ar/TableTopSceneViewScope.kt
@@ -24,6 +24,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
 import com.arcgismaps.geometry.Point
 import com.arcgismaps.mapping.GeoElement
+import com.arcgismaps.toolkit.geoviewcompose.LeaderPosition
 import com.arcgismaps.toolkit.geoviewcompose.SceneViewScope
 import com.arcgismaps.toolkit.geoviewcompose.theme.CalloutColors
 import com.arcgismaps.toolkit.geoviewcompose.theme.CalloutDefaults
@@ -55,7 +56,10 @@ public class TableTopSceneViewScope internal constructor(private val sceneViewSc
      * @param shapes the styling options for the Callout's container shape
      * @since 200.6.0
      */
-
+    @Deprecated(
+        message = "Use the Callout function with `leaderPosition` instead. This deprecated function remains to maintain binary compatibility",
+        level = DeprecationLevel.HIDDEN,
+    )
     @Composable
     public fun Callout(
         location: Point,
@@ -65,7 +69,7 @@ public class TableTopSceneViewScope internal constructor(private val sceneViewSc
         colorScheme: CalloutColors = CalloutDefaults.colors(),
         shapes: CalloutShapes = CalloutDefaults.shapes(),
         content: @Composable BoxScope.() -> Unit
-    ): Unit = sceneViewScope.Callout(location, modifier, offset, rotateOffsetWithGeoView, colorScheme, shapes, content)
+    ): Unit = Callout(location, modifier, offset, LeaderPosition.LowerMiddle, rotateOffsetWithGeoView, colorScheme, shapes, content)
 
     /**
      * Creates a Callout at the specified [geoElement] or the [tapLocation] location on the TableTopSceneView. The Callout is a composable
@@ -87,13 +91,83 @@ public class TableTopSceneViewScope internal constructor(private val sceneViewSc
      * @param content the content of the Callout
      * @since 200.6.0
      */
+    @Deprecated(
+        message = "Use the Callout function with `leaderPosition` instead. This deprecated function remains to maintain binary compatibility",
+        level = DeprecationLevel.HIDDEN,
+    )
+    @Composable
+    public fun Callout(
+        geoElement: GeoElement,
+        modifier: Modifier = Modifier,
+        tapLocation: Point? = null,
+        colorScheme: CalloutColors = CalloutDefaults.colors(),
+        shapes: CalloutShapes = CalloutDefaults.shapes(),
+        content: @Composable BoxScope.() -> Unit
+    ): Unit = Callout(geoElement, modifier, tapLocation, LeaderPosition.LowerMiddle, colorScheme, shapes, content)
+
+    /**
+     * Displays a Callout at the specified geographical location on the TableTopSceneView. The Callout is a composable
+     * that can be used to display additional information about a location on the scene. The additional information is
+     * passed as a content composable that contains text and/or other content. It has a leader that points to
+     * the location that Callout refers to. The body of the Callout is a rectangular area with curved corners
+     * that contains the content lambda provided by the application. A thin border line is drawn around the entire Callout.
+     *
+     * Note: Only one Callout can be displayed at a time on the TableTopSceneView.
+     *
+     * @param location the geographical location at which to display the Callout
+     * @param modifier Modifier to be applied to the composable Callout
+     * @param content the content of the Callout
+     * @param offset the offset in screen coordinates from the geographical location at which to place the callout
+     * @param leaderPosition the current position of the leader relative to the body of the Callout
+     * @param rotateOffsetWithGeoView specifies whether the screen offset is rotated with the [TableTopSceneView]. The Screen offset
+     *        will be rotated with the [TableTopSceneView] when true, false otherwise.
+     *        This is useful if you are showing the callout for elements with symbology that does rotate with the [TableTopSceneView]
+     * @param colorScheme the styling options for the Callout's color properties
+     * @param shapes the styling options for the Callout's container shape
+     * @since 300.0.0
+     */
+
+    @Composable
+    public fun Callout(
+        location: Point,
+        modifier: Modifier = Modifier,
+        offset: Offset = Offset.Zero,
+        leaderPosition: LeaderPosition = LeaderPosition.LowerMiddle,
+        rotateOffsetWithGeoView: Boolean = false,
+        colorScheme: CalloutColors = CalloutDefaults.colors(),
+        shapes: CalloutShapes = CalloutDefaults.shapes(),
+        content: @Composable BoxScope.() -> Unit
+    ): Unit = sceneViewScope.Callout(location, modifier, offset, leaderPosition, rotateOffsetWithGeoView, colorScheme, shapes, content)
+
+    /**
+     * Creates a Callout at the specified [geoElement] or the [tapLocation] location on the TableTopSceneView. The Callout is a composable
+     * that can be used to display additional information about a location on the scene. The additional information is
+     * passed as a [content] composable that contains text and/or other content. It has a leader that points to
+     * the location that Callout refers to. The body of the Callout is a rectangular area with curved corners
+     * that contains the [content] lambda provided by the application. A thin border line is drawn around the entire Callout.
+     *
+     * If the given geoelement is a DynamicEntity then the Callout automatically updates its location everytime the
+     * DynamicEntity changes. The content of the Callout however will not be automatically updated.
+     *
+     * Note: Only one Callout can be displayed at a time on the TableTopSceneView.
+     *
+     * @param geoElement the GeoElement for which to display the Callout
+     * @param modifier Modifier to be applied to the composable Callout
+     * @param tapLocation a Point the user has tapped, or null if the Callout is not associated with a tap
+     * @param leaderPosition the current position of the leader relative to the body of the Callout
+     * @param colorScheme the styling options for the Callout's shape and color properties
+     * @param shapes the styling options for the Callout's container shape
+     * @param content the content of the Callout
+     * @since 300.0.0
+     */
     @Composable
     public fun Callout(
         geoElement: GeoElement,
         modifier: Modifier = Modifier,
         tapLocation: Point? = null,
+        leaderPosition: LeaderPosition = LeaderPosition.LowerMiddle,
         colorScheme: CalloutColors = CalloutDefaults.colors(),
         shapes: CalloutShapes = CalloutDefaults.shapes(),
         content: @Composable BoxScope.() -> Unit
-    ): Unit = sceneViewScope.Callout(geoElement, modifier, tapLocation, colorScheme, shapes, content)
+    ): Unit = sceneViewScope.Callout(geoElement, modifier, tapLocation, leaderPosition, colorScheme, shapes, content)
 }
diff --git a/toolkit/ar/src/main/java/com/arcgismaps/toolkit/ar/WorldScaleSceneView.kt b/toolkit/ar/src/main/java/com/arcgismaps/toolkit/ar/WorldScaleSceneView.kt
index afb95e20e..e86b9173c 100644
--- a/toolkit/ar/src/main/java/com/arcgismaps/toolkit/ar/WorldScaleSceneView.kt
+++ b/toolkit/ar/src/main/java/com/arcgismaps/toolkit/ar/WorldScaleSceneView.kt
@@ -491,147 +491,3 @@ internal fun rememberWorldScaleCameraController(
     }
     return rememberUpdatedState(worldScaleCameraController)
 }
-
-/**
- * A scene view that provides a world-scale augmented reality experience.
- *
- * Note: You must follow [Google's user privacy requirements for ARCore](https://developers.google.com/ar/develop/privacy-requirements)
- * when using WorldScaleSceneView in your application.
- *
- * @param arcGISScene the [ArcGISScene] to be rendered by this WorldScaleSceneView.
- * @param modifier Modifier to be applied to the WorldScaleSceneView.
- * @param worldScaleTrackingMode the type of tracking configuration used by the WorldScaleSceneView.
- * Determines how the position and orientation of the device is obtained and synchronized with
- * the scene view's camera.
- * @param clippingDistance the clipping distance in meters around the scene view's camera. A null value
- * means that no data will be clipped.
- * @param onInitializationStatusChanged lambda invoked when the initialization status
- * of this WorldScaleSceneView changes.
- * @param onViewpointChangedForCenterAndScale lambda invoked when the viewpoint changes, passing a
- * viewpoint type of [ViewpointType.CenterAndScale].
- * @param onViewpointChangedForBoundingGeometry lambda invoked when the viewpoint changes, passing a
- * viewpoint type of [ViewpointType.BoundingGeometry].
- * @param graphicsOverlays graphics overlays used by the WorldScaleSceneView.
- * @param worldScaleSceneViewProxy the [WorldScaleSceneViewProxy] to associate with the
- * WorldScaleSceneView.
- * @param viewLabelProperties the [ViewLabelProperties] used by the WorldScaleSceneView.
- * @param selectionProperties the [SelectionProperties] used by the WorldScaleSceneView.
- * @param isAttributionBarVisible true if attribution bar is visible in the WorldScaleSceneView,
- * false otherwise.
- * @param onAttributionTextChanged lambda invoked when the attribution text of the
- * WorldScaleSceneView has changed.
- * @param onAttributionBarLayoutChanged lambda invoked when the attribution bar's position or size
- * changes.
- * @param analysisOverlays analysis overlays that render the results of 3D visual analysis on the
- * WorldScaleSceneView.
- * @param imageOverlays image overlays for displaying images in the WorldScaleSceneView.
- * @param timeExtent the [TimeExtent] used by the WorldScaleSceneView.
- * @param onTimeExtentChanged lambda invoked when the WorldScaleSceneView's [TimeExtent] is changed.
- * @param sunTime the position of the sun in the WorldScaleSceneView based on a specific date and
- * time.
- * @param sunLighting the type of ambient sunlight and shadows in the WorldScaleSceneView.
- * @param ambientLightColor the color of the WorldScaleSceneView's ambient light.
- * @param onNavigationChanged lambda invoked when the navigation status of the WorldScaleSceneView
- * has changed.
- * @param onSpatialReferenceChanged lambda invoked when the spatial reference of the
- * WorldScaleSceneView has changed.
- * @param onLayerViewStateChanged lambda invoked when the WorldScaleSceneView's layer view state is
- * changed.
- * @param onInteractingChanged lambda invoked when the user starts and ends interacting with the
- * WorldScaleSceneView.
- * @param onCurrentViewpointCameraChanged lambda invoked when the viewpoint camera of the
- * WorldScaleSceneView has changed.
- * @param onRotate lambda invoked when a user performs a rotation gesture on the WorldScaleSceneView.
- * @param onScale lambda invoked when a user performs a pinch gesture on the WorldScaleSceneView.
- * @param onUp lambda invoked when the user removes all their pointers from the WorldScaleSceneView.
- * @param onDown lambda invoked when the user first presses on the WorldScaleSceneView.
- * @param onSingleTapConfirmed lambda invoked when the user taps once on the WorldScaleSceneView.
- * @param onDoubleTap lambda invoked the user double taps on the WorldScaleSceneView.
- * @param onLongPress lambda invoked when a user holds a pointer on the WorldScaleSceneView.
- * @param onTwoPointerTap lambda invoked when a user taps two pointers on the WorldScaleSceneView.
- * @param onPan lambda invoked when a user drags a pointer or pointers across WorldScaleSceneView.
- * @param content the content of the WorldScaleSceneView.
- *
- * @since 200.7.0
- */
-@Deprecated(
-    "Deprecation added for backwards compatibility. Use WorldScaleSceneView function with onTrackingErrorChanged instead.",
-    level = DeprecationLevel.HIDDEN
-)
-@Composable
-public fun WorldScaleSceneView(
-    arcGISScene: ArcGISScene,
-    modifier: Modifier = Modifier,
-    worldScaleTrackingMode: WorldScaleTrackingMode = remember { WorldScaleTrackingMode.World() },
-    clippingDistance: Double? = null,
-    onInitializationStatusChanged: ((WorldScaleSceneViewStatus) -> Unit)? = null,
-    onViewpointChangedForCenterAndScale: ((Viewpoint) -> Unit)? = null,
-    onViewpointChangedForBoundingGeometry: ((Viewpoint) -> Unit)? = null,
-    graphicsOverlays: List<GraphicsOverlay> = remember { emptyList() },
-    worldScaleSceneViewProxy: WorldScaleSceneViewProxy = remember { WorldScaleSceneViewProxy() },
-    viewLabelProperties: ViewLabelProperties = remember { ViewLabelProperties() },
-    selectionProperties: SelectionProperties = remember { SelectionProperties() },
-    isAttributionBarVisible: Boolean = true,
-    onAttributionTextChanged: ((String) -> Unit)? = null,
-    onAttributionBarLayoutChanged: ((AttributionBarLayoutChangeEvent) -> Unit)? = null,
-    analysisOverlays: List<AnalysisOverlay> = remember { emptyList() },
-    imageOverlays: List<ImageOverlay> = remember { emptyList() },
-    timeExtent: TimeExtent? = null,
-    onTimeExtentChanged: ((TimeExtent?) -> Unit)? = null,
-    sunTime: Instant = SceneViewDefaults.DefaultSunTime,
-    sunLighting: LightingMode = LightingMode.NoLight,
-    ambientLightColor: Color = SceneViewDefaults.DefaultAmbientLightColor,
-    onNavigationChanged: ((isNavigating: Boolean) -> Unit)? = null,
-    onSpatialReferenceChanged: ((spatialReference: SpatialReference?) -> Unit)? = null,
-    onLayerViewStateChanged: ((GeoView.GeoViewLayerViewStateChanged) -> Unit)? = null,
-    onInteractingChanged: ((isInteracting: Boolean) -> Unit)? = null,
-    onCurrentViewpointCameraChanged: ((camera: Camera) -> Unit)? = null,
-    onRotate: ((RotationChangeEvent) -> Unit)? = null,
-    onScale: ((ScaleChangeEvent) -> Unit)? = null,
-    onUp: ((UpEvent) -> Unit)? = null,
-    onDown: ((DownEvent) -> Unit)? = null,
-    onSingleTapConfirmed: ((SingleTapConfirmedEvent) -> Unit)? = null,
-    onDoubleTap: ((DoubleTapEvent) -> Unit)? = null,
-    onLongPress: ((LongPressEvent) -> Unit)? = null,
-    onTwoPointerTap: ((TwoPointerTapEvent) -> Unit)? = null,
-    onPan: ((PanChangeEvent) -> Unit)? = null,
-    content: (@Composable WorldScaleSceneViewScope.() -> Unit)? = null
-): Unit = WorldScaleSceneView(
-    arcGISScene = arcGISScene,
-    modifier = modifier,
-    worldScaleTrackingMode = worldScaleTrackingMode,
-    clippingDistance = clippingDistance,
-    onInitializationStatusChanged = onInitializationStatusChanged,
-    onTrackingErrorChanged = null,
-    onViewpointChangedForCenterAndScale = onViewpointChangedForCenterAndScale,
-    onViewpointChangedForBoundingGeometry = onViewpointChangedForBoundingGeometry,
-    graphicsOverlays = graphicsOverlays,
-    worldScaleSceneViewProxy = worldScaleSceneViewProxy,
-    viewLabelProperties = viewLabelProperties,
-    selectionProperties = selectionProperties,
-    isAttributionBarVisible = isAttributionBarVisible,
-    onAttributionTextChanged = onAttributionTextChanged,
-    onAttributionBarLayoutChanged = onAttributionBarLayoutChanged,
-    analysisOverlays = analysisOverlays,
-    imageOverlays = imageOverlays,
-    timeExtent = timeExtent,
-    onTimeExtentChanged = onTimeExtentChanged,
-    sunTime = sunTime,
-    sunLighting = sunLighting,
-    ambientLightColor = ambientLightColor,
-    onNavigationChanged = onNavigationChanged,
-    onSpatialReferenceChanged = onSpatialReferenceChanged,
-    onLayerViewStateChanged = onLayerViewStateChanged,
-    onInteractingChanged = onInteractingChanged,
-    onCurrentViewpointCameraChanged = onCurrentViewpointCameraChanged,
-    onRotate = onRotate,
-    onScale = onScale,
-    onUp = onUp,
-    onDown = onDown,
-    onSingleTapConfirmed = onSingleTapConfirmed,
-    onDoubleTap = onDoubleTap,
-    onLongPress = onLongPress,
-    onTwoPointerTap = onTwoPointerTap,
-    onPan = onPan,
-    content = content
-)
diff --git a/toolkit/ar/src/main/java/com/arcgismaps/toolkit/ar/WorldScaleSceneViewScope.kt b/toolkit/ar/src/main/java/com/arcgismaps/toolkit/ar/WorldScaleSceneViewScope.kt
index 5549a6ddb..1b320e444 100644
--- a/toolkit/ar/src/main/java/com/arcgismaps/toolkit/ar/WorldScaleSceneViewScope.kt
+++ b/toolkit/ar/src/main/java/com/arcgismaps/toolkit/ar/WorldScaleSceneViewScope.kt
@@ -60,6 +60,7 @@ import com.arcgismaps.mapping.GeoElement
 import com.arcgismaps.toolkit.ar.internal.CalibrationState
 import com.arcgismaps.toolkit.ar.internal.DefaultThemeTokens
 import com.arcgismaps.toolkit.ar.internal.Joyslider
+import com.arcgismaps.toolkit.geoviewcompose.LeaderPosition
 import com.arcgismaps.toolkit.geoviewcompose.SceneViewScope
 import com.arcgismaps.toolkit.geoviewcompose.theme.CalloutColors
 import com.arcgismaps.toolkit.geoviewcompose.theme.CalloutDefaults
@@ -122,12 +123,91 @@ public class WorldScaleSceneViewScope internal constructor(
      * @param shapes the styling options for the Callout's container shape
      * @since 200.7.0
      */
+    @Deprecated(
+        message = "Use the Callout function with `leaderPosition` instead. This deprecated function remains to maintain binary compatibility",
+        level = DeprecationLevel.HIDDEN,
+    )
+    @Composable
+    public fun Callout(
+        location: Point,
+        modifier: Modifier = Modifier,
+        offset: Offset = Offset.Zero,
+        rotateOffsetWithGeoView: Boolean = false,
+        colorScheme: CalloutColors = CalloutDefaults.colors(),
+        shapes: CalloutShapes = CalloutDefaults.shapes(),
+        content: @Composable BoxScope.() -> Unit
+    ): Unit = Callout(
+        location,
+        modifier,
+        offset,
+        LeaderPosition.LowerMiddle,
+        rotateOffsetWithGeoView,
+        colorScheme,
+        shapes,
+        content
+    )
+
+    /**
+     * Creates a Callout at the specified [geoElement] or the [tapLocation] location on the WorldScaleSceneView. The Callout is a composable
+     * that can be used to display additional information about a location on the scene. The additional information is
+     * passed as a [content] composable that contains text and/or other content. It has a leader that points to
+     * the location that Callout refers to. The body of the Callout is a rectangular area with curved corners
+     * that contains the [content] lambda provided by the application. A thin border line is drawn around the entire Callout.
+     *
+     * If the given geoelement is a DynamicEntity then the Callout automatically updates its location everytime the
+     * DynamicEntity changes. The content of the Callout however will not be automatically updated.
+     *
+     * Note: Only one Callout can be displayed at a time on the WorldScaleSceneView.
+     *
+     * @param geoElement the GeoElement for which to display the Callout
+     * @param modifier Modifier to be applied to the composable Callout
+     * @param tapLocation a Point the user has tapped, or null if the Callout is not associated with a tap
+     * @param colorScheme the styling options for the Callout's shape and color properties
+     * @param shapes the styling options for the Callout's container shape
+     * @param content the content of the Callout
+     * @since 200.7.0
+     */
+    @Deprecated(
+        message = "Use the Callout function with `leaderPosition` instead. This deprecated function remains to maintain binary compatibility",
+        level = DeprecationLevel.HIDDEN,
+    )
+    @Composable
+    public fun Callout(
+        geoElement: GeoElement,
+        modifier: Modifier = Modifier,
+        tapLocation: Point? = null,
+        colorScheme: CalloutColors = CalloutDefaults.colors(),
+        shapes: CalloutShapes = CalloutDefaults.shapes(),
+        content: @Composable BoxScope.() -> Unit
+    ): Unit = Callout(geoElement, modifier, tapLocation, LeaderPosition.LowerMiddle, colorScheme, shapes, content)
 
+    /**
+     * Displays a Callout at the specified geographical location on the WorldScaleSceneView. The Callout is a composable
+     * that can be used to display additional information about a location on the scene. The additional information is
+     * passed as a content composable that contains text and/or other content. It has a leader that points to
+     * the location that Callout refers to. The body of the Callout is a rectangular area with curved corners
+     * that contains the content lambda provided by the application. A thin border line is drawn around the entire Callout.
+     *
+     * Note: Only one Callout can be displayed at a time on the WorldScaleSceneView.
+     *
+     * @param location the geographical location at which to display the Callout
+     * @param modifier Modifier to be applied to the composable Callout
+     * @param content the content of the Callout
+     * @param offset the offset in screen coordinates from the geographical location at which to place the callout
+     * @param leaderPosition the current position of the leader relative to the body of the Callout
+     * @param rotateOffsetWithGeoView specifies whether the screen offset is rotated with the [WorldScaleSceneView]. The Screen offset
+     *        will be rotated with the [WorldScaleSceneView] when true, false otherwise.
+     *        This is useful if you are showing the callout for elements with symbology that does rotate with the [WorldScaleSceneView]
+     * @param colorScheme the styling options for the Callout's color properties
+     * @param shapes the styling options for the Callout's container shape
+     * @since 300.0.0
+     */
     @Composable
     public fun Callout(
         location: Point,
         modifier: Modifier = Modifier,
         offset: Offset = Offset.Zero,
+        leaderPosition: LeaderPosition = LeaderPosition.LowerMiddle,
         rotateOffsetWithGeoView: Boolean = false,
         colorScheme: CalloutColors = CalloutDefaults.colors(),
         shapes: CalloutShapes = CalloutDefaults.shapes(),
@@ -136,6 +216,7 @@ public class WorldScaleSceneViewScope internal constructor(
         location,
         modifier,
         offset,
+        leaderPosition,
         rotateOffsetWithGeoView,
         colorScheme,
         shapes,
@@ -157,21 +238,30 @@ public class WorldScaleSceneViewScope internal constructor(
      * @param geoElement the GeoElement for which to display the Callout
      * @param modifier Modifier to be applied to the composable Callout
      * @param tapLocation a Point the user has tapped, or null if the Callout is not associated with a tap
+     * @param leaderPosition the current position of the leader relative to the body of the Callout
      * @param colorScheme the styling options for the Callout's shape and color properties
      * @param shapes the styling options for the Callout's container shape
      * @param content the content of the Callout
-     * @since 200.7.0
+     * @since 300.0.0
      */
     @Composable
     public fun Callout(
         geoElement: GeoElement,
         modifier: Modifier = Modifier,
         tapLocation: Point? = null,
+        leaderPosition: LeaderPosition = LeaderPosition.LowerMiddle,
         colorScheme: CalloutColors = CalloutDefaults.colors(),
         shapes: CalloutShapes = CalloutDefaults.shapes(),
         content: @Composable BoxScope.() -> Unit
-    ): Unit =
-        sceneViewScope.Callout(geoElement, modifier, tapLocation, colorScheme, shapes, content)
+    ): Unit = sceneViewScope.Callout(
+        geoElement,
+        modifier,
+        tapLocation,
+        leaderPosition,
+        colorScheme,
+        shapes,
+        content
+    )
 }
 
 internal val LocalColorScheme = compositionLocalOf { DefaultThemeTokens.calibrationViewColorScheme }
diff --git a/toolkit/authentication/README.md b/toolkit/authentication/README.md
index 9b32caa9c..e71a12bf9 100644
--- a/toolkit/authentication/README.md
+++ b/toolkit/authentication/README.md
@@ -162,20 +162,9 @@ If you want to launch a Custom Tab from your own app's activity, follow these st
     }
     ```
 
-### Launch OAuth Prompts in Incognito Mode
+### Using Private Browser Sessions (Ephemeral mode) for OAuth Authentication
 
-OAuth user sign-in prompts are launched in a Custom Tab. Therefore, any credentials saved in the browser's cache could be used to authenticate a device. For enterprise sign-ins, this behavior may be problematic. Unfortunately, there is no programmatic way to remedy this. However, the `Authenticator` can be configured to launch OAuth prompts in incognito mode (which will not store credentials in the browser cache) like so:
-
-- The device must have Chrome installed.
-- The device's Chrome browser must have the following flags set to true:
-
-```
-chrome://flags/#cct-incognito
-chrome://flags/#cct-incognito-available-to-third-party
-```
-
-- The Chrome browser must be relaunched for those flags to take effect.
-- The `AuthenticatorState.oAuthUserConfiguration` must have the `preferPrivateWebBrowserSession` property set to true:
+To display OAuth sign-in prompts in a private browser session (ephemeral mode), set the `preferPrivateWebBrowserSession` property to `true` in your `OAuthUserConfiguration`. This ensures that the browser does not use any cached credentials, which is important for enterprise security.
 
 ```kotlin
 authenticatorState.oAuthUserConfiguration = OAuthUserConfiguration(
@@ -185,6 +174,7 @@ authenticatorState.oAuthUserConfiguration = OAuthUserConfiguration(
         preferPrivateWebBrowserSession = true
     )
 ```
+Note: Private web browsing sessions (ephemeral mode) may not work in Chrome versions lower than 136, and support may vary across non-Chromium-based browsers. For best results, ensure your users have updated to a newer version of Chrome, and be aware that not all browsers may support this feature.
 
 ### Signing out
 
diff --git a/toolkit/authentication/api/authentication.api b/toolkit/authentication/api/authentication.api
index 805374d23..1a50a6545 100644
--- a/toolkit/authentication/api/authentication.api
+++ b/toolkit/authentication/api/authentication.api
@@ -6,17 +6,14 @@ public final class com/arcgismaps/toolkit/authentication/AuthenticationActivity
 
 public final class com/arcgismaps/toolkit/authentication/AuthenticatorKt {
 	public static final fun Authenticator (Lcom/arcgismaps/toolkit/authentication/AuthenticatorState;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
-	public static final fun Authenticator (Lcom/arcgismaps/toolkit/authentication/AuthenticatorState;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
 	public static final fun AuthenticatorWithBrowserAuthenticationChallenge (Lcom/arcgismaps/toolkit/authentication/AuthenticatorState;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
 	public static final fun DialogAuthenticator (Lcom/arcgismaps/toolkit/authentication/AuthenticatorState;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
-	public static final fun DialogAuthenticator (Lcom/arcgismaps/toolkit/authentication/AuthenticatorState;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
 	public static final fun DialogAuthenticatorWithBrowserAuthenticationChallenge (Lcom/arcgismaps/toolkit/authentication/AuthenticatorState;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
 }
 
 public abstract interface class com/arcgismaps/toolkit/authentication/AuthenticatorState : com/arcgismaps/httpcore/authentication/ArcGISAuthenticationChallengeHandler, com/arcgismaps/httpcore/authentication/NetworkAuthenticationChallengeHandler {
 	public abstract fun dismissAll ()V
 	public abstract fun getIapConfigurations ()Ljava/util/List;
-	public abstract fun getOAuthUserConfiguration ()Lcom/arcgismaps/httpcore/authentication/OAuthUserConfiguration;
 	public abstract fun getOAuthUserConfigurations ()Ljava/util/List;
 	public abstract fun getPendingClientCertificateChallenge ()Lkotlinx/coroutines/flow/StateFlow;
 	public abstract fun getPendingIapSignIn ()Lkotlinx/coroutines/flow/StateFlow;
@@ -26,7 +23,6 @@ public abstract interface class com/arcgismaps/toolkit/authentication/Authentica
 	public abstract fun getPendingUsernamePasswordChallenge ()Lkotlinx/coroutines/flow/StateFlow;
 	public abstract fun isDisplayed ()Lkotlinx/coroutines/flow/Flow;
 	public abstract fun setIapConfigurations (Ljava/util/List;)V
-	public abstract fun setOAuthUserConfiguration (Lcom/arcgismaps/httpcore/authentication/OAuthUserConfiguration;)V
 	public abstract fun setOAuthUserConfigurations (Ljava/util/List;)V
 	public abstract fun signOut-IoAF18A (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
@@ -35,7 +31,6 @@ public final class com/arcgismaps/toolkit/authentication/AuthenticatorStateKt {
 	public static final fun AuthenticatorState (ZZ)Lcom/arcgismaps/toolkit/authentication/AuthenticatorState;
 	public static synthetic fun AuthenticatorState$default (ZZILjava/lang/Object;)Lcom/arcgismaps/toolkit/authentication/AuthenticatorState;
 	public static final fun completeBrowserAuthenticationChallenge (Lcom/arcgismaps/toolkit/authentication/AuthenticatorState;Landroid/content/Intent;)V
-	public static final fun completeOAuthSignIn (Lcom/arcgismaps/toolkit/authentication/AuthenticatorState;Landroid/content/Intent;)V
 }
 
 public abstract class com/arcgismaps/toolkit/authentication/BrowserAuthenticationChallenge {
@@ -45,8 +40,6 @@ public abstract class com/arcgismaps/toolkit/authentication/BrowserAuthenticatio
 public final class com/arcgismaps/toolkit/authentication/BrowserAuthenticationChallenge$IapSignIn : com/arcgismaps/toolkit/authentication/BrowserAuthenticationChallenge {
 	public static final field $stable I
 	public final fun component1 ()Lcom/arcgismaps/httpcore/authentication/IapSignIn;
-	public final fun copy (Lcom/arcgismaps/httpcore/authentication/IapSignIn;)Lcom/arcgismaps/toolkit/authentication/BrowserAuthenticationChallenge$IapSignIn;
-	public static synthetic fun copy$default (Lcom/arcgismaps/toolkit/authentication/BrowserAuthenticationChallenge$IapSignIn;Lcom/arcgismaps/httpcore/authentication/IapSignIn;ILjava/lang/Object;)Lcom/arcgismaps/toolkit/authentication/BrowserAuthenticationChallenge$IapSignIn;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getIapSignIn ()Lcom/arcgismaps/httpcore/authentication/IapSignIn;
 	public fun hashCode ()I
@@ -56,8 +49,6 @@ public final class com/arcgismaps/toolkit/authentication/BrowserAuthenticationCh
 public final class com/arcgismaps/toolkit/authentication/BrowserAuthenticationChallenge$IapSignOut : com/arcgismaps/toolkit/authentication/BrowserAuthenticationChallenge {
 	public static final field $stable I
 	public final fun component1 ()Lcom/arcgismaps/httpcore/authentication/IapSignOut;
-	public final fun copy (Lcom/arcgismaps/httpcore/authentication/IapSignOut;)Lcom/arcgismaps/toolkit/authentication/BrowserAuthenticationChallenge$IapSignOut;
-	public static synthetic fun copy$default (Lcom/arcgismaps/toolkit/authentication/BrowserAuthenticationChallenge$IapSignOut;Lcom/arcgismaps/httpcore/authentication/IapSignOut;ILjava/lang/Object;)Lcom/arcgismaps/toolkit/authentication/BrowserAuthenticationChallenge$IapSignOut;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getIapSignOut ()Lcom/arcgismaps/httpcore/authentication/IapSignOut;
 	public fun hashCode ()I
@@ -67,8 +58,6 @@ public final class com/arcgismaps/toolkit/authentication/BrowserAuthenticationCh
 public final class com/arcgismaps/toolkit/authentication/BrowserAuthenticationChallenge$OAuthUserSignIn : com/arcgismaps/toolkit/authentication/BrowserAuthenticationChallenge {
 	public static final field $stable I
 	public final fun component1 ()Lcom/arcgismaps/httpcore/authentication/OAuthUserSignIn;
-	public final fun copy (Lcom/arcgismaps/httpcore/authentication/OAuthUserSignIn;)Lcom/arcgismaps/toolkit/authentication/BrowserAuthenticationChallenge$OAuthUserSignIn;
-	public static synthetic fun copy$default (Lcom/arcgismaps/toolkit/authentication/BrowserAuthenticationChallenge$OAuthUserSignIn;Lcom/arcgismaps/httpcore/authentication/OAuthUserSignIn;ILjava/lang/Object;)Lcom/arcgismaps/toolkit/authentication/BrowserAuthenticationChallenge$OAuthUserSignIn;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getOAuthUserSignIn ()Lcom/arcgismaps/httpcore/authentication/OAuthUserSignIn;
 	public fun hashCode ()I
@@ -90,28 +79,10 @@ public final class com/arcgismaps/toolkit/authentication/ClientCertificateChalle
 }
 
 public final class com/arcgismaps/toolkit/authentication/ExtensionsKt {
-	public static final fun launchCustomTabs (Landroid/app/Activity;Lcom/arcgismaps/httpcore/authentication/OAuthUserSignIn;)V
 	public static final fun launchCustomTabs (Landroid/app/Activity;Lcom/arcgismaps/toolkit/authentication/BrowserAuthenticationChallenge;)V
 	public static final fun signOut (Lcom/arcgismaps/httpcore/authentication/AuthenticationManager;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public final class com/arcgismaps/toolkit/authentication/OAuthUserSignInActivity : androidx/activity/ComponentActivity {
-	public static final field $stable I
-	public fun <init> ()V
-	public final fun handleRedirectIntent (Landroid/content/Intent;)V
-	public fun onCreate (Landroid/os/Bundle;)V
-	public fun onWindowFocusChanged (Z)V
-}
-
-public final class com/arcgismaps/toolkit/authentication/OAuthUserSignInActivity$Contract : androidx/activity/result/contract/ActivityResultContract {
-	public static final field $stable I
-	public fun <init> ()V
-	public fun createIntent (Landroid/content/Context;Lcom/arcgismaps/httpcore/authentication/OAuthUserSignIn;)Landroid/content/Intent;
-	public synthetic fun createIntent (Landroid/content/Context;Ljava/lang/Object;)Landroid/content/Intent;
-	public synthetic fun parseResult (ILandroid/content/Intent;)Ljava/lang/Object;
-	public fun parseResult (ILandroid/content/Intent;)Ljava/lang/String;
-}
-
 public final class com/arcgismaps/toolkit/authentication/ServerTrustChallenge {
 	public static final field $stable I
 	public fun <init> (Lcom/arcgismaps/httpcore/authentication/NetworkAuthenticationChallenge;Lkotlin/jvm/functions/Function1;)V
@@ -120,21 +91,14 @@ public final class com/arcgismaps/toolkit/authentication/ServerTrustChallenge {
 	public final fun trust ()V
 }
 
-public final class com/arcgismaps/toolkit/authentication/UsernamePasswordAuthenticatorKt {
-	public static final fun UsernamePasswordAuthenticator (Lcom/arcgismaps/toolkit/authentication/UsernamePasswordChallenge;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
-}
-
 public final class com/arcgismaps/toolkit/authentication/UsernamePasswordChallenge {
 	public static final field $stable I
 	public fun <init> (Ljava/lang/String;Lkotlin/jvm/functions/Function2;Ljava/lang/Throwable;Lkotlin/jvm/functions/Function0;)V
 	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/functions/Function2;Ljava/lang/Throwable;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function0;)V
 	public final fun cancel ()V
 	public final fun continueWithCredentials (Ljava/lang/String;Ljava/lang/String;)V
-	public final fun getAdditionalMessage ()Lkotlinx/coroutines/flow/StateFlow;
 	public final fun getCause ()Ljava/lang/Throwable;
 	public final fun getHostname ()Ljava/lang/String;
 	public final fun getUrl ()Ljava/lang/String;
-	public final fun setAdditionalMessage (Ljava/lang/String;)V
 }
 
diff --git a/toolkit/authentication/build.gradle.kts b/toolkit/authentication/build.gradle.kts
index f9062af0b..ca7a598ef 100644
--- a/toolkit/authentication/build.gradle.kts
+++ b/toolkit/authentication/build.gradle.kts
@@ -17,75 +17,11 @@
  */
 
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("artifact-deploy")
-    alias(libs.plugins.binary.compatibility.validator) apply true
+    alias(libs.plugins.arcgismaps.kotlin.toolkit)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.authentication"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
-    defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt()
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    buildFeatures {
-        compose = true
-    }
-    packaging {
-        resources {
-            excludes += setOf(
-                "META-INF/LICENSE-notice.md",
-                "META-INF/LICENSE.md"
-            )
-        }
-    }
-
-    // If this were not an android project, we would just write `explicitApi()` in the Kotlin scope.
-    // but as an android project could write `freeCompilerArgs = listOf("-Xexplicit-api=strict")`
-    // in the kotlinOptions above, but that would enforce api rules on the test code, which we don't want.
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-        if ("Test" !in name) {
-            compilerOptions {
-                freeCompilerArgs.add("-Xexplicit-api=strict")
-            }
-        }
-    }
-
-    /**
-     * Configures the test report for connected (instrumented) tests to be copied to a central
-     * folder in the project's root directory.
-     */
-    @Suppress("UnstableApiUsage")
-    testOptions {
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        val connectedTestReportsPath: String by project
-        reportDir = "$connectedTestReportsPath/${project.name}"
-    }
-
-    publishing {
-        singleVariant("release") {
-            // This is the default variant.
-        }
-    }
 }
 
 apiValidation {
@@ -102,18 +38,9 @@ apiValidation {
 }
 
 dependencies {
-    api(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.lifecycle.runtime.compose)
-    implementation(libs.androidx.activity.compose)
+    // Module-specific dependencies go here
     implementation(libs.androidx.browser)
     implementation(libs.androidx.material.icons)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
-
     // uiautomator
     androidTestImplementation(libs.androidx.uiautomator)
     androidTestImplementation(libs.mockk.android)
diff --git a/toolkit/authentication/src/androidTest/AndroidManifest.xml b/toolkit/authentication/src/androidTest/AndroidManifest.xml
index bb2c6badf..384577743 100644
--- a/toolkit/authentication/src/androidTest/AndroidManifest.xml
+++ b/toolkit/authentication/src/androidTest/AndroidManifest.xml
@@ -24,26 +24,6 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="com.arcgismaps.toolkit.authentication.OAuthUserLauncherTestActivity"
-            android:exported="true"
-            android:launchMode="singleTop"
-            android:taskAffinity="">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="auth"
-                    android:scheme="kotlin-authentication-test-2" />
-            </intent-filter>
-        </activity>
         <activity android:name="com.arcgismaps.toolkit.authentication.BrowserUserLauncherTestActivity"
             android:exported="true"
             android:launchMode="singleTop"
diff --git a/toolkit/authentication/src/androidTest/java/com/arcgismaps/toolkit/authentication/BrowserUserLauncherTests.kt b/toolkit/authentication/src/androidTest/java/com/arcgismaps/toolkit/authentication/BrowserUserLauncherTests.kt
index 2cd147380..62c1c0113 100644
--- a/toolkit/authentication/src/androidTest/java/com/arcgismaps/toolkit/authentication/BrowserUserLauncherTests.kt
+++ b/toolkit/authentication/src/androidTest/java/com/arcgismaps/toolkit/authentication/BrowserUserLauncherTests.kt
@@ -226,13 +226,15 @@ class BrowserUserLauncherTestActivity : ComponentActivity() {
  */
 class BrowserUserLauncherTestViewModel : ViewModel() {
     val authenticatorState = AuthenticatorState().apply {
-        oAuthUserConfiguration = OAuthUserConfiguration(
-            "https://arcgis.com/",
-            // This client ID is for demo purposes only. For use of the Authenticator in your own app,
-            // create your own client ID. For more info see:
-            // https://developers.arcgis.com/documentation/mapping-apis-and-services/security/tutorials/register-your-application/
-            "SmYakFwlYRYWEJAR",
-            "kotlin-authentication-test-browser://auth"
+        oAuthUserConfigurations = listOf(
+            OAuthUserConfiguration(
+                "https://arcgis.com/",
+                // This client ID is for demo purposes only. For use of the Authenticator in your own app,
+                // create your own client ID. For more info see:
+                // https://developers.arcgis.com/documentation/mapping-apis-and-services/security/tutorials/register-your-application/
+                "SmYakFwlYRYWEJAR",
+                "kotlin-authentication-test-browser://auth"
+            )
         )
     }
 }
diff --git a/toolkit/authentication/src/androidTest/java/com/arcgismaps/toolkit/authentication/OAuthDefaultConfigurationTests.kt b/toolkit/authentication/src/androidTest/java/com/arcgismaps/toolkit/authentication/OAuthDefaultConfigurationTests.kt
index 8a8ed9f4a..0ace181bf 100644
--- a/toolkit/authentication/src/androidTest/java/com/arcgismaps/toolkit/authentication/OAuthDefaultConfigurationTests.kt
+++ b/toolkit/authentication/src/androidTest/java/com/arcgismaps/toolkit/authentication/OAuthDefaultConfigurationTests.kt
@@ -216,13 +216,15 @@ class OAuthDefaultConfigurationTests {
         userInputOnDialog: UiDevice.() -> Unit,
     ): Deferred<Result<ArcGISAuthenticationChallengeResponse>> {
         val authenticatorState = AuthenticatorState().apply {
-            oAuthUserConfiguration = OAuthUserConfiguration(
-                "https://arcgis.com",
-                // This client ID is for demo purposes only. For use of the Authenticator in your own app,
-                // create your own client ID. For more info see:
-                // https://developers.arcgis.com/documentation/mapping-apis-and-services/security/tutorials/register-your-application/
-                "uITYQG1POJsrluOP",
-                "kotlin-authentication-test-1://auth"
+            oAuthUserConfigurations = listOf(
+                OAuthUserConfiguration(
+                    "https://arcgis.com",
+                    // This client ID is for demo purposes only. For use of the Authenticator in your own app,
+                    // create your own client ID. For more info see:
+                    // https://developers.arcgis.com/documentation/mapping-apis-and-services/security/tutorials/register-your-application/
+                    "uITYQG1POJsrluOP",
+                    "kotlin-authentication-test-1://auth"
+                )
             )
         }
         composeTestRule.setContent {
diff --git a/toolkit/authentication/src/androidTest/java/com/arcgismaps/toolkit/authentication/OAuthUserLauncherTests.kt b/toolkit/authentication/src/androidTest/java/com/arcgismaps/toolkit/authentication/OAuthUserLauncherTests.kt
deleted file mode 100644
index c71526c0b..000000000
--- a/toolkit/authentication/src/androidTest/java/com/arcgismaps/toolkit/authentication/OAuthUserLauncherTests.kt
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- *  Copyright 2024 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.
- *
- */
-package com.arcgismaps.toolkit.authentication
-
-import android.content.Intent
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.activity.viewModels
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.compose.ui.test.onNodeWithTag
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.ViewModel
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.uiautomator.UiDevice
-import com.arcgismaps.ArcGISEnvironment
-import com.arcgismaps.exceptions.OperationCancelledException
-import com.arcgismaps.httpcore.authentication.ArcGISAuthenticationChallenge
-import com.arcgismaps.httpcore.authentication.ArcGISAuthenticationChallengeResponse
-import com.arcgismaps.httpcore.authentication.OAuthUserConfiguration
-import com.arcgismaps.httpcore.authentication.OAuthUserCredential
-import kotlinx.coroutines.Deferred
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.async
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.test.TestScope
-import kotlinx.coroutines.test.advanceUntilIdle
-import kotlinx.coroutines.test.runTest
-import org.junit.After
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-
-/**
- * Tests the [Authenticator] against OAuth challenges when the Custom Chrome Tab is launched from a user activity
- *
- * @since 200.5.0
- */
-class OAuthUserLauncherTests {
-
-    @get:Rule
-    val composeTestRule = createAndroidComposeRule<OAuthUserLauncherTestActivity>()
-
-    @Before
-    fun signOutBefore() = signOut()
-
-    @After
-    fun signOutAfter() = signOut()
-
-    private fun signOut() {
-        runBlocking {
-            composeTestRule.activity.viewModel.authenticatorState.signOut()
-        }
-        // reset the ArcGISHttpClient to remove any custom interceptors
-        ArcGISEnvironment.configureArcGISHttpClient()
-    }
-
-
-    /**
-     * Given an [AuthenticatorState] configured with an [OAuthUserConfiguration] for ArcGIS Online,
-     * When an [ArcGISAuthenticationChallenge] is received and the OAuth browser redirects with a successful response,
-     * Then the [ArcGISAuthenticationChallengeResponse] should be [ArcGISAuthenticationChallengeResponse.ContinueWithCredential].
-     *
-     * Note: This function automatically redirects to the app with a successful response without user input,
-     * and fakes the token validation response.
-     *
-     * @since 200.5.0
-     */
-    @Test
-    fun successfulSignIn() = runTest {
-        // configure the ArcGISHttpClient to intercept token requests and return a fake token response
-        // this is necessary when we are faking a successful sign-in without entering credentials,
-        // as we are not given a valid token from the OAuth server and RTC won't be able to verify it.
-        ArcGISEnvironment.configureArcGISHttpClient {
-            setupOAuthTokenRequestInterceptor()
-        }
-        val response = testOAuthChallengeWithStateRestoration {
-            // When the OAuth sign in screen displays, we simulate successful sign in by launching an
-            // intent with the expected redirect URL, which otherwise would be sent from the Portal
-            // server, but would require valid credentials
-            InstrumentationRegistry.getInstrumentation().context.startActivity(createSuccessfulRedirectIntent("kotlin-authentication-test-2://auth"))
-        }.await().getOrNull()
-        assert(response is ArcGISAuthenticationChallengeResponse.ContinueWithCredential)
-        assert((response as ArcGISAuthenticationChallengeResponse.ContinueWithCredential).credential is OAuthUserCredential)
-    }
-
-    /**
-     * Given an [AuthenticatorState] configured with an [OAuthUserConfiguration] for ArcGIS Online,
-     * When an [ArcGISAuthenticationChallenge] is received and the user cancels the sign in process,
-     * Then the [ArcGISAuthenticationChallengeResponse] should be [ArcGISAuthenticationChallengeResponse.Cancel].
-     *
-     * @since 200.5.0
-     */
-    @Test
-    fun cancelSignIn() = runTest {
-        val response = testOAuthChallengeWithStateRestoration {
-            clickByText("Cancel")
-        }.await().exceptionOrNull()
-        assert(response is OperationCancelledException)
-    }
-
-    /**
-     * Given an [AuthenticatorState] configured with an [OAuthUserConfiguration] for ArcGIS Online,
-     * When an [ArcGISAuthenticationChallenge] is received and the user presses the back button,
-     * Then the [ArcGISAuthenticationChallengeResponse] should be [ArcGISAuthenticationChallengeResponse.Cancel].
-     *
-     * @since 200.5.0
-     */
-    @Test
-    fun pressBack() = runTest {
-        val response = testOAuthChallengeWithStateRestoration {
-            pressBack()
-        }.await().exceptionOrNull()
-        assert(response is OperationCancelledException)
-    }
-
-    /**
-     * Places an [Authenticator] in the composition and issues an OAuth challenge.
-     * Once the browser is launched, [userInputOnDialog] will be called to simulate user input.
-     * Also, the device will be rotated to ensure that the Authenticator can handle configuration changes
-     * before calling [userInputOnDialog].
-     *
-     * @since 200.5.0
-     */
-    @OptIn(ExperimentalCoroutinesApi::class)
-    private fun TestScope.testOAuthChallengeWithStateRestoration(
-        userInputOnDialog: UiDevice.() -> Unit,
-    ): Deferred<Result<ArcGISAuthenticationChallengeResponse>> {
-        // start the activity (which contains the Authenticator)
-        val authenticatorState = composeTestRule.activity.viewModel.authenticatorState
-        composeTestRule.activityRule.scenario.moveToState(Lifecycle.State.RESUMED)
-        // wait for the activity content to be displayed
-        composeTestRule.waitForIdle()
-        // issue the OAuth challenge
-        val challengeResponse = async {
-            runCatching {
-                authenticatorState.handleArcGISAuthenticationChallenge(
-                    makeMockArcGISAuthenticationChallenge()
-                )
-            }
-        }
-        // ensure the challenge is issued
-        advanceUntilIdle()
-
-        // wait for the pending sign in to be ready
-        composeTestRule.waitUntil(timeoutMillis = 40_000) { authenticatorState.pendingOAuthUserSignIn.value != null }
-        // wait for the authenticator to be removed from the composition, ie the CCT is launched
-        composeTestRule.onNodeWithTag("Authenticator").assertDoesNotExist()
-
-        val uiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
-
-        // wait for the browser to be launched
-        uiDevice.awaitViewVisible("com.android.chrome")
-
-        // rotate the device to ensure the Authenticator can handle configuration changes
-        uiDevice.setOrientationLandscape()
-        uiDevice.setOrientationPortrait()
-
-        // perform the test action
-        uiDevice.userInputOnDialog()
-
-        // return the response deferred
-        return challengeResponse
-    }
-}
-
-/**
- * This activity is used to test the Authenticator when the Custom Chrome Tab is launched from a user activity
- *
- * @since 200.5.0
- */
-@Suppress("DEPRECATION")
-class OAuthUserLauncherTestActivity : ComponentActivity() {
-    val viewModel: OAuthUserLauncherTestViewModel by viewModels()
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContent {
-            Authenticator(
-                authenticatorState = viewModel.authenticatorState,
-                onPendingOAuthUserSignIn = {
-                    launchCustomTabs(it)
-                }
-            )
-        }
-    }
-
-    override fun onNewIntent(intent: Intent) {
-        super.onNewIntent(intent)
-        viewModel.authenticatorState.completeOAuthSignIn(intent)
-    }
-
-    override fun onResume() {
-        super.onResume()
-        viewModel.authenticatorState.completeOAuthSignIn(intent)
-    }
-}
-
-/**
- * ViewModel for the [OAuthUserLauncherTestActivity] that contains the [AuthenticatorState] for testing
- *
- * @since 200.5.0
- *
- */
-class OAuthUserLauncherTestViewModel : ViewModel() {
-    val authenticatorState = AuthenticatorState().apply {
-        oAuthUserConfiguration = OAuthUserConfiguration(
-            "https://arcgis.com/",
-            // This client ID is for demo purposes only. For use of the Authenticator in your own app,
-            // create your own client ID. For more info see:
-            // https://developers.arcgis.com/documentation/mapping-apis-and-services/security/tutorials/register-your-application/
-            "SmYakFwlYRYWEJAR",
-            "kotlin-authentication-test-2://auth"
-        )
-    }
-}
diff --git a/toolkit/authentication/src/androidTest/java/com/arcgismaps/toolkit/authentication/UsernamePasswordTests.kt b/toolkit/authentication/src/androidTest/java/com/arcgismaps/toolkit/authentication/UsernamePasswordTests.kt
index 7b9774575..a6cd729a8 100644
--- a/toolkit/authentication/src/androidTest/java/com/arcgismaps/toolkit/authentication/UsernamePasswordTests.kt
+++ b/toolkit/authentication/src/androidTest/java/com/arcgismaps/toolkit/authentication/UsernamePasswordTests.kt
@@ -35,7 +35,6 @@ import io.mockk.verify
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.async
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.advanceUntilIdle
@@ -106,8 +105,6 @@ class UsernamePasswordTests {
      */
     @OptIn(ExperimentalCoroutinesApi::class)
     @Test
-    @Suppress("DEPRECATION")
-    // TODO: Remove when deprecated UsernamePasswordAuthenticator fun is removed
     fun loginButtonEnabledState() = runTest {
         composeTestRule.setContent {
             UsernamePasswordAuthenticator(
@@ -156,13 +153,10 @@ class UsernamePasswordTests {
      */
     @OptIn(ExperimentalCoroutinesApi::class)
     @Test
-    @Suppress("DEPRECATION")
-    // TODO: Remove when deprecated UsernamePasswordAuthenticator fun is removed
     fun keyboardActions() = runTest {
         val usernamePasswordChallengeMock = mockk<UsernamePasswordChallenge>()
         every { usernamePasswordChallengeMock.hostname } returns "arcgis.com"
         every { usernamePasswordChallengeMock.cause } returns null
-        every { usernamePasswordChallengeMock.additionalMessage } answers { MutableStateFlow("") }
         every { usernamePasswordChallengeMock.continueWithCredentials(any(), any()) } just Runs
 
         composeTestRule.setContent {
@@ -219,13 +213,10 @@ class UsernamePasswordTests {
      */
     @OptIn(ExperimentalCoroutinesApi::class)
     @Test
-    @Suppress("DEPRECATION")
-    // TODO: Remove when deprecated UsernamePasswordAuthenticator fun is removed
     fun testPasswordVisibility() = runTest {
         val password = "helloWorld"
         val usernamePasswordChallengeMock = mockk<UsernamePasswordChallenge>()
         every { usernamePasswordChallengeMock.hostname } returns "arcgis.com"
-        every { usernamePasswordChallengeMock.additionalMessage } answers { MutableStateFlow("") }
         every { usernamePasswordChallengeMock.cause } returns null
         every { usernamePasswordChallengeMock.continueWithCredentials(any(), any()) } just Runs
 
@@ -268,10 +259,6 @@ class UsernamePasswordTests {
         val hostname = "arcgis.com"
         every { usernamePasswordChallengeMock.hostname } returns hostname
         every { usernamePasswordChallengeMock.continueWithCredentials(any(), any()) } just Runs
-        every {
-            @Suppress("DEPRECATION")
-            usernamePasswordChallengeMock.additionalMessage
-        } answers { MutableStateFlow("") }
         every { usernamePasswordChallengeMock.cause } returns null
 
         composeTestRule.setContent {
@@ -301,15 +288,10 @@ class UsernamePasswordTests {
         val mockCause = mockk<ArcGISAuthenticationException>()
         val usernamePasswordChallengeMock = mockk<UsernamePasswordChallenge>()
         every { usernamePasswordChallengeMock.hostname } returns "arcgis.com"
-        every {
-            @Suppress("DEPRECATION")
-            usernamePasswordChallengeMock.additionalMessage
-        } answers { MutableStateFlow("") }
         every { usernamePasswordChallengeMock.continueWithCredentials(any(), any()) } just Runs
         every { usernamePasswordChallengeMock.cause } returns mockCause
 
         composeTestRule.setContent {
-            @Suppress("DEPRECATION")
             UsernamePasswordAuthenticator(usernamePasswordChallengeMock)
         }
 
@@ -336,10 +318,6 @@ class UsernamePasswordTests {
 
         val usernamePasswordChallengeMock = mockk<UsernamePasswordChallenge>()
         every { usernamePasswordChallengeMock.hostname } returns "arcgis.com"
-        every {
-            @Suppress("DEPRECATION")
-            usernamePasswordChallengeMock.additionalMessage
-        } answers { MutableStateFlow("") }
         every { usernamePasswordChallengeMock.continueWithCredentials(any(), any()) } just Runs
         every { usernamePasswordChallengeMock.cause } returns IllegalStateException("Test")
 
diff --git a/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/AuthenticationActivity.kt b/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/AuthenticationActivity.kt
index 72a0e8f74..077a46482 100644
--- a/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/AuthenticationActivity.kt
+++ b/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/AuthenticationActivity.kt
@@ -128,8 +128,8 @@ public class AuthenticationActivity internal constructor() : ComponentActivity()
         super.onCreate(savedInstanceState)
         val url = intent.getStringExtra(KEY_INTENT_EXTRA_URL)
         url?.let {
-            val shouldUseIncognito = intent.getBooleanExtra(KEY_INTENT_EXTRA_PRIVATE_BROWSING, false)
-            launchCustomTabs(it, shouldUseIncognito)
+            val preferPrivateWebBrowserSession = intent.getBooleanExtra(KEY_INTENT_EXTRA_PRIVATE_BROWSING, false)
+            launchCustomTabs(it, preferPrivateWebBrowserSession)
         }
     }
 
diff --git a/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/Authenticator.kt b/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/Authenticator.kt
index 31fe81cf3..a61bdbf2d 100644
--- a/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/Authenticator.kt
+++ b/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/Authenticator.kt
@@ -32,46 +32,6 @@ import com.arcgismaps.httpcore.authentication.ArcGISAuthenticationChallenge
 import com.arcgismaps.httpcore.authentication.OAuthUserConfiguration
 import com.arcgismaps.httpcore.authentication.OAuthUserSignIn
 
-/**
- * Displays appropriate Authentication UI when an authentication challenge is issued.
- *
- * For example, when an [ArcGISAuthenticationChallenge] is issued and the [AuthenticatorState] has a corresponding
- * [OAuthUserConfiguration], then a Custom Tab will be launched to complete the OAuth sign in.
- *
- * This Composable will adapt to the size of its container, allowing flexible layout usage. For alternate behavior,
- * see [DialogAuthenticator].
- *
- * @param authenticatorState the object that holds the state to handle authentication challenges.
- * @param modifier the [Modifier] to apply to this Authenticator.
- * @param onPendingOAuthUserSignIn if not null, this will be called when an OAuth challenge is pending
- * and the browser should be launched. Use this if you wish to handle OAuth challenges from your own
- * activity rather than using the [AuthenticationActivity].
- * @see DialogAuthenticator
- * @since 200.2.0
- */
-@Deprecated(
-    message = "as of 200.8.0 and will be removed in an upcoming release, use the Authenticator composable with " +
-            "BrowserAuthenticationChallenge instead.",
-    replaceWith = ReplaceWith(
-        "Authenticator(AuthenticatorState, Modifier, BrowserAuthenticationChallenge)"
-    ),
-    level = DeprecationLevel.WARNING
-)
-@Composable
-public fun Authenticator(
-    authenticatorState: AuthenticatorState,
-    modifier: Modifier = Modifier,
-    onPendingOAuthUserSignIn: ((OAuthUserSignIn) -> Unit)? = null
-) {
-    Surface {
-        AuthenticatorDelegate(
-            authenticatorState = authenticatorState,
-            modifier = modifier,
-            onPendingOAuthUserSignIn = onPendingOAuthUserSignIn
-        )
-    }
-}
-
 /**
  * Displays appropriate Authentication UI when an authentication challenge is issued.
  *
@@ -133,49 +93,6 @@ public fun Authenticator(
     }
 }
 
-
-/**
- * Displays appropriate Authentication UI when an authentication challenge is issued.
- *
- * For example, when an [ArcGISAuthenticationChallenge] is issued and the [AuthenticatorState] has a corresponding
- * [OAuthUserConfiguration], then a Custom Tab will be launched to complete the OAuth sign in.
- *
- * Server trust prompts and username/password prompts will be displayed in a dialog.
- * All other prompts will be displayed differently based on their type:
- * - OAuth and IAP challenges will be displayed in a browser.
- * - Client certificate challenges will be displayed using the Android certificate picker.
- *
- * For alternate behavior, see the [Authenticator] component.
- *
- * @param authenticatorState the object that holds the state to handle authentication challenges.
- * @param modifier the [Modifier] to be applied to this DialogAuthenticator.
- * @param onPendingOAuthUserSignIn if not null, this will be called when an OAuth challenge is pending
- * and the browser should be launched. Use this if you wish to handle OAuth challenges from your own
- * activity rather than using the [AuthenticationActivity].
- * @see Authenticator
- * @since 200.2.0
- */
-@Deprecated(
-    message = "as of 200.8.0 and will be removed in an upcoming release, use the DialogAuthenticator composable with " +
-            "BrowserAuthenticationChallenge instead.",
-    replaceWith = ReplaceWith("DialogAuthenticator(AuthenticatorState, Modifier, BrowserAuthenticationChallenge)"
-    ),
-    level = DeprecationLevel.WARNING
-)
-@Composable
-public fun DialogAuthenticator(
-    authenticatorState: AuthenticatorState,
-    modifier: Modifier = Modifier,
-    onPendingOAuthUserSignIn: ((OAuthUserSignIn) -> Unit)? = null,
-) {
-    AuthenticatorDelegate(
-        authenticatorState = authenticatorState,
-        modifier = modifier,
-        onPendingOAuthUserSignIn = onPendingOAuthUserSignIn,
-        useDialog = true
-    )
-}
-
 /**
  * Displays appropriate Authentication UI when an authentication challenge is issued.
  *
@@ -260,7 +177,6 @@ public fun DialogAuthenticator(
  * @since 200.8.0
  */
 @Composable
-@Suppress("DEPRECATION")
 private fun AuthenticatorDelegate(
     authenticatorState: AuthenticatorState,
     modifier: Modifier = Modifier,
diff --git a/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/AuthenticatorState.kt b/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/AuthenticatorState.kt
index df357af22..d8b5b3567 100644
--- a/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/AuthenticatorState.kt
+++ b/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/AuthenticatorState.kt
@@ -60,19 +60,6 @@ import kotlinx.coroutines.suspendCancellableCoroutine
 public sealed interface AuthenticatorState : NetworkAuthenticationChallengeHandler,
     ArcGISAuthenticationChallengeHandler {
 
-    /**
-     * The [OAuthUserConfiguration] to use for any sign ins. If null, OAuth will not be used for any
-     * [ArcGISAuthenticationChallenge]. If the OAuth configuration is invalid, the Authenticator will not launch an OAuth
-     * browser page and will prompt for a username and password instead.
-     *
-     * @since 200.2.0
-     */
-    @Deprecated(
-        message = "since 200.8.0. Use AuthenticatorState.oAuthUserConfigurations list instead.",
-        replaceWith = ReplaceWith("AuthenticatorState.oAuthUserConfigurations")
-    )
-    public var oAuthUserConfiguration: OAuthUserConfiguration?
-
     /**
      * A list of [OAuthUserConfiguration]s that can be used for OAuth-based sign ins.
      *
@@ -173,25 +160,7 @@ private class AuthenticatorStateImpl(
     setAsNetworkAuthenticationChallengeHandler: Boolean
 ) : AuthenticatorState {
 
-    @Deprecated(
-        "since 200.8.0 and will be removed in a feature release. " +
-                "Use AuthenticatorState.oAuthUserConfigurations list instead.",
-        replaceWith = ReplaceWith("AuthenticatorState.oAuthUserConfigurations")
-    )
-    override var oAuthUserConfiguration: OAuthUserConfiguration? = null
-
-    override var oAuthUserConfigurations: List<OAuthUserConfiguration>
-        get() = oAuthUserConfiguration?.let {
-            if (it in _oAuthUserConfigurations) {
-                _oAuthUserConfigurations
-            } else {
-                _oAuthUserConfigurations + it
-            }
-        } ?: _oAuthUserConfigurations
-        set(value) {
-            _oAuthUserConfigurations = value
-        }
-    private var _oAuthUserConfigurations: List<OAuthUserConfiguration> = emptyList()
+    override var oAuthUserConfigurations: List<OAuthUserConfiguration> = emptyList()
 
     private val _pendingIapSignIn = MutableStateFlow<IapSignIn?>(null)
     override val pendingIapSignIn = _pendingIapSignIn.asStateFlow()
@@ -546,26 +515,6 @@ private suspend fun IapConfiguration.handleIapChallenge(
         onPendingSignIn(iapSignIn)
     }
 
-/**
- * Completes the current [AuthenticatorState.pendingOAuthUserSignIn] with data from the provided [intent].
- *
- * The [Intent] data should contain a string representing the redirect URI that came from a browser
- * where the OAuth sign-in was performed. If the data is null, the sign-in will be cancelled.
- *
- * @since 200.3.0
- */
-@Deprecated(
-    message = "since 200.8.0. Use AuthenticatorState.completeBrowserAuthenticationChallenge(Intent?) instead as it also " +
-            "supports IAP sign-in/sign-out.",
-    replaceWith = ReplaceWith("AuthenticatorState.completeBrowserAuthenticationChallenge(intent)")
-)
-public fun AuthenticatorState.completeOAuthSignIn(intent: Intent?) {
-    intent?.data?.let {
-        val uriString = it.toString()
-        pendingOAuthUserSignIn.value?.complete(uriString)
-    } ?: pendingOAuthUserSignIn.value?.cancel()
-}
-
 /**
  * Completes the current browser-based authentication challenge for the [AuthenticatorState].
  *
diff --git a/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/Extensions.kt b/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/Extensions.kt
index e59109b02..90ee02cab 100644
--- a/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/Extensions.kt
+++ b/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/Extensions.kt
@@ -46,33 +46,10 @@ public suspend fun AuthenticationManager.signOut() {
     networkCredentialStore.removeAll()
 }
 
-/**
- * Launches the custom tabs activity with the provided authorize URL. The resulting intent will
- * launch using an Incognito tab if the [pendingSignIn]'s [OAuthUserConfiguration.preferPrivateWebBrowserSession]
- * is true.
- *
- * @receiver an [Activity] used to launch the [CustomTabsIntent].
- * @param pendingSignIn the [OAuthUserSignIn] that requires completion, or a null value if there is no
- * longer a pending sign in.
- *
- * @since 200.2.0
- */
-@Deprecated (
-    message = "since 200.8.0. Use Activity.launchCustomTabs(BrowserAuthenticationChallenge) " +
-            "instead as it provides support for IAP sign-in/sign-out.",
-    replaceWith = ReplaceWith("Activity.launchCustomTabs(BrowserAuthenticationChallenge)")
-)
-public fun Activity.launchCustomTabs(pendingSignIn: OAuthUserSignIn?): Unit {
-    launchCustomTabs(
-        pendingSignIn?.authorizeUrl ?: return,
-        pendingSignIn.oAuthUserConfiguration.preferPrivateWebBrowserSession
-    )
-}
-
 /**
  * Launches the custom tabs activity with the provided browser authentication challenge.
  *
- * This method determines the appropriate URL and whether to use Incognito mode based on the type of
+ * This method determines the appropriate URL and whether to use a private web browser session based on the type of
  * [BrowserAuthenticationChallenge] provided. It supports OAuth user sign-in, IAP sign-in, and IAP sign-out challenges.
  *
  * @receiver an [Activity] used to launch the [CustomTabsIntent].
@@ -82,13 +59,13 @@ public fun Activity.launchCustomTabs(pendingSignIn: OAuthUserSignIn?): Unit {
  * @since 200.8.0
  */
 public fun Activity.launchCustomTabs(pendingBrowserAuthenticationChallenge: BrowserAuthenticationChallenge) {
-    val (url, useIncognito) = when (pendingBrowserAuthenticationChallenge) {
+    val (url, preferPrivateWebBrowserSession) = when (pendingBrowserAuthenticationChallenge) {
         is BrowserAuthenticationChallenge.OAuthUserSignIn ->
             pendingBrowserAuthenticationChallenge.oAuthUserSignIn.authorizeUrl to pendingBrowserAuthenticationChallenge.oAuthUserSignIn.oAuthUserConfiguration.preferPrivateWebBrowserSession
         is BrowserAuthenticationChallenge.IapSignIn -> pendingBrowserAuthenticationChallenge.iapSignIn.authorizeUrl to false
         is BrowserAuthenticationChallenge.IapSignOut -> pendingBrowserAuthenticationChallenge.iapSignOut.signOutUrl to false
     }
-    launchCustomTabs(url, useIncognito)
+    launchCustomTabs(url, preferPrivateWebBrowserSession)
 }
 
 
@@ -97,14 +74,14 @@ public fun Activity.launchCustomTabs(pendingBrowserAuthenticationChallenge: Brow
  *
  * @param authorizeUrl the authorize URL used by the custom tabs browser to prompt for OAuth
  * user credentials.
- * @param useIncognito whether the [CustomTabsIntent] should use Incognito mode, if available.
+ * @param preferPrivateWebBrowserSession whether the [CustomTabsIntent] should use a private web browser session, if available.
  *
- * @since 200.2.0
+ * @since 200.8.1
  */
-internal fun Activity.launchCustomTabs(authorizeUrl: String, useIncognito: Boolean?) {
-    CustomTabsIntent.Builder().build().apply {
-        if (useIncognito == true) {
-            intent.putExtra("com.google.android.apps.chrome.EXTRA_OPEN_NEW_INCOGNITO_TAB", true)
+internal fun Activity.launchCustomTabs(authorizeUrl: String, preferPrivateWebBrowserSession: Boolean?) {
+    CustomTabsIntent.Builder().apply {
+        if (preferPrivateWebBrowserSession == true) {
+            setEphemeralBrowsingEnabled(true)
         }
-    }.launchUrl(this, authorizeUrl.toUri())
+    }.build().launchUrl(this, authorizeUrl.toUri())
 }
diff --git a/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/OAuthAuthenticator.kt b/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/OAuthAuthenticator.kt
index 9bf399ee3..7eb355726 100644
--- a/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/OAuthAuthenticator.kt
+++ b/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/OAuthAuthenticator.kt
@@ -30,7 +30,7 @@ import com.arcgismaps.httpcore.authentication.OAuthUserSignIn
 private const val DEFAULT_REDIRECT_URI = "urn:ietf:wg:oauth:2.0:oob"
 
 /**
- * Launches a Custom Chrome Tab using the url in [oAuthPendingSignIn] and calls [onActivityResult] on completion.
+ * Launches a Custom Tab using the url in [oAuthPendingSignIn] and calls [onActivityResult] on completion.
  *
  * @see AuthenticationActivity
  * @param oAuthPendingSignIn the [OAuthUserSignIn] pending completion.
@@ -59,7 +59,7 @@ internal fun OAuthAuthenticator(
         // Note that this flag does not need to be reset to false. After the OAuth prompt completes, the OAuthAuthenticator
         // will leave the composition. On a subsequent OAuth challenge, the OAuthAuthenticator will re-enter the
         // composition and a new `didLaunch` state variable will be initialized again to `false`.
-        var didLaunch by rememberSaveable(key = oAuthPendingSignIn.hashCode().toString()) { mutableStateOf(false) }
+        var didLaunch by rememberSaveable(oAuthPendingSignIn.hashCode().toString()) { mutableStateOf(false) }
         val launcher =
             rememberLauncherForActivityResult(contract = AuthenticationActivity.OAuthUserSignInContract()) { redirectUrl ->
                 redirectUrl?.let {
diff --git a/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/OAuthUserSignInActivity.kt b/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/OAuthUserSignInActivity.kt
deleted file mode 100644
index 5512d42cd..000000000
--- a/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/OAuthUserSignInActivity.kt
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- *
- *  Copyright 2023 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.
- *
- */
-
-package com.arcgismaps.toolkit.authentication
-
-
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.result.contract.ActivityResultContract
-import androidx.lifecycle.Lifecycle
-import com.arcgismaps.httpcore.authentication.OAuthUserSignIn
-
-private const val KEY_INTENT_EXTRA_AUTHORIZE_URL = "INTENT_EXTRA_KEY_AUTHORIZE_URL"
-private const val KEY_INTENT_EXTRA_OAUTH_RESPONSE_URL = "KEY_INTENT_EXTRA_OAUTH_RESPONSE_URI"
-private const val KEY_INTENT_EXTRA_PROMPT_SIGN_IN = "KEY_INTENT_EXTRA_PROMPT_SIGN_IN"
-private const val KEY_INTENT_EXTRA_PRIVATE_BROWSING = "KEY_INTENT_EXTRA_PRIVATE_BROWSING"
-
-private const val RESULT_CODE_SUCCESS = 1
-private const val RESULT_CODE_CANCELED = 2
-
-/**
- * An activity that is responsible for launching a CustomTabs activity and to receive and process
- * the redirect intent as a result of a user completing the CustomTabs prompt.
- *
- * This activity must be registered in your application's manifest. There are two ways to configure
- * the manifest entry for [OAuthUserSignInActivity]:
- *
- * The most common use case is that completing an OAuth challenge by signing in using the CustomTabs
- * browser should redirect back to this activity immediately and allow the `OAuthAuthenticator` to
- * immediately handle the completion of the challenge. In this case, the activity should be declared
- * in the manifest using `launchMode="singleTop"` and an `intent-filter` should be specified:
- *
- * ```
- * <activity
- * android:name="com.arcgismaps.toolkit.authentication.OAuthUserSignInActivity"
- * android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
- * android:exported="true"
- * android:launchMode="singleTop" >
- *   <intent-filter>
- *     <action android:name="android.intent.action.VIEW" />
- *
- *     <category android:name="android.intent.category.DEFAULT" />
- *     <category android:name="android.intent.category.BROWSABLE" />
- *
- *     <data
- *       android:host="auth"
- *       android:scheme="my-ags-app" />
- *     </intent-filter>
- * </activity>
- * ```
- *
- * Should your app require that the redirect intent from the browser is handled by another activity,
- * then you should remove the intent filter from the `OAuthUserSignInActivity` and put it in the activity
- * that you want the browser to redirect to. Depending on your app's configuration, you may need to
- * change the launch mode to `singleInstance`, but be aware that this will expose the browser as a
- * separate task in the recent tasks list.
- *
- * ```
- * <activity
- * android:name="com.arcgismaps.toolkit.authentication.OAuthUserSignInActivity"
- * android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
- * android:exported="true"
- * android:launchMode="singleInstance" >
- * </activity>
- * ```
- *
- * Then, in the activity that receives the intent as a result of completing the CustomTab, you can pass that on to the `OAuthUserSignInActivity`
- * by copying the `intent.data` and starting the activity directly:
- *
- * ```
- * val newIntent = Intent(this, OAuthUserSignInActivity::class.java).apply {
- *   data = uri
- * }
- * startActivity(newIntent)
- * ```
- *
- * @since 200.2.0
- */
-@Deprecated(
-    message = "As of 200.8.0, this class is deprecated and will be removed in a future release. " +
-            "Use `AuthenticationActivity` instead.",
-    replaceWith = ReplaceWith(expression = "com.arcgismaps.toolkit.authentication.AuthenticationActivity"),
-    level = DeprecationLevel.WARNING
-)
-public class OAuthUserSignInActivity : ComponentActivity() {
-
-    public override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        if (intent.hasExtra(KEY_INTENT_EXTRA_PROMPT_SIGN_IN)) {
-            // authorize URL should be a valid string since we are adding it in the ActivityResultContract
-            val authorizeUrl = intent.getStringExtra(KEY_INTENT_EXTRA_AUTHORIZE_URL)
-            val useIncognito = intent.getBooleanExtra(KEY_INTENT_EXTRA_PRIVATE_BROWSING, false)
-            authorizeUrl?.let {
-                launchCustomTabs(it, useIncognito)
-            }
-        }
-    }
-
-    // This override gets called first when the CustomTabs close button or the back button is pressed.
-    override fun onWindowFocusChanged(hasFocus: Boolean) {
-        super.onWindowFocusChanged(hasFocus)
-
-        // We only want to respond to focus changed events when this activity is in "resumed" state.
-        // On some devices (Oreo) we get unexpected focus changed events with hasFocus true which cause this Activity
-        // to be finished (destroyed) prematurely, for example:
-        // - On Oreo log in to portal with OAuth
-        // - When the browser window is launched this triggers a focus changed event with hasFocus true but at this point
-        //   we do not want to finish this activity -> at this point the activity is in paused state (isResumed == false) so
-        //   we can use this to ignore this "rogue" focus changed event.
-        if (hasFocus && lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)) {
-            // if we got here the user must have pressed the back button or the x button while the
-            // custom tab was visible - finish by cancelling OAuth sign in
-            setResult(RESULT_CODE_CANCELED, Intent())
-            finish()
-        }
-    }
-
-    override fun onNewIntent(intent: Intent) {
-        super.onNewIntent(intent)
-        // if we enter onNewIntent, that means that we have redirected from the custom tab (or an
-        // intermediary activity) with the response uri.
-        handleRedirectIntent(intent)
-    }
-
-    /**
-     * Finishes this activity with a response containing a success code and the redirect intent's uri
-     * or a canceled code if no uri can be found.
-     *
-     * @since 200.2.0
-     */
-    public fun handleRedirectIntent(intent: Intent?) {
-        intent?.data?.let { uri ->
-            val uriString = uri.toString()
-            val newIntent = Intent().apply {
-                putExtra(KEY_INTENT_EXTRA_OAUTH_RESPONSE_URL, uriString)
-            }
-            setResult(RESULT_CODE_SUCCESS, newIntent)
-            finish()
-        } ?: {
-            setResult(RESULT_CODE_CANCELED)
-            finish()
-        }
-    }
-
-    /**
-     * An ActivityResultContract that takes a [OAuthUserSignIn] as input and returns a nullable
-     * string as output. The output string represents a redirect URI as the result of an OAuth user
-     * sign in prompt, or null if OAuth user sign in failed. This contract can be used to launch the
-     * [OAuthUserSignInActivity] for a result.
-     * See [Getting a result from an activity](https://developer.android.com/training/basics/intents/result)
-     * for more details.
-     *
-     * @since 200.2.0
-     */
-    @Deprecated(
-        message = "As of 200.8.0 this class is deprecated and will be removed in a future release." +
-                "Use AuthenticationActivity for OAuth user sign in support.",
-        level = DeprecationLevel.WARNING
-    )
-    public class Contract : ActivityResultContract<OAuthUserSignIn, String?>() {
-        override fun createIntent(context: Context, input: OAuthUserSignIn): Intent =
-            Intent(context, OAuthUserSignInActivity::class.java).apply {
-                putExtra(KEY_INTENT_EXTRA_AUTHORIZE_URL, input.authorizeUrl)
-                putExtra(KEY_INTENT_EXTRA_PROMPT_SIGN_IN, true)
-                putExtra(KEY_INTENT_EXTRA_PRIVATE_BROWSING, input.oAuthUserConfiguration.preferPrivateWebBrowserSession)
-            }
-
-        override fun parseResult(resultCode: Int, intent: Intent?): String? {
-            return if (resultCode == RESULT_CODE_SUCCESS) {
-                intent?.getStringExtra(KEY_INTENT_EXTRA_OAUTH_RESPONSE_URL)
-            } else {
-                null
-            }
-        }
-    }
-}
diff --git a/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/OAuthWebView.kt b/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/OAuthWebView.kt
index 708f1cc95..9398206cb 100644
--- a/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/OAuthWebView.kt
+++ b/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/OAuthWebView.kt
@@ -39,6 +39,7 @@ import com.arcgismaps.httpcore.authentication.NetworkAuthenticationChallenge
 import com.arcgismaps.httpcore.authentication.NetworkAuthenticationChallengeResponse
 import com.arcgismaps.httpcore.authentication.NetworkAuthenticationType
 import com.arcgismaps.httpcore.authentication.NetworkCredential
+import com.arcgismaps.httpcore.authentication.OAuthUserConfiguration
 import com.arcgismaps.httpcore.authentication.OAuthUserSignIn
 import com.arcgismaps.httpcore.authentication.PasswordCredential
 import kotlinx.coroutines.CoroutineScope
@@ -267,7 +268,8 @@ private class OAuthWebViewClient(
 
     /**
      * Completes the WebView OAuth challenge by either passing back a [redirectUrl] or an [exception].
-     * if [OAuthUserConfiguration.preferPrivateWebBrowserSession] is set to true, this method will clear the [webView]'s
+     *
+     * If [OAuthUserConfiguration.preferPrivateWebBrowserSession] is set to true, this method will clear the [webView]'s
      * session.
      *
      * @since 200.3.0
diff --git a/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/UsernamePasswordAuthenticator.kt b/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/UsernamePasswordAuthenticator.kt
index 6e3f1d12e..c67a4aa0c 100644
--- a/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/UsernamePasswordAuthenticator.kt
+++ b/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/UsernamePasswordAuthenticator.kt
@@ -73,13 +73,8 @@ import com.arcgismaps.exceptions.ArcGISAuthenticationException
  * @param modifier the [Modifier] to be applied to this UsernamePasswordAuthenticator.
  * @since 200.2.0
  */
-@Deprecated(
-    message = "This function will be removed with the next major version change of the toolkit and should not be used directly." +
-            "The Authenticator composable displays UsernamePasswordAuthenticator automatically.",
-    level = DeprecationLevel.WARNING
-)
 @Composable
-public fun UsernamePasswordAuthenticator(
+internal fun UsernamePasswordAuthenticator(
     usernamePasswordChallenge: UsernamePasswordChallenge,
     modifier: Modifier = Modifier
 ) {
@@ -265,7 +260,6 @@ private fun UsernamePasswordAuthenticatorImplPreview() {
 
 @Preview
 @Composable
-@Suppress("DEPRECATION")
 private fun UsernamePasswordAuthenticatorPreview() {
     val modifier = Modifier
     UsernamePasswordAuthenticator(
diff --git a/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/UsernamePasswordChallenge.kt b/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/UsernamePasswordChallenge.kt
index 0ad63400e..0e8be2bce 100644
--- a/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/UsernamePasswordChallenge.kt
+++ b/toolkit/authentication/src/main/java/com/arcgismaps/toolkit/authentication/UsernamePasswordChallenge.kt
@@ -38,36 +38,9 @@ public class UsernamePasswordChallenge(
     public val cause: Throwable? = null,
     onCancel: () -> Unit
 ) {
-    /**
-     * Represents an authentication challenge requiring a username and password.
-     *
-     * @property url the name of the server that initiated this challenge
-     * @property onUsernamePasswordReceived called when the username and password should be submitted
-     * @property onCancel called when the challenge should be cancelled
-     *
-     * @since 200.2.0
-     */
-    @Deprecated(
-        message = "Use the constructor with `cause` instead. Ths deprecated method remains to maintain binary compatibility",
-        level = DeprecationLevel.HIDDEN,
-    )
-    public constructor(
-        url: String,
-        onUsernamePasswordReceived: (username: String, password: String) -> Unit,
-        onCancel: () -> Unit,
-    ) : this(
-        url, onUsernamePasswordReceived, cause = null, onCancel
-    )
-
     private var onCancel: (() -> Unit)? = onCancel
     private val _additionalMessage: MutableStateFlow<String?> = MutableStateFlow(null)
 
-    @Deprecated(
-        message = "The `additionalMessage` property is no longer in use. Please use the `cause` property to display relevant error messages instead.",
-        level = DeprecationLevel.WARNING,
-        replaceWith = ReplaceWith("cause")
-    )
-    public val additionalMessage: StateFlow<String?> = _additionalMessage.asStateFlow()
     public val hostname: String by lazy {
         url.toUri().host ?: url
     }
@@ -93,18 +66,4 @@ public class UsernamePasswordChallenge(
         onCancel?.invoke()
         onCancel = null
     }
-
-    /**
-     * Emits an additional message to [additionalMessage] to be displayed in the prompt as an error.
-     * A null value is intended to remove the error message.
-     *
-     * @since 200.2.0
-     */
-    @Deprecated(
-        message = "The `additionalMessage` property is no longer in use. Please use the `cause` property to display relevant error messages instead.",
-        level = DeprecationLevel.WARNING,
-    )
-    public fun setAdditionalMessage(message: String?) {
-        _additionalMessage.value = message
-    }
 }
diff --git a/toolkit/basemapgallery/api/basemapgallery.api b/toolkit/basemapgallery/api/basemapgallery.api
index 9cb401e5d..36f55f874 100644
--- a/toolkit/basemapgallery/api/basemapgallery.api
+++ b/toolkit/basemapgallery/api/basemapgallery.api
@@ -1,7 +1,6 @@
 public final class com/arcgismaps/toolkit/basemapgallery/BasemapGalleryItem {
 	public static final field $stable I
 	public fun <init> (Lcom/arcgismaps/mapping/BasemapStyleInfo;)V
-	public synthetic fun <init> (Lcom/arcgismaps/mapping/Item;)V
 	public fun <init> (Lcom/arcgismaps/mapping/Item;Z)V
 	public synthetic fun <init> (Lcom/arcgismaps/mapping/Item;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun <init> (Ljava/lang/String;Ljava/lang/Object;ZLkotlin/jvm/functions/Function1;)V
diff --git a/toolkit/basemapgallery/build.gradle.kts b/toolkit/basemapgallery/build.gradle.kts
index 8fe5f689d..136b0df45 100644
--- a/toolkit/basemapgallery/build.gradle.kts
+++ b/toolkit/basemapgallery/build.gradle.kts
@@ -16,62 +16,12 @@
  *
  */
 
-
 plugins {
-    alias(libs.plugins.binary.compatibility.validator) apply true
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("artifact-deploy")
-    id("org.jetbrains.kotlin.plugin.compose")
+    alias(libs.plugins.arcgismaps.kotlin.toolkit)
 }
+
 android {
     namespace = "com.arcgismaps.toolkit.basemapgallery"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
-    defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt()
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    buildFeatures {
-        compose = true
-    }
-    // If this were not an android project, we would just write `explicitApi()` in the Kotlin scope.
-    // but as an android project could write `freeCompilerArgs = listOf("-Xexplicit-api=strict")`
-    // in the kotlinOptions above, but that would enforce api rules on the test code, which we don't want.
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-        if ("Test" !in name) {
-            compilerOptions {
-                freeCompilerArgs.add("-Xexplicit-api=strict")
-            }
-        }
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
-    }
-
-    publishing {
-        singleVariant("release") {
-            // This is the default variant.
-        }
-    }
 }
 
 apiValidation {
@@ -86,12 +36,5 @@ apiValidation {
 }
 
 dependencies {
-    api(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
+    // Module-specific dependencies go here
 }
diff --git a/toolkit/basemapgallery/src/main/java/com/arcgismaps/toolkit/basemapgallery/BasemapGalleryItem.kt b/toolkit/basemapgallery/src/main/java/com/arcgismaps/toolkit/basemapgallery/BasemapGalleryItem.kt
index fb6dcb335..dc55327a0 100644
--- a/toolkit/basemapgallery/src/main/java/com/arcgismaps/toolkit/basemapgallery/BasemapGalleryItem.kt
+++ b/toolkit/basemapgallery/src/main/java/com/arcgismaps/toolkit/basemapgallery/BasemapGalleryItem.kt
@@ -65,25 +65,6 @@ public class BasemapGalleryItem(
         basemapStyleInfo.thumbnail
     )
 
-    /**
-     * Construct a [BasemapGalleryItem] with an [Item].
-     *
-     * If the [Item] has a thumbnail, this is used for the thumbnail otherwise a default thumbnail is used.
-     *
-     * @param item the [Item]
-     * @since 200.7.0
-     */
-    @Deprecated(
-        "Use the constructor that takes Item and is3D instead. This deprecated constructor remains to maintain binary compatibility.",
-        level = DeprecationLevel.HIDDEN
-    )
-    public constructor(item: Item) : this(
-        item.title,
-        item,
-        false,
-        item.thumbnail
-    )
-
     /**
      * Construct a [BasemapGalleryItem] with an [Item].
      *
diff --git a/toolkit/compass/README.md b/toolkit/compass/README.md
index a9dc313d5..f37fef631 100644
--- a/toolkit/compass/README.md
+++ b/toolkit/compass/README.md
@@ -75,8 +75,8 @@ To configure the auto-hide behavior, pass in the `autoHide` parameter.
 ```kotlin
 // show the compass and pass the current mapRotation
 Compass(rotation = mapRotation, autoHide = false) {
-    // reset the ComposableMap viewpoint rotation to point north using the MapInterface
-    mapInterface.setViewpointRotation(0.0)
+    // reset the Map viewpoint rotation to point north using the MapViewProxy
+    mapViewProxy.setViewpointRotation(0.0)
 }
 ```
 
diff --git a/toolkit/compass/build.gradle.kts b/toolkit/compass/build.gradle.kts
index bd7b661b9..2bdb8707c 100644
--- a/toolkit/compass/build.gradle.kts
+++ b/toolkit/compass/build.gradle.kts
@@ -17,74 +17,13 @@
  */
 
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("artifact-deploy")
-    alias(libs.plugins.binary.compatibility.validator) apply true
+    alias(libs.plugins.arcgismaps.kotlin.toolkit)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.compass"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
-    defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt()
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    buildFeatures {
-        compose = true
-    }
-    // If this were not an android project, we would just write `explicitApi()` in the Kotlin scope.
-    // but as an android project could write `freeCompilerArgs = listOf("-Xexplicit-api=strict")`
-    // in the kotlinOptions above, but that would enforce api rules on the test code, which we don't want.
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-        if ("Test" !in name) {
-            compilerOptions {
-                freeCompilerArgs.add("-Xexplicit-api=strict")
-            }
-        }
-    }
-
-    /**
-     * Configures the test report for connected (instrumented) tests to be copied to a central
-     * folder in the project's root directory.
-     */
-    @Suppress("UnstableApiUsage")
-    testOptions {
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        val connectedTestReportsPath: String by project
-        reportDir = "$connectedTestReportsPath/${project.name}"
-    }
-
-    publishing {
-        singleVariant("release") {
-            // This is the default variant.
-        }
-    }
 }
 
 dependencies {
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
+    // Module-specific dependencies go here
 }
diff --git a/toolkit/compass/src/main/java/com/arcgismaps/toolkit/compass/Compass.kt b/toolkit/compass/src/main/java/com/arcgismaps/toolkit/compass/Compass.kt
index 7db98dd72..723a047ba 100644
--- a/toolkit/compass/src/main/java/com/arcgismaps/toolkit/compass/Compass.kt
+++ b/toolkit/compass/src/main/java/com/arcgismaps/toolkit/compass/Compass.kt
@@ -45,7 +45,7 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 
 /**
- * Creates a Compass that shows the geographic orientation of a [ComposableMap] using the
+ * Creates a Compass that shows the geographic orientation of a Map using the
  * [rotation] property. By default, the compass hides when the map is pointing to its default
  * North orientation. This auto hide behavior can be changed using the [autoHide] property.
  * Size and color of the icon can be customized using [size] and [color]. Resetting behavior can
diff --git a/toolkit/composable-map/.gitignore b/toolkit/composable-map/.gitignore
deleted file mode 100644
index 796b96d1c..000000000
--- a/toolkit/composable-map/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/toolkit/composable-map/README.md b/toolkit/composable-map/README.md
deleted file mode 100644
index e3c73b4cc..000000000
--- a/toolkit/composable-map/README.md
+++ /dev/null
@@ -1,47 +0,0 @@
- # Composable Map[Deprecated]
- This module is deprecated. Use the [GeoView Compose Module](/toolkit/geoview-compose) instead.
-
-## DuplexFlow
-
-Some properties on the `ComposableMap` that need to be observed and updated are exposed via a `DuplexFlow`.
-This section provides its proper usage.
-
-When it becomes necessary to both read and set a property such as `Map`'s rotation using `MapView.mapRotation` to read and `MapView.setViewpointRotation`
-to set the value, it would result in a feedback loop if a single State is used to achieve this behavior.
-The `DuplexFlow` is designed to solve this problem by encapsulating two distinct `Flow`'s who are individually responsible for Reading a property value and setting a property value. 
-
-You should only emit/push to the READ flow, values that you intend to read. 
-Similarly, only push values to the WRITE flow that are intended to be set on the MapView. 
-There is no piping mechanism that feeds across the duplex. Hence the setter is usually exposed as a SharedFlow with a replay cache of 1.
-
-### Usage
-
-```kotlin
-// create a private mutable backing property using the Factory MutableDuplexFlow()
-private val _property: MutableDuplexFlow<Type?> = MutableDuplexFlow(null)
-// cast it to an immutable DuplexFlow
-public val property: DuplexFlow<Type> = _property
-
-// to set value on the READ duplex flow
-_property.setValue(value = newValue, duplex = Duplex.Read)
-// to set value on the WRITE duplex flow
-_property.setValue(value = newValue, duplex = Duplex.Write)
-
-// to collect from the READ duplex flow
-suspend fun Foo() {
-    property.collect(Duplex.Read) { value ->
-        ....
-    }
-}
-
-// to collect from the WRITE duplex flow
-suspend fun Bar() {
-    property.collect(Duplex.Write) { value ->
-        ....
-    }
-}
-```
-
-
-
-
diff --git a/toolkit/composable-map/build.gradle.kts b/toolkit/composable-map/build.gradle.kts
index 8f9e84d89..5e60f2cd2 100644
--- a/toolkit/composable-map/build.gradle.kts
+++ b/toolkit/composable-map/build.gradle.kts
@@ -19,73 +19,17 @@
 logger.warn("WARNING: The module composable-map is deprecated. Please use the module geoview-compose instead.")
 
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
+    alias(libs.plugins.arcgismaps.kotlin.toolkit)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.composablemap"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
-    defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt()
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    buildFeatures {
-        compose = true
-    }
-    // If this were not an android project, we would just write `explicitApi()` in the Kotlin scope.
-    // but as an android project could write `freeCompilerArgs = listOf("-Xexplicit-api=strict")`
-    // in the kotlinOptions above, but that would enforce api rules on the test code, which we don't want.
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-        if ("Test" !in name) {
-            compilerOptions {
-                freeCompilerArgs.add("-Xexplicit-api=strict")
-            }
-        }
-    }
-    @Suppress("UnstableApiUsage")
-    testOptions {
-        targetSdk = libs.versions.compileSdk.get().toInt()
-    }
-
-    publishing {
-        singleVariant("release") {
-            // This is the default variant.
-        }
-    }
 }
 
-//https://youtrack.jetbrains.com/issue/KTIJ-21063
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class).all {
-    compilerOptions {
-        freeCompilerArgs.add("-Xcontext-receivers")
-    }
+toolkit {
+    releasable = false
 }
 
 dependencies {
-    api(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
+    // Module-specific dependencies go here
 }
diff --git a/toolkit/composable-map/consumer-rules.pro b/toolkit/composable-map/consumer-rules.pro
deleted file mode 100644
index e69de29bb..000000000
diff --git a/toolkit/composable-map/src/androidTest/java/com/arcgismaps/toolkit/composablemap/ComposableMapTests.kt b/toolkit/composable-map/src/androidTest/java/com/arcgismaps/toolkit/composablemap/ComposableMapTests.kt
deleted file mode 100644
index b6879770e..000000000
--- a/toolkit/composable-map/src/androidTest/java/com/arcgismaps/toolkit/composablemap/ComposableMapTests.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *
- *  Copyright 2023 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.
- *
- */
-
-@file:Suppress("DEPRECATION")
-
-package com.arcgismaps.toolkit.composablemap
-
-import androidx.compose.material3.Card
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.semantics.contentDescription
-import androidx.compose.ui.semantics.semantics
-import androidx.compose.ui.test.assert
-import androidx.compose.ui.test.assertIsDisplayed
-import androidx.compose.ui.test.hasContentDescription
-import androidx.compose.ui.test.hasParent
-import androidx.compose.ui.test.junit4.createComposeRule
-import androidx.compose.ui.test.onChildAt
-import androidx.compose.ui.test.onNodeWithContentDescription
-import com.arcgismaps.mapping.ArcGISMap
-import org.junit.Rule
-import org.junit.Test
-
-class ComposableMapTests {
-
-    @get:Rule
-    val composeTestRule = createComposeRule()
-
-    @Test
-    fun testComposableMapLayout() {
-        val mockMapInterface = MapInterface(ArcGISMap())
-
-        composeTestRule.setContent {
-            ComposableMap(mapInterface = mockMapInterface) {
-                Card(modifier = Modifier.semantics { contentDescription = "Card" }) {}
-            }
-        }
-        val mapContainerSemanticLabel = "MapContainer"
-        val mapViewSemanticLabel = "MapView"
-        val contentSemanticLabel = "Content"
-
-        val mapContainer = composeTestRule.onNodeWithContentDescription(mapContainerSemanticLabel)
-        mapContainer.assertIsDisplayed()
-        mapContainer.onChildAt(0).assert(hasContentDescription(mapViewSemanticLabel))
-        mapContainer.onChildAt(1).assert(hasContentDescription(contentSemanticLabel))
-
-        composeTestRule.onNodeWithContentDescription("Card")
-            .assert(hasParent(hasContentDescription(contentSemanticLabel)))
-    }
-}
diff --git a/toolkit/composable-map/src/androidTest/java/com/arcgismaps/toolkit/composablemap/DuplexFlowStateTests.kt b/toolkit/composable-map/src/androidTest/java/com/arcgismaps/toolkit/composablemap/DuplexFlowStateTests.kt
deleted file mode 100644
index 6a7e21b61..000000000
--- a/toolkit/composable-map/src/androidTest/java/com/arcgismaps/toolkit/composablemap/DuplexFlowStateTests.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *
- *  Copyright 2023 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.
- *
- */
-
-@file:Suppress("DEPRECATION")
-
-package com.arcgismaps.toolkit.composablemap
-
-import androidx.compose.material3.Text
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.test.junit4.createComposeRule
-import androidx.compose.ui.test.onNodeWithText
-import org.junit.Rule
-import org.junit.Test
-
-class DuplexFlowStateTests {
-
-    @get:Rule
-    val composeTestRule = createComposeRule()
-
-    @Test
-    fun testStateInReadFlow() {
-        val duplexFlow = MutableDuplexFlow(0)
-        val flowType = DuplexFlow.Type.Read
-
-        composeTestRule.setContent {
-            val state by duplexFlow.collectAsState(flowType = flowType)
-            Text(state.toString())
-        }
-
-        composeTestRule.onNodeWithText("0").assertExists()
-        duplexFlow.setValue(100, flowType)
-        // assertion triggers a recomposition
-        composeTestRule.onNodeWithText("100").assertExists()
-    }
-
-    @Test
-    fun testStateInWriteFlow() {
-        val duplexFlow = MutableDuplexFlow(0)
-        val flowType = DuplexFlow.Type.Write
-
-        composeTestRule.setContent {
-            val state by duplexFlow.collectAsState(flowType = flowType)
-            Text(state.toString())
-        }
-
-        composeTestRule.onNodeWithText("0").assertExists()
-        duplexFlow.setValue(100, flowType)
-        // assertion triggers a recomposition
-        composeTestRule.onNodeWithText("100").assertExists()
-    }
-}
diff --git a/toolkit/composable-map/src/main/AndroidManifest.xml b/toolkit/composable-map/src/main/AndroidManifest.xml
deleted file mode 100644
index 9b94d167c..000000000
--- a/toolkit/composable-map/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~
-  ~  Copyright 2023 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.
-  ~
-  -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-</manifest>
diff --git a/toolkit/composable-map/src/main/java/com/arcgismaps/toolkit/composablemap/ComposableMap.kt b/toolkit/composable-map/src/main/java/com/arcgismaps/toolkit/composablemap/ComposableMap.kt
deleted file mode 100644
index 9dc6f50c3..000000000
--- a/toolkit/composable-map/src/main/java/com/arcgismaps/toolkit/composablemap/ComposableMap.kt
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- *
- *  Copyright 2023 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.
- *
- */
-
-@file:Suppress("DEPRECATION")
-
-package com.arcgismaps.toolkit.composablemap
-
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalLifecycleOwner
-import androidx.compose.ui.semantics.contentDescription
-import androidx.compose.ui.semantics.semantics
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.viewinterop.AndroidView
-import com.arcgismaps.mapping.ViewpointType
-import com.arcgismaps.mapping.view.MapView
-import kotlinx.coroutines.launch
-
-@Deprecated("Use the new composable MapView function available in the geoview-compose toolkit component instead")
-@Composable
-public fun ComposableMap(
-    mapInterface: MapInterface,
-    modifier: Modifier = Modifier,
-    content: @Composable () -> Unit = {},
-) {
-    val context = LocalContext.current
-    val coroutineScope = rememberCoroutineScope()
-    val lifecycleOwner = LocalLifecycleOwner.current
-
-    val map by mapInterface.map.collectAsState()
-    val insets by mapInterface.insets.collectAsState()
-    val mapView = remember {
-        MapView(context).also { view ->
-            with(view) {
-                with(coroutineScope) {
-                    launch {
-                        view.onDown.collect {
-                            mapInterface.onDown(it)
-                        }
-                    }
-                    launch {
-                        view.onUp.collect {
-                            mapInterface.onUp(it)
-                        }
-                    }
-                    launch {
-                        view.onSingleTapConfirmed.collect {
-                            mapInterface.onSingleTapConfirmed(it)
-                        }
-                    }
-                    launch {
-                        view.onDoubleTap.collect {
-                            mapInterface.onDoubleTap(it)
-                        }
-                    }
-                    launch {
-                        view.onLongPress.collect {
-                            mapInterface.onLongPress(it)
-                        }
-                    }
-                    launch {
-                        view.onTwoPointerTap.collect {
-                            mapInterface.onTwoPointerTap(it)
-                        }
-                    }
-                    launch {
-                        view.onPan.collect {
-                            mapInterface.onPan(it)
-                        }
-                    }
-                    launch {
-                        view.mapRotation.collect {
-                            mapInterface.onViewpointRotationChanged(it)
-                        }
-                    }
-                    launch {
-                        view.viewpointChanged.collect {
-                            view.getCurrentViewpoint(ViewpointType.CenterAndScale)?.let {
-                                mapInterface.onViewpointChanged(it)
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    mapView.map = map
-    mapView.setViewInsets(
-        left = insets.start,
-        right = insets.end,
-        top = insets.top,
-        bottom = insets.bottom
-    )
-
-    LaunchedEffect(Unit) {
-        launch {
-            mapInterface.mapRotation.collect(DuplexFlow.Type.Write) {
-                mapView.setViewpointRotation(it)
-            }
-        }
-        launch {
-            mapInterface.viewpoint.collect(DuplexFlow.Type.Write) {
-                it?.let {
-                    mapView.setViewpoint(it)
-                }
-            }
-        }
-    }
-    
-    DisposableEffect(Unit) {
-        onDispose {
-            mapView.onDestroy(lifecycleOwner)
-        }
-    }
-
-    DisposableEffect(lifecycleOwner) {
-        lifecycleOwner.lifecycle.addObserver(mapView)
-        onDispose {
-            lifecycleOwner.lifecycle.removeObserver(mapView)
-        }
-    }
-    
-    Box(modifier = modifier.semantics {
-        contentDescription = "MapContainer"
-    }) {
-        AndroidView(modifier = Modifier
-            .fillMaxSize()
-            .semantics {
-                contentDescription = "MapView"
-            }, factory = { mapView })
-        Box(modifier = Modifier
-            .fillMaxSize()
-            .padding(
-                start = insets.start.dp,
-                end = insets.end.dp,
-                top = insets.top.dp,
-                bottom = insets.bottom.dp
-            )
-            .semantics {
-                contentDescription = "Content"
-            }) {
-            content()
-        }
-    }
-}
diff --git a/toolkit/composable-map/src/main/java/com/arcgismaps/toolkit/composablemap/DuplexFlow.kt b/toolkit/composable-map/src/main/java/com/arcgismaps/toolkit/composablemap/DuplexFlow.kt
deleted file mode 100644
index 54695ff24..000000000
--- a/toolkit/composable-map/src/main/java/com/arcgismaps/toolkit/composablemap/DuplexFlow.kt
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- *
- *  Copyright 2023 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.
- *
- */
-
-@file:Suppress("DEPRECATION")
-
-package com.arcgismaps.toolkit.composablemap
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.State
-import androidx.compose.runtime.collectAsState
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.flow.FlowCollector
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.MutableStateFlow
-
-/**
- * A flow data structure that encapsulates two distinct flows. This provides a single structure
- * that can be used to read property values using the [DuplexFlow.Type.Read] flow and write
- * property values using the [DuplexFlow.Type.Write] flow.
- *
- * The [DuplexFlow.Type.Read] flow is backed by a [MutableStateFlow]. Only values that are intended
- * to be read should be pushed to the READ flow. The [DuplexFlow.Type.Write] flow is
- * backed by a [MutableSharedFlow] with a replay cache of 1. Only values that are intended to be set
- * should be pushed to the WRITE flow. There is no piping mechanism that feeds across the
- * duplex, hence each flow is distinct.
- *
- * A [DuplexFlow] is read-only. See [MutableDuplexFlow] that provides a setter.
- *
- * Use the factory function MutableDuplexFlow(initialValue: T) to create an instance.
- */
-@Deprecated("Deprecated without replacement")
-public interface DuplexFlow<T> {
-
-    /**
-     * The duplex flow type for a [DuplexFlow].
-     */
-    public enum class Type {
-        Read,
-        Write
-    }
-
-    /**
-     * Returns the current value of the [flowType].
-     */
-    public fun getValue(flowType: Type) : T?
-
-    /**
-     * Accepts the given [collector] and emits values into it on the [flowType] provided.
-     */
-    public suspend fun collect(flowType: Type, collector: FlowCollector<T>)
-
-    /**
-     * Collects values from the [flowType] and its underlying flow and represents its latest value
-     * via State.
-     */
-    @Composable
-    public fun collectAsState(flowType: Type): State<T>
-}
-
-/**
- * A mutable [DuplexFlow] that provides a setter for the value of each [DuplexFlow.Type].
- */
-@Deprecated("Deprecated without replacement")
-public interface MutableDuplexFlow<T> : DuplexFlow<T> {
-
-    /**
-     * Sets the current value for the [flowType].
-     */
-    @Deprecated("Deprecated without replacement")
-    public fun setValue(value: T, flowType: DuplexFlow.Type)
-}
-
-/**
- * Creates a [MutableDuplexFlow] with the given [initialValue]. The [initialValue] is set for
- * both the [DuplexFlow.Type]'s.
- */
-@Deprecated("Deprecated without replacement")
-public fun <T> MutableDuplexFlow(initialValue: T): MutableDuplexFlow<T> = DuplexFlowImpl(initialValue)
-
-/**
- * Implementation for a [MutableDuplexFlow].
- */
-internal class DuplexFlowImpl<T>(private val initialValue: T) : MutableDuplexFlow<T> {
-
-    private val readerFlow: MutableStateFlow<T> = MutableStateFlow(initialValue)
-    private val writerFlow: MutableSharedFlow<T> = MutableSharedFlow(replay = 1)
-
-    init {
-        writerFlow.tryEmit(initialValue)
-    }
-
-    override fun getValue(flowType: DuplexFlow.Type): T? {
-        return if (flowType == DuplexFlow.Type.Read) {
-            readerFlow.value
-        } else {
-            writerFlow.replayCache.firstOrNull()
-        }
-    }
-
-    override suspend fun collect(flowType: DuplexFlow.Type, collector: FlowCollector<T>): Nothing =
-        if (flowType == DuplexFlow.Type.Read) {
-            coroutineScope { readerFlow.collect(collector) }
-        } else {
-            coroutineScope { writerFlow.collect(collector) }
-        }
-
-    @Composable
-    override fun collectAsState(flowType: DuplexFlow.Type): State<T> =
-        if (flowType == DuplexFlow.Type.Read) {
-            readerFlow.collectAsState()
-        } else {
-            writerFlow.collectAsState(
-                initial = writerFlow.replayCache.firstOrNull() ?: initialValue
-            )
-        }
-
-    @Deprecated("Deprecated without replacement")
-    override fun setValue(value: T, flowType: DuplexFlow.Type) {
-        if (flowType == DuplexFlow.Type.Read) {
-            readerFlow.value = value
-        } else {
-            writerFlow.tryEmit(value)
-        }
-    }
-}
diff --git a/toolkit/composable-map/src/main/java/com/arcgismaps/toolkit/composablemap/MapInterface.kt b/toolkit/composable-map/src/main/java/com/arcgismaps/toolkit/composablemap/MapInterface.kt
deleted file mode 100644
index 72fa1f948..000000000
--- a/toolkit/composable-map/src/main/java/com/arcgismaps/toolkit/composablemap/MapInterface.kt
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- *
- *  Copyright 2023 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.
- *
- */
-
-@file:Suppress("DEPRECATION")
-
-package com.arcgismaps.toolkit.composablemap
-
-import com.arcgismaps.mapping.ArcGISMap
-import com.arcgismaps.mapping.Viewpoint
-import com.arcgismaps.mapping.view.DoubleTapEvent
-import com.arcgismaps.mapping.view.DownEvent
-import com.arcgismaps.mapping.view.LongPressEvent
-import com.arcgismaps.mapping.view.MapView
-import com.arcgismaps.mapping.view.PanChangeEvent
-import com.arcgismaps.mapping.view.SingleTapConfirmedEvent
-import com.arcgismaps.mapping.view.TwoPointerTapEvent
-import com.arcgismaps.mapping.view.UpEvent
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-
-@Deprecated("Deprecated without replacement")
-public data class MapInsets(
-    var start: Double = 0.0,
-    var end: Double = 0.0,
-    var top: Double = 0.0,
-    var bottom: Double = 0.0
-)
-
-/**
- * An interface for providing business logic to ComposableMap touch events.
- * These methods are called in the [ComposableMap] function in the context of
- * a [MapView] and a `CoroutineScope`, their public API are available
- * to use in implementations of these functions with no reference required.
- *
- * ```
- * context(MapView, CoroutineScope) override fun onSingleTapConfirmed(singleTapEvent: SingleTapConfirmedEvent) {
- *     // launch will be called on the CoroutineScope provided by context. This CoroutineScope will be cancelled
- *     // when the ComposableMap leaves the composition.
- *     launch {
- *         // setBookmark will be called on the MapView provided by context.
- *         setBookmark(null)
- *     }
- * }
- * ```
- *
- * @see ComposableMap
- */
-@Deprecated("Deprecated without replacement")
-public interface MapEvents {
-    /**
-     * Support for down events on [ComposableMap]
-     */
-    context(MapView, CoroutineScope) public fun onDown(downEvent: DownEvent) {}
-
-    /**
-     * Support for up events on [ComposableMap]
-     */
-    context(MapView, CoroutineScope) public fun onUp(upEvent: UpEvent) {}
-
-    /**
-     * Support for single tap events on [ComposableMap]
-     */
-    context(MapView, CoroutineScope) public fun onSingleTapConfirmed(singleTapEvent: SingleTapConfirmedEvent) {}
-
-    /**
-     * Support for double tap events on [ComposableMap]
-     */
-    context(MapView, CoroutineScope) public fun onDoubleTap(doubleTapEvent: DoubleTapEvent) {}
-
-    /**
-     * Support for long press events on [ComposableMap]
-     */
-    context(MapView, CoroutineScope) public fun onLongPress(longPressEvent: LongPressEvent) {}
-
-    /**
-     * Support for two pointer tap events on [ComposableMap]
-     */
-    context(MapView, CoroutineScope) public fun onTwoPointerTap(twoPointerTapEvent: TwoPointerTapEvent) {}
-
-    /**
-     * Support for pan events on [ComposableMap]
-     */
-    context(MapView, CoroutineScope) public fun onPan(panEvent: PanChangeEvent) {}
-
-    /**
-     * Sets the [ComposableMap] current viewpoint to the given [viewpoint]
-     */
-    public fun setViewpoint(viewpoint: Viewpoint)
-
-    /**
-     * Callback for when the current [viewpoint] of a [ComposableMap] has changed
-     */
-    public fun onViewpointChanged(viewpoint: Viewpoint)
-
-    /**
-     * Sets the [ComposableMap] current viewpoint's rotation to the given [angleDegrees]
-     */
-    public fun setViewpointRotation(angleDegrees: Double)
-
-    /**
-     * Callback for when the current viewpoint rotation of a [ComposableMap] has changed to
-     * [angleDegrees]
-     */
-    public fun onViewpointRotationChanged(angleDegrees: Double)
-
-    /**
-     * Sets the [ComposableMap] insets to the given [mapInsets]
-     */
-    public fun setInsets(mapInsets: MapInsets)
-
-    /**
-     * Sets the given [map] on the [ComposableMap]
-     */
-    public fun setMap(map: ArcGISMap)
-}
-
-/**
- * An interface for consumption by [ComposableMap]. This interface represents the state needed
- * for [ComposableMap] to re/compose.
- */
-@Deprecated("Deprecated without replacement")
-public interface MapInterface : MapEvents {
-    /**
-     * The model for [ComposableMap]
-     */
-    public val map: StateFlow<ArcGISMap>
-
-    /**
-     * Insets to apply to the Box which contains the [ComposableMap]
-     */
-    public val insets: StateFlow<MapInsets>
-
-    /**
-     * The [Viewpoint] from which the [ComposableMap] is drawn.
-     */
-    public val viewpoint: DuplexFlow<Viewpoint?>
-
-    /**
-     * The current rotation value of the [ComposableMap].
-     */
-    public val mapRotation: DuplexFlow<Double>
-}
-
-/**
- * Factory function for the default implementation of [MapInterface]
- */
-@Deprecated("Deprecated without replacement")
-public fun MapInterface(arcGISMap: ArcGISMap, mapInsets: MapInsets = MapInsets()): MapInterface =
-    MapInterfaceImpl(arcGISMap, mapInsets)
-
-/**
- * A default implementation for the [MapInterface]
- */
-@Deprecated("Deprecated without replacement")
-public class MapInterfaceImpl(
-    arcGISMap: ArcGISMap,
-    mapInsets: MapInsets = MapInsets()
-) : MapInterface {
-
-    private val _map: MutableStateFlow<ArcGISMap> = MutableStateFlow(arcGISMap)
-    override val map: StateFlow<ArcGISMap> = _map.asStateFlow()
-
-    private val _insets: MutableStateFlow<MapInsets> = MutableStateFlow(mapInsets)
-    override val insets: StateFlow<MapInsets> = _insets.asStateFlow()
-
-    private val _viewpoint: MutableDuplexFlow<Viewpoint?> = MutableDuplexFlow(null)
-    override val viewpoint: DuplexFlow<Viewpoint?> = _viewpoint
-
-    private val _mapRotation: MutableDuplexFlow<Double> = MutableDuplexFlow(0.0)
-    override val mapRotation: DuplexFlow<Double> = _mapRotation
-
-    override fun setViewpoint(viewpoint: Viewpoint) {
-        // set the property value using the WRITE flow type
-        _viewpoint.setValue(viewpoint, DuplexFlow.Type.Write)
-    }
-
-    override fun onViewpointChanged(viewpoint: Viewpoint) {
-        // update the property value on the READ flow type
-        _viewpoint.setValue(viewpoint, DuplexFlow.Type.Read)
-    }
-
-    override fun setViewpointRotation(angleDegrees: Double) {
-        // set the property value using the WRITE flow type
-        _mapRotation.setValue(angleDegrees, DuplexFlow.Type.Write)
-    }
-
-    override fun onViewpointRotationChanged(angleDegrees: Double) {
-        // update the property value on the READ flow type
-        _mapRotation.setValue(angleDegrees, DuplexFlow.Type.Read)
-    }
-
-    override fun setInsets(mapInsets: MapInsets) {
-        _insets.value = mapInsets
-    }
-
-    override fun setMap(map: ArcGISMap) {
-        _map.value = map
-    }
-}
diff --git a/toolkit/composable-map/src/test/java/com/arcgismaps/toolkit/composablemap/DuplexFlowTests.kt b/toolkit/composable-map/src/test/java/com/arcgismaps/toolkit/composablemap/DuplexFlowTests.kt
deleted file mode 100644
index 12fefa1a6..000000000
--- a/toolkit/composable-map/src/test/java/com/arcgismaps/toolkit/composablemap/DuplexFlowTests.kt
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- *
- *  Copyright 2023 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.
- *
- */
-
-package com.arcgismaps.toolkit.composablemap
-
-import com.google.common.truth.Truth.assertThat
-import kotlinx.coroutines.CoroutineStart
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
-
-import org.junit.Test
-
-@Suppress("DEPRECATION")
-class DuplexFlowTests {
-
-    @Test
-    fun `test READ duplex`() {
-        val duplexFlow = MutableDuplexFlow(0)
-        val flowType = DuplexFlow.Type.Read
-
-        assertThat(duplexFlow.getValue(flowType)).isNotNull()
-        assertThat(duplexFlow.getValue(flowType)).isEqualTo(0)
-
-        duplexFlow.setValue(1, flowType)
-        assertThat(duplexFlow.getValue(flowType)).isEqualTo(1)
-
-        duplexFlow.setValue(2, flowType)
-        duplexFlow.setValue(3, flowType)
-        assertThat(duplexFlow.getValue(flowType)).isEqualTo(3)
-    }
-
-    @Test
-    fun `test WRITE duplex`() {
-        val duplexFlow = MutableDuplexFlow(0)
-        val flowType = DuplexFlow.Type.Write
-
-        assertThat(duplexFlow.getValue(flowType)).isNotNull()
-        assertThat(duplexFlow.getValue(flowType)).isEqualTo(0)
-
-        duplexFlow.setValue(1, flowType)
-        assertThat(duplexFlow.getValue(flowType)).isEqualTo(1)
-
-        duplexFlow.setValue(2, flowType)
-        duplexFlow.setValue(3, flowType)
-        assertThat(duplexFlow.getValue(flowType)).isEqualTo(3)
-    }
-
-    @Test
-    fun `test collect on READ duplex`() = runBlocking {
-        val duplexFlow = MutableDuplexFlow(0)
-        val flowType = DuplexFlow.Type.Read
-        val list = mutableListOf<Int>()
-        val job = launch(start = CoroutineStart.UNDISPATCHED) {
-            duplexFlow.collect(flowType) {
-                list.add(it)
-            }
-        }
-
-        val range = 1..10
-        for (i in range) {
-            duplexFlow.setValue(i, flowType)
-            delay(100)
-        }
-
-        assertThat(list).hasSize(range.count() + 1)
-        assertThat(list).containsExactlyElementsIn(0..10).inOrder()
-        job.cancel()
-    }
-
-    @Test
-    fun `test collect on WRITE duplex`() = runBlocking {
-        val duplexFlow = MutableDuplexFlow(0)
-        val flowType = DuplexFlow.Type.Write
-        val list = mutableListOf<Int>()
-        val job = launch(start = CoroutineStart.UNDISPATCHED) {
-            duplexFlow.collect(flowType) {
-                list.add(it)
-            }
-        }
-
-        val range = 1..10
-        for (i in range) {
-            duplexFlow.setValue(i, flowType)
-            delay(100)
-        }
-
-        assertThat(list).hasSize(range.count() + 1)
-        assertThat(list).containsExactlyElementsIn(0..10).inOrder()
-        job.cancel()
-    }
-}
diff --git a/toolkit/featureforms/build.gradle.kts b/toolkit/featureforms/build.gradle.kts
index 240711e09..a2d9aed3c 100644
--- a/toolkit/featureforms/build.gradle.kts
+++ b/toolkit/featureforms/build.gradle.kts
@@ -17,14 +17,8 @@
  */
 
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("artifact-deploy")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-    id("kotlin-parcelize")
-    alias(libs.plugins.binary.compatibility.validator) apply true
-    alias(libs.plugins.kotlin.serialization) apply true
+    alias(libs.plugins.arcgismaps.kotlin.toolkit)
+    alias(libs.plugins.gradle.secrets)
 }
 
 secrets {
@@ -33,8 +27,13 @@ secrets {
 
 android {
     namespace = "com.arcgismaps.toolkit.featureforms"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
+    buildFeatures {
+        buildConfig = true
+    }
+    kotlinOptions {
+        // This flag is the same as applying '@ConsistentCopyVisibility' annotation to all data classes in the module.
+        freeCompilerArgs = freeCompilerArgs + listOf("-Xconsistent-data-class-copy-visibility")
+    }
     // Lint crashes on the latest Android studio
     // (Bug with Android Studio Meerkat | 2024.3.1)
     // TODO: Remove this when Android Studio lint checker is fixed
@@ -44,59 +43,6 @@ android {
         disable += "MissingTranslation"
         disable += "MissingQuantity"
     }
-    
-    defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt()
-        
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-    
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-        // This flag is the same as applying '@ConsistentCopyVisibility' annotation to all data classes in the module.
-        freeCompilerArgs = freeCompilerArgs + listOf("-Xconsistent-data-class-copy-visibility")
-    }
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-    // If this were not an android project, we would just write `explicitApi()` in the Kotlin scope.
-    // but as an android project could write `freeCompilerArgs = listOf("-Xexplicit-api=strict")`
-    // in the kotlinOptions above, but that would enforce api rules on the test code, which we don't want.
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-        if ("Test" !in name) {
-            compilerOptions {
-                freeCompilerArgs.add("-Xexplicit-api=strict")
-            }
-        }
-    }
-
-    /**
-     * Configures the test report for connected (instrumented) tests to be copied to a central
-     * folder in the project's root directory.
-     */
-    @Suppress("UnstableApiUsage")
-    testOptions {
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        val connectedTestReportsPath: String by project
-        reportDir = "$connectedTestReportsPath/${project.name}"
-    }
-
-    publishing {
-        singleVariant("release") {
-            // This is the default variant.
-        }
-    }
 }
 
 apiValidation {
@@ -138,29 +84,16 @@ apiValidation {
     ignoredClasses.addAll(composableSingletons)
 }
 
-
 dependencies {
-    api(arcgis.mapsSdk)
+    // Module-specific dependencies go here
     implementation(libs.bundles.commonmark)
     implementation(platform(libs.coil.bom))
     implementation(libs.coil.compose)
-    implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.foundation)
     implementation(libs.androidx.window)
     implementation(libs.androidx.window.core)
-    implementation(libs.bundles.composeCore)
     implementation(libs.androidx.compose.ui.util)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.material.icons)
     implementation(libs.bundles.camerax)
     implementation(libs.mlkit.barcode.scanning)
     implementation(libs.androidx.compose.navigation)
-    implementation(libs.kotlinx.serialization.json)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(libs.truth)
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.bundles.composeTest)
-    androidTestImplementation(libs.bundles.androidXTest)
-    debugImplementation(libs.bundles.debug)
 }
diff --git a/toolkit/featureforms/src/main/java/com/arcgismaps/toolkit/featureforms/internal/components/codedvalue/ComboBoxDialog.kt b/toolkit/featureforms/src/main/java/com/arcgismaps/toolkit/featureforms/internal/components/codedvalue/ComboBoxDialog.kt
index 59847a224..0e79f0636 100644
--- a/toolkit/featureforms/src/main/java/com/arcgismaps/toolkit/featureforms/internal/components/codedvalue/ComboBoxDialog.kt
+++ b/toolkit/featureforms/src/main/java/com/arcgismaps/toolkit/featureforms/internal/components/codedvalue/ComboBoxDialog.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+@file:Suppress("DEPRECATION")
 package com.arcgismaps.toolkit.featureforms.internal.components.codedvalue
 
 import android.content.res.Configuration
diff --git a/toolkit/featureforms/src/main/java/com/arcgismaps/toolkit/featureforms/internal/utils/Dialog.kt b/toolkit/featureforms/src/main/java/com/arcgismaps/toolkit/featureforms/internal/utils/Dialog.kt
index 008769ddc..dfaab1ac0 100644
--- a/toolkit/featureforms/src/main/java/com/arcgismaps/toolkit/featureforms/internal/utils/Dialog.kt
+++ b/toolkit/featureforms/src/main/java/com/arcgismaps/toolkit/featureforms/internal/utils/Dialog.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+@file:Suppress("DEPRECATION")
 package com.arcgismaps.toolkit.featureforms.internal.utils
 
 import android.content.Context
diff --git a/toolkit/geoview-compose/README.md b/toolkit/geoview-compose/README.md
index 991adad8c..3783a9389 100644
--- a/toolkit/geoview-compose/README.md
+++ b/toolkit/geoview-compose/README.md
@@ -136,7 +136,8 @@ MapView(
                 colorScheme = CalloutDefaults.colors(
                     borderColor = MaterialTheme.colorScheme.outlineVariant,
                     backgroundColor = MaterialTheme.colorScheme.background
-                )
+                ),
+                leaderPosition = LeaderPosition.Automatic,
                 geoElement = selectedGeoElement,
                 tapLocation = tapLocation
             ) {
@@ -149,7 +150,7 @@ MapView(
 )
 ```
 
-An example of how to use the Callout on a point or geo-element is available in the [MapView Callout App](../../microapps/MapViewCalloutApp/README.md).
+An example of how to use the Callout on a point or geo-element is available in the [Callout App](../../microapps/CalloutApp/README.md).
 
 ### Display an OverviewMap
 
@@ -242,7 +243,6 @@ Other microapps that demonstrate various workflows with the composable `MapView`
 - [SceneView Analysis Overlay App](../../microapps/SceneViewAnalysisOverlayApp/README.md) demonstrates the use of `AnalysisOverlay`
 - [SceneView Camera Controller App](../../microapps/SceneViewCameraControllerApp/README.md) demonstrates the use of the `CameraController`
 - [SceneView Lighting Options App](../../microapps/SceneViewLightingOptionsApp/README.md) demonstrates the use of various lighting options with the `SceneView`
-- [MapView CalloutApp](../../microapps/MapViewCalloutApp/README.md) demonstrates the use of Callout with the `MapView`
-- [SceneView CalloutApp](../../microapps/SceneViewCalloutApp/README.md) demonstrates the use of Callout with the `SceneView`
+- [CalloutApp](../../microapps/CalloutApp/README.md) demonstrates the use of Callout with the composable `MapView` or `SceneView`
 
 
diff --git a/toolkit/geoview-compose/api/geoview-compose.api b/toolkit/geoview-compose/api/geoview-compose.api
index 2baff8303..5e8bdfb47 100644
--- a/toolkit/geoview-compose/api/geoview-compose.api
+++ b/toolkit/geoview-compose/api/geoview-compose.api
@@ -23,8 +23,87 @@ public abstract class com/arcgismaps/toolkit/geoviewcompose/GeoViewProxy {
 public abstract class com/arcgismaps/toolkit/geoviewcompose/GeoViewScope {
 	public static final field $stable I
 	public synthetic fun <init> (Lcom/arcgismaps/mapping/view/GeoView;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun Callout (Lcom/arcgismaps/mapping/GeoElement;Landroidx/compose/ui/Modifier;Lcom/arcgismaps/geometry/Point;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutColors;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutShapes;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
-	public final fun Callout-jHo2IpA (Lcom/arcgismaps/geometry/Point;Landroidx/compose/ui/Modifier;JZLcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutColors;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutShapes;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+	public final fun Callout (Lcom/arcgismaps/mapping/GeoElement;Landroidx/compose/ui/Modifier;Lcom/arcgismaps/geometry/Point;Lcom/arcgismaps/toolkit/geoviewcompose/LeaderPosition;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutColors;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutShapes;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+	public final synthetic fun Callout (Lcom/arcgismaps/mapping/GeoElement;Landroidx/compose/ui/Modifier;Lcom/arcgismaps/geometry/Point;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutColors;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutShapes;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+	public final fun Callout-NZnvHFc (Lcom/arcgismaps/geometry/Point;Landroidx/compose/ui/Modifier;JLcom/arcgismaps/toolkit/geoviewcompose/LeaderPosition;ZLcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutColors;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutShapes;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+	public final synthetic fun Callout-jHo2IpA (Lcom/arcgismaps/geometry/Point;Landroidx/compose/ui/Modifier;JZLcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutColors;Lcom/arcgismaps/toolkit/geoviewcompose/theme/CalloutShapes;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+}
+
+public abstract class com/arcgismaps/toolkit/geoviewcompose/LeaderPosition {
+	public static final field $stable I
+	public synthetic fun <init> (ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
+public final class com/arcgismaps/toolkit/geoviewcompose/LeaderPosition$Automatic : com/arcgismaps/toolkit/geoviewcompose/LeaderPosition {
+	public static final field $stable I
+	public static final field INSTANCE Lcom/arcgismaps/toolkit/geoviewcompose/LeaderPosition$Automatic;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/arcgismaps/toolkit/geoviewcompose/LeaderPosition$LeftMiddle : com/arcgismaps/toolkit/geoviewcompose/LeaderPosition {
+	public static final field $stable I
+	public static final field INSTANCE Lcom/arcgismaps/toolkit/geoviewcompose/LeaderPosition$LeftMiddle;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/arcgismaps/toolkit/geoviewcompose/LeaderPosition$LowerLeftCorner : com/arcgismaps/toolkit/geoviewcompose/LeaderPosition {
+	public static final field $stable I
+	public static final field INSTANCE Lcom/arcgismaps/toolkit/geoviewcompose/LeaderPosition$LowerLeftCorner;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/arcgismaps/toolkit/geoviewcompose/LeaderPosition$LowerMiddle : com/arcgismaps/toolkit/geoviewcompose/LeaderPosition {
+	public static final field $stable I
+	public static final field INSTANCE Lcom/arcgismaps/toolkit/geoviewcompose/LeaderPosition$LowerMiddle;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/arcgismaps/toolkit/geoviewcompose/LeaderPosition$LowerRightCorner : com/arcgismaps/toolkit/geoviewcompose/LeaderPosition {
+	public static final field $stable I
+	public static final field INSTANCE Lcom/arcgismaps/toolkit/geoviewcompose/LeaderPosition$LowerRightCorner;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/arcgismaps/toolkit/geoviewcompose/LeaderPosition$RightMiddle : com/arcgismaps/toolkit/geoviewcompose/LeaderPosition {
+	public static final field $stable I
+	public static final field INSTANCE Lcom/arcgismaps/toolkit/geoviewcompose/LeaderPosition$RightMiddle;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/arcgismaps/toolkit/geoviewcompose/LeaderPosition$UpperLeftCorner : com/arcgismaps/toolkit/geoviewcompose/LeaderPosition {
+	public static final field $stable I
+	public static final field INSTANCE Lcom/arcgismaps/toolkit/geoviewcompose/LeaderPosition$UpperLeftCorner;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/arcgismaps/toolkit/geoviewcompose/LeaderPosition$UpperMiddle : com/arcgismaps/toolkit/geoviewcompose/LeaderPosition {
+	public static final field $stable I
+	public static final field INSTANCE Lcom/arcgismaps/toolkit/geoviewcompose/LeaderPosition$UpperMiddle;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/arcgismaps/toolkit/geoviewcompose/LeaderPosition$UpperRightCorner : com/arcgismaps/toolkit/geoviewcompose/LeaderPosition {
+	public static final field $stable I
+	public static final field INSTANCE Lcom/arcgismaps/toolkit/geoviewcompose/LeaderPosition$UpperRightCorner;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
 }
 
 public final class com/arcgismaps/toolkit/geoviewcompose/MapViewDefaults {
@@ -35,7 +114,6 @@ public final class com/arcgismaps/toolkit/geoviewcompose/MapViewDefaults {
 }
 
 public final class com/arcgismaps/toolkit/geoviewcompose/MapViewKt {
-	public static final synthetic fun MapView (Lcom/arcgismaps/mapping/ArcGISMap;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lcom/arcgismaps/toolkit/geoviewcompose/ViewpointPersistence;Ljava/util/List;Lcom/arcgismaps/mapping/view/LocationDisplay;Lcom/arcgismaps/mapping/view/geometryeditor/GeometryEditor;Lcom/arcgismaps/toolkit/geoviewcompose/MapViewProxy;Lcom/arcgismaps/mapping/view/MapViewInteractionOptions;Lcom/arcgismaps/mapping/view/ViewLabelProperties;Lcom/arcgismaps/mapping/view/SelectionProperties;Landroidx/compose/foundation/layout/PaddingValues;Lcom/arcgismaps/mapping/view/Grid;Lcom/arcgismaps/mapping/view/BackgroundGrid;Lcom/arcgismaps/mapping/view/WrapAroundMode;ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lcom/arcgismaps/mapping/TimeExtent;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;IIIIII)V
 	public static final fun MapView (Lcom/arcgismaps/mapping/ArcGISMap;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lcom/arcgismaps/toolkit/geoviewcompose/ViewpointPersistence;Ljava/util/List;Ljava/util/List;Lcom/arcgismaps/mapping/view/LocationDisplay;Lcom/arcgismaps/mapping/view/geometryeditor/GeometryEditor;Lcom/arcgismaps/toolkit/geoviewcompose/MapViewProxy;Lcom/arcgismaps/mapping/view/MapViewInteractionOptions;Lcom/arcgismaps/mapping/view/ViewLabelProperties;Lcom/arcgismaps/mapping/view/SelectionProperties;Landroidx/compose/foundation/layout/PaddingValues;Lcom/arcgismaps/mapping/view/Grid;Lcom/arcgismaps/mapping/view/BackgroundGrid;Lcom/arcgismaps/mapping/view/WrapAroundMode;ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lcom/arcgismaps/mapping/TimeExtent;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;IIIIIII)V
 	public static final fun rememberLocationDisplay (Ljava/lang/Object;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)Lcom/arcgismaps/mapping/view/LocationDisplay;
 }
@@ -72,7 +150,8 @@ public final class com/arcgismaps/toolkit/geoviewcompose/SceneViewDefaults {
 }
 
 public final class com/arcgismaps/toolkit/geoviewcompose/SceneViewKt {
-	public static final fun SceneView-DjQMdAY (Lcom/arcgismaps/mapping/ArcGISScene;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Ljava/util/List;Lcom/arcgismaps/toolkit/geoviewcompose/SceneViewProxy;Lcom/arcgismaps/mapping/view/SceneViewInteractionOptions;Lcom/arcgismaps/mapping/view/ViewLabelProperties;Lcom/arcgismaps/mapping/view/SelectionProperties;ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lcom/arcgismaps/mapping/view/CameraController;Ljava/util/List;Ljava/util/List;Lcom/arcgismaps/mapping/view/AtmosphereEffect;Lcom/arcgismaps/mapping/TimeExtent;Lkotlin/jvm/functions/Function1;Lcom/arcgismaps/mapping/view/SpaceEffect;Ljava/time/Instant;Lcom/arcgismaps/mapping/view/LightingMode;JLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;IIIIII)V
+	public static final fun SceneView-8uDLsko (Lcom/arcgismaps/mapping/ArcGISScene;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Ljava/util/List;Lcom/arcgismaps/toolkit/geoviewcompose/SceneViewProxy;Lcom/arcgismaps/mapping/view/SceneViewInteractionOptions;Lcom/arcgismaps/mapping/view/ViewLabelProperties;Lcom/arcgismaps/mapping/view/SelectionProperties;Lcom/arcgismaps/mapping/view/Grid;ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lcom/arcgismaps/mapping/view/CameraController;Ljava/util/List;Ljava/util/List;Lcom/arcgismaps/mapping/view/AtmosphereEffect;Lcom/arcgismaps/mapping/TimeExtent;Lkotlin/jvm/functions/Function1;Lcom/arcgismaps/mapping/view/SpaceEffect;Ljava/time/Instant;Lcom/arcgismaps/mapping/view/LightingMode;JLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;IIIIII)V
+	public static final synthetic fun SceneView-DjQMdAY (Lcom/arcgismaps/mapping/ArcGISScene;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Ljava/util/List;Lcom/arcgismaps/toolkit/geoviewcompose/SceneViewProxy;Lcom/arcgismaps/mapping/view/SceneViewInteractionOptions;Lcom/arcgismaps/mapping/view/ViewLabelProperties;Lcom/arcgismaps/mapping/view/SelectionProperties;ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lcom/arcgismaps/mapping/view/CameraController;Ljava/util/List;Ljava/util/List;Lcom/arcgismaps/mapping/view/AtmosphereEffect;Lcom/arcgismaps/mapping/TimeExtent;Lkotlin/jvm/functions/Function1;Lcom/arcgismaps/mapping/view/SpaceEffect;Ljava/time/Instant;Lcom/arcgismaps/mapping/view/LightingMode;JLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;IIIIII)V
 }
 
 public final class com/arcgismaps/toolkit/geoviewcompose/SceneViewProxy : com/arcgismaps/toolkit/geoviewcompose/GeoViewProxy {
diff --git a/toolkit/geoview-compose/build.gradle.kts b/toolkit/geoview-compose/build.gradle.kts
index ec4fb66c2..1f251e5fa 100644
--- a/toolkit/geoview-compose/build.gradle.kts
+++ b/toolkit/geoview-compose/build.gradle.kts
@@ -17,76 +17,13 @@
  */
 
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("artifact-deploy")
-    alias(libs.plugins.binary.compatibility.validator) apply true
+    alias(libs.plugins.arcgismaps.kotlin.toolkit)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.geoviewcompose"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
-    defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt()
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    buildFeatures {
-        compose = true
-    }
-    // If this were not an android project, we would just write `explicitApi()` in the Kotlin scope.
-    // but as an android project could write `freeCompilerArgs = listOf("-Xexplicit-api=strict")`
-    // in the kotlinOptions above, but that would enforce api rules on the test code, which we don't want.
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-        if ("Test" !in name) {
-            compilerOptions {
-                freeCompilerArgs.add("-Xexplicit-api=strict")
-            }
-        }
-    }
-
-    /**
-     * Configures the test report for connected (instrumented) tests to be copied to a central
-     * folder in the project's root directory.
-     */
-    @Suppress("UnstableApiUsage")
-    testOptions {
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        val connectedTestReportsPath: String by project
-        reportDir = "$connectedTestReportsPath/${project.name}"
-    }
-
-    publishing {
-        singleVariant("release") {
-            // This is the default variant.
-        }
-    }
 }
 
 dependencies {
-    api(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(libs.bundles.composeTest)
-    androidTestImplementation(libs.androidx.uiautomator)
-    debugImplementation(libs.bundles.debug)
+    // Module-specific dependencies go here
 }
diff --git a/toolkit/geoview-compose/src/main/java/com/arcgismaps/toolkit/geoviewcompose/GeoViewScope.kt b/toolkit/geoview-compose/src/main/java/com/arcgismaps/toolkit/geoviewcompose/GeoViewScope.kt
index d9b471913..8951291b6 100644
--- a/toolkit/geoview-compose/src/main/java/com/arcgismaps/toolkit/geoviewcompose/GeoViewScope.kt
+++ b/toolkit/geoview-compose/src/main/java/com/arcgismaps/toolkit/geoviewcompose/GeoViewScope.kt
@@ -17,6 +17,7 @@
 
 package com.arcgismaps.toolkit.geoviewcompose
 
+import android.graphics.RectF
 import android.util.DisplayMetrics
 import androidx.compose.animation.animateContentSize
 import androidx.compose.animation.core.AnimationVector2D
@@ -48,12 +49,13 @@ import androidx.compose.ui.graphics.Path
 import androidx.compose.ui.graphics.drawscope.Fill
 import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.layout.SubcomposeLayout
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.DpSize
+import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.unit.dp
 import com.arcgismaps.data.Feature
 import com.arcgismaps.geometry.AngularUnit
@@ -76,6 +78,7 @@ import com.arcgismaps.mapping.view.DrawStatus
 import com.arcgismaps.mapping.view.GeoView
 import com.arcgismaps.mapping.view.Graphic
 import com.arcgismaps.mapping.view.GraphicsRenderingMode
+import com.arcgismaps.mapping.view.LocalSceneView
 import com.arcgismaps.mapping.view.MapView
 import com.arcgismaps.mapping.view.SceneLocationVisibility
 import com.arcgismaps.mapping.view.SceneView
@@ -118,6 +121,10 @@ public sealed class GeoViewScope protected constructor(private val geoView: GeoV
      * @param shapes the styling options for the Callout's container shape
      * @since 200.5.0
      */
+    @Deprecated(
+        message = "Use the Callout function with `leaderPosition` instead. This deprecated function remains to maintain binary compatibility",
+        level = DeprecationLevel.HIDDEN,
+    )
     @Composable
     public fun Callout(
         location: Point,
@@ -127,9 +134,97 @@ public sealed class GeoViewScope protected constructor(private val geoView: GeoV
         colorScheme: CalloutColors = CalloutDefaults.colors(),
         shapes: CalloutShapes = CalloutDefaults.shapes(),
         content: @Composable BoxScope.() -> Unit
+    ) {
+        Callout(
+            location = location,
+            modifier = modifier,
+            offset = offset,
+            leaderPosition = LeaderPosition.LowerMiddle,
+            rotateOffsetWithGeoView = rotateOffsetWithGeoView,
+            colorScheme = colorScheme,
+            shapes = shapes,
+            content = content
+        )
+    }
+
+    /**
+     * Creates a Callout at the specified [geoElement] or the [tapLocation] location on the MapView. The Callout is a composable
+     * that can be used to display additional information about a location on the map. The additional information is
+     * passed as a [content] composable that contains text and/or other content. It has a leader that points to
+     * the location that Callout refers to. The body of the Callout is a rectangular area with curved corners
+     * that contains the [content] lambda provided by the application. A thin border line is drawn around the entire Callout.
+     *
+     * If the given geoelement is a DynamicEntity then the Callout automatically updates its location everytime the
+     * DynamicEntity changes. The content of the Callout however will not be automatically updated.
+     *
+     * Note: Only one Callout can be displayed at a time on the MapView.
+     *
+     * @param geoElement the GeoElement for which to display the Callout
+     * @param modifier Modifier to be applied to the composable Callout
+     * @param tapLocation a Point the user has tapped, or null if the Callout is not associated with a tap
+     * @param colorScheme the styling options for the Callout's shape and color properties
+     * @param shapes the styling options for the Callout's container shape
+     * @param content the content of the Callout
+     * @since 200.5.0
+     */
+    @Deprecated(
+        message = "Use the Callout function with `leaderPosition` instead. This deprecated function remains to maintain binary compatibility",
+        level = DeprecationLevel.HIDDEN,
+    )
+    @Composable
+    public fun Callout(
+        geoElement: GeoElement,
+        modifier: Modifier = Modifier,
+        tapLocation: Point? = null,
+        colorScheme: CalloutColors = CalloutDefaults.colors(),
+        shapes: CalloutShapes = CalloutDefaults.shapes(),
+        content: @Composable BoxScope.() -> Unit
+    ) {
+        Callout(
+            geoElement = geoElement,
+            modifier = modifier,
+            tapLocation = tapLocation,
+            leaderPosition = LeaderPosition.LowerMiddle,
+            colorScheme = colorScheme,
+            shapes = shapes,
+            content = content
+        )
+    }
+
+    /**
+     * Displays a Callout at the specified geographical location on the GeoView. The Callout is a composable
+     * that can be used to display additional information about a location on the map. The additional information is
+     * passed as a content composable that contains text and/or other content. It has a leader that points to
+     * the location that Callout refers to. The body of the Callout is a rectangular area with curved corners
+     * that contains the content lambda provided by the application. A thin border line is drawn around the entire Callout.
+     *
+     * Note: Only one Callout can be displayed at a time on the GeoView.
+     *
+     * @param location the geographical location at which to display the Callout
+     * @param modifier Modifier to be applied to the composable Callout
+     * @param content the content of the Callout
+     * @param offset the offset in screen coordinates from the geographical location at which to place the callout
+     * @param leaderPosition the current position of the leader relative to the body of the Callout
+     * @param rotateOffsetWithGeoView specifies whether the screen offset is rotated with the [GeoView]. The Screen offset
+     *        will be rotated with the [GeoView] when true, false otherwise.
+     *        This is useful if you are showing the callout for elements with symbology that does rotate with the [GeoView]
+     * @param colorScheme the styling options for the Callout's color properties
+     * @param shapes the styling options for the Callout's container shape
+     * @since 300.0.0
+     */
+    @Composable
+    public fun Callout(
+        location: Point,
+        modifier: Modifier = Modifier,
+        offset: Offset = Offset.Zero,
+        leaderPosition: LeaderPosition = LeaderPosition.LowerMiddle,
+        rotateOffsetWithGeoView: Boolean = false,
+        colorScheme: CalloutColors = CalloutDefaults.colors(),
+        shapes: CalloutShapes = CalloutDefaults.shapes(),
+        content: @Composable BoxScope.() -> Unit
     ) {
         if (this.isCalloutBeingDisplayed.compareAndSet(false, true)) {
-            this.CalloutInternal(location, modifier, offset, rotateOffsetWithGeoView, colorScheme, shapes, content)
+            this.CalloutInternal(location, modifier, offset, rotateOffsetWithGeoView, leaderPosition, colorScheme, shapes, content)
 
             SideEffect {
                 // The SideEffect is executed after every successful (re)composition. This means that it runs at the
@@ -156,22 +251,24 @@ public sealed class GeoViewScope protected constructor(private val geoView: GeoV
      * @param geoElement the GeoElement for which to display the Callout
      * @param modifier Modifier to be applied to the composable Callout
      * @param tapLocation a Point the user has tapped, or null if the Callout is not associated with a tap
+     * @param leaderPosition the current position of the leader relative to the body of the Callout
      * @param colorScheme the styling options for the Callout's shape and color properties
      * @param shapes the styling options for the Callout's container shape
      * @param content the content of the Callout
-     * @since 200.5.0
+     * @since 300.0.0
      */
     @Composable
     public fun Callout(
         geoElement: GeoElement,
         modifier: Modifier = Modifier,
         tapLocation: Point? = null,
+        leaderPosition: LeaderPosition = LeaderPosition.LowerMiddle,
         colorScheme: CalloutColors = CalloutDefaults.colors(),
         shapes: CalloutShapes = CalloutDefaults.shapes(),
         content: @Composable BoxScope.() -> Unit
     ) {
         if (this.isCalloutBeingDisplayed.compareAndSet(false, true)) {
-            this.CalloutInternal(geoElement, modifier, tapLocation, colorScheme, shapes, content)
+            this.CalloutInternal(geoElement, modifier, tapLocation, leaderPosition, colorScheme, shapes, content)
 
             SideEffect {
                 // The SideEffect is executed after every successful (re)composition. This means that it runs at the
@@ -218,6 +315,7 @@ public sealed class GeoViewScope protected constructor(private val geoView: GeoV
         geoElement: GeoElement,
         modifier: Modifier = Modifier,
         tapLocation: Point? = null,
+        leaderPosition: LeaderPosition,
         colorScheme: CalloutColors,
         shapes: CalloutShapes,
         content: @Composable BoxScope.() -> Unit
@@ -241,6 +339,7 @@ public sealed class GeoViewScope protected constructor(private val geoView: GeoV
                 modifier,
                 it.offset,
                 it.rotateOffsetWithGeoView,
+                leaderPosition,
                 colorScheme,
                 shapes,
                 content
@@ -259,10 +358,15 @@ public sealed class GeoViewScope protected constructor(private val geoView: GeoV
         modifier: Modifier,
         offset: Offset,
         rotateOffsetWithGeoView: Boolean,
+        leaderPosition: LeaderPosition,
         colorScheme: CalloutColors,
         shapes: CalloutShapes,
         content: (@Composable BoxScope.() -> Unit)
     ) {
+        // Remember the actual leader position, for non-Automatic is the requested leaderPosition
+        var actualLeaderPosition by remember(leaderPosition) {
+            mutableStateOf(if (leaderPosition == LeaderPosition.Automatic) LeaderPosition.LowerMiddle else leaderPosition)
+        }
 
         // Convert the given location to a screen coordinate
         var leaderScreenCoordinate: ScreenCoordinate? by remember {
@@ -285,10 +389,10 @@ public sealed class GeoViewScope protected constructor(private val geoView: GeoV
             }
         }
 
-        leaderScreenCoordinate?.let {
+        leaderScreenCoordinate?.let { leaderScreenCoordinate ->
             val animateToPoint by animateValueAsState(
                 typeConverter = screenCoordinateToVector,
-                targetValue = it,
+                targetValue = leaderScreenCoordinate,
                 label = "AnimateScreenCoordinate",
                 animationSpec = tween(
                     easing = FastOutSlowInEasing,
@@ -298,10 +402,14 @@ public sealed class GeoViewScope protected constructor(private val geoView: GeoV
 
             CalloutSubComposeLayout(
                 leaderScreenCoordinate = animateToPoint,
+                geoView = geoView,
+                leaderPosition = leaderPosition,
+                actualLeaderPosition = actualLeaderPosition,
+                onActualLeaderPositionChanged = { actualLeaderPosition = it },
                 maxSize = calloutContentMaxSize(
                     geoView = geoView,
                     density = LocalDensity.current,
-                    displayMetrics = LocalContext.current.resources.displayMetrics
+                    displayMetrics = LocalResources.current.displayMetrics
                 )) {
                 with(LocalDensity.current) {
                     Box(
@@ -312,6 +420,7 @@ public sealed class GeoViewScope protected constructor(private val geoView: GeoV
                                 strokeColor = colorScheme.borderColor,
                                 backgroundColor = colorScheme.backgroundColor,
                                 calloutContentPadding = shapes.calloutContentPadding,
+                                actualLeaderPosition = actualLeaderPosition,
                                 leaderWidth = shapes.leaderSize.width.toPx(),
                                 leaderHeight = shapes.leaderSize.height.toPx(),
                                 minSize = shapes.minSize
@@ -351,6 +460,7 @@ public sealed class GeoViewScope protected constructor(private val geoView: GeoV
             is SceneView -> geoView.locationToScreen(location)?.takeIf {
                 it.visibility == SceneLocationVisibility.Visible
             }?.screenPoint
+            is LocalSceneView -> TODO("Pending implementation support")
         }
         return locationToScreen?.let { screenCoordinate ->
             if (rotateOffsetWithGeoView && geoViewRotation != 0.0) {
@@ -370,6 +480,10 @@ public sealed class GeoViewScope protected constructor(private val geoView: GeoV
      * location before drawing the Callout on the screen.
      *
      * @param leaderScreenCoordinate Represents the x,y coordinate for the location on GeoView
+     * @param geoView The instance of the current GeoView for measuring inset bounds
+     * @param leaderPosition the user provided current position of the leader relative to the body of the Callout
+     * @param actualLeaderPosition the true position of the leader relative to the body of the Callout
+     * @param onActualLeaderPositionChanged Lambda function to provide position updates for the actual leader position when user provides an [LeaderPosition.Automatic].
      * @param maxSize The calculated maximum size of the callout container
      * @since 200.5.0
      */
@@ -377,7 +491,11 @@ public sealed class GeoViewScope protected constructor(private val geoView: GeoV
     private fun CalloutSubComposeLayout(
         modifier: Modifier = Modifier,
         leaderScreenCoordinate: ScreenCoordinate,
+        geoView: GeoView,
         maxSize: DpSize,
+        leaderPosition: LeaderPosition,
+        actualLeaderPosition: LeaderPosition,
+        onActualLeaderPositionChanged: (LeaderPosition) -> Unit,
         calloutContainer: @Composable () -> Unit
     ) {
         val maxWidthInPx = with(LocalDensity.current) {
@@ -401,17 +519,102 @@ public sealed class GeoViewScope protected constructor(private val geoView: GeoV
                     maxHeight = layoutHeight
                 )
             )
-            // The default (0,0) value is on the top-left edge of the callout container.
-            // This moves the anchor to the bottom-middle point using X,Y offsets,
-            // and ensures that the leader's anchor point always represents the tapped location,
-            // in this case the bottom-middle leader position.
-            val calloutOffsetX =
-                leaderScreenCoordinate.x.toInt() - (calloutContainerPlaceable.width / 2)
-            val calloutOffsetY =
-                leaderScreenCoordinate.y.toInt() - calloutContainerPlaceable.height
+
+            // If Automatic, adjust measured bounds
+            if (leaderPosition == LeaderPosition.Automatic) {
+                val bounds = boundsRelativeToAnchor(calloutContainerPlaceable.width, calloutContainerPlaceable.height, actualLeaderPosition)
+                val viewInsetRight = if (geoView is MapView) { with(density) { geoView.viewInsetRight.dp.toPx() }.toInt() } else 0
+                val viewInsetLeft = if (geoView is MapView) { with(density) { geoView.viewInsetLeft.dp.toPx() }.toInt() } else 0
+                val viewInsetTop = if (geoView is MapView) { with(density) { geoView.viewInsetTop.dp.toPx() }.toInt() } else 0
+                val viewInsetBottom = if (geoView is MapView) { with(density) { geoView.viewInsetBottom.dp.toPx() }.toInt() } else 0
+                val insetsX = if (geoView is MapView && geoView.isViewInsetsValid) {viewInsetLeft + viewInsetRight} else 0
+                val insetsY = if (geoView is MapView && geoView.isViewInsetsValid) {viewInsetTop + viewInsetBottom} else 0
+                val geoViewSize = IntSize(geoView.width, geoView.height)
+                val anchor = DoubleXY(leaderScreenCoordinate.x, leaderScreenCoordinate.y)
+
+                val direction = when {
+                    // If Right overflow:
+                    anchor.x + bounds.right > geoViewSize.width - (if (insetsX > 0) viewInsetRight else 0) -> LeaderMoveDirection.Right
+                    // If Left overflow:
+                    anchor.x + bounds.left < if (insetsX > 0) viewInsetLeft else 0 -> LeaderMoveDirection.Left
+                    // If Bottom overflow:
+                    anchor.y + bounds.bottom > geoViewSize.height - (if (insetsY > 0) viewInsetBottom else 0) -> LeaderMoveDirection.Down
+                    // If Top overflow:
+                    anchor.y + bounds.top < if (insetsY > 0) viewInsetTop else 0 -> LeaderMoveDirection.Up
+                    else -> null
+                }
+
+                direction?.let {
+                    // Nudge the leader according to the computed direction
+                    moveLeader(it, actualLeaderPosition, geoViewSize, bounds, anchor)?.let { newPosition ->
+                        onActualLeaderPositionChanged(newPosition)
+                    }
+                }
+            }
+
+            // Compute the calloutContainerPlaceable coords such that the leader tip coincides with leaderScreenCoordinate:
+            val (xCoords, yCoords) = when (actualLeaderPosition) {
+                LeaderPosition.LowerMiddle -> {
+                    Pair(
+                        leaderScreenCoordinate.x.toInt() - (calloutContainerPlaceable.width / 2),
+                        leaderScreenCoordinate.y.toInt() - calloutContainerPlaceable.height
+                    )
+                }
+
+                LeaderPosition.UpperMiddle -> {
+                    Pair(
+                        leaderScreenCoordinate.x.toInt() - (calloutContainerPlaceable.width / 2),
+                        leaderScreenCoordinate.y.toInt()
+                    )
+                }
+
+                LeaderPosition.RightMiddle -> {
+                    Pair(
+                        leaderScreenCoordinate.x.toInt() - calloutContainerPlaceable.width,
+                        leaderScreenCoordinate.y.toInt() - (calloutContainerPlaceable.height / 2)
+                    )
+                }
+
+                LeaderPosition.LeftMiddle -> {
+                    Pair(
+                        leaderScreenCoordinate.x.toInt(),
+                        leaderScreenCoordinate.y.toInt() - (calloutContainerPlaceable.height / 2)
+                    )
+                }
+
+                LeaderPosition.UpperLeftCorner -> {
+                    Pair(
+                        leaderScreenCoordinate.x.toInt(),
+                        leaderScreenCoordinate.y.toInt()
+                    )
+                }
+
+                LeaderPosition.UpperRightCorner -> {
+                    Pair(
+                        leaderScreenCoordinate.x.toInt() - calloutContainerPlaceable.width,
+                        leaderScreenCoordinate.y.toInt()
+                    )
+                }
+
+                LeaderPosition.LowerLeftCorner -> {
+                    Pair(
+                        leaderScreenCoordinate.x.toInt(),
+                        leaderScreenCoordinate.y.toInt() - calloutContainerPlaceable.height
+                    )
+                }
+
+                LeaderPosition.LowerRightCorner -> {
+                    Pair(
+                        leaderScreenCoordinate.x.toInt() - calloutContainerPlaceable.width,
+                        leaderScreenCoordinate.y.toInt() - calloutContainerPlaceable.height
+                    )
+                }
+
+                LeaderPosition.Automatic -> error("Actual leader position must never be Automatic")
+            }
             // place the callout in the layout
             layout(layoutWidth, layoutHeight) {
-                calloutContainerPlaceable.place(calloutOffsetX, calloutOffsetY)
+                calloutContainerPlaceable.place(xCoords, yCoords)
             }
         }
     }
@@ -569,6 +772,7 @@ internal class LeaderPointOffset internal constructor(
 private fun GeoView.rotation(): Double = when (this) {
     is SceneView -> getCurrentViewpoint(ViewpointType.CenterAndScale)?.rotation ?: 0.0
     is MapView -> mapRotation.value
+    is LocalSceneView -> TODO("Pending implementation support")
 }
 
 /**
@@ -708,6 +912,7 @@ private fun calloutContentMaxSize(
  * @param strokeColor Color used to define the outline stroke.
  * @param backgroundColor Color used to define the fill color of the Callout shape.
  * @param calloutContentPadding PaddingValues for the content placed inside the Callout.
+ * @param actualLeaderPosition the current position of the leader relative to the body of the Callout
  * @param leaderWidth Width of the Callout leader in px.
  * @param leaderHeight Height of the Callout leader in px.
  * @param minSize Minimum size the of the Callout shape.
@@ -720,17 +925,32 @@ private fun Modifier.drawCalloutContainer(
     strokeColor: Color,
     backgroundColor: Color,
     calloutContentPadding: PaddingValues,
+    actualLeaderPosition: LeaderPosition,
     leaderWidth: Float,
     leaderHeight: Float,
     minSize: DpSize
 ) = this
     .sizeIn(minWidth = minSize.width, minHeight = minSize.height)
-    // Set bottom padding to ensure the leader is visible
-    .padding(bottom = with(LocalDensity.current) { leaderHeight.toDp() })
+    // Set padding to ensure the leader is visible
+    .padding(with(LocalDensity.current) {
+        val half = (leaderHeight / 2f).toDp()
+        val full = leaderHeight.toDp()
+        when (actualLeaderPosition) {
+            LeaderPosition.LowerMiddle -> PaddingValues(bottom = full)
+            LeaderPosition.UpperMiddle -> PaddingValues(top = full)
+            LeaderPosition.LeftMiddle -> PaddingValues(start = full)
+            LeaderPosition.RightMiddle -> PaddingValues(end = full)
+            LeaderPosition.UpperLeftCorner -> PaddingValues(top = half, start = half)
+            LeaderPosition.UpperRightCorner -> PaddingValues(top = half, end = half)
+            LeaderPosition.LowerLeftCorner -> PaddingValues(bottom = half, start = half)
+            LeaderPosition.LowerRightCorner -> PaddingValues(bottom = half, end = half)
+            LeaderPosition.Automatic -> PaddingValues(bottom = full) // Use a safe default
+        }
+    })
     .drawWithCache {
         onDrawBehind {
             // Define the Path of the callout
-            val path = calloutPath(size, cornerRadius, leaderWidth, leaderHeight)
+            val path = calloutPath(size, cornerRadius, actualLeaderPosition, leaderWidth, leaderHeight)
             // Fill the path's shape with the Callout's background color
             drawPath(
                 path = path,
@@ -759,108 +979,400 @@ private fun Modifier.drawCalloutContainer(
 private fun calloutPath(
     size: Size,
     cornerRadius: Float,
+    leaderPosition: LeaderPosition,
     leaderWidth: Float,
     leaderHeight: Float
 ): Path {
     return Path().apply {
         reset()
-        // Create a default rectangle using the given size
+        // Rectangle inside the padding area
         val rect = Rect(left = 0f, top = 0f, right = size.width, bottom = size.height)
-        // Move to the top-left corner of the shape
+
+        // Utility to draw rounded rect corners consistently
+        fun arcAt(rect: Rect, startAngle: Float, sweep: Float) {
+            arcTo(rect, startAngle, sweep, false)
+        }
+
+        // Corner rects
+        val topLeft = Rect(rect.left, rect.top, rect.left + 2 * cornerRadius, rect.top + 2 * cornerRadius)
+        val topRight = Rect(rect.right - 2 * cornerRadius, rect.top, rect.right, rect.top + 2 * cornerRadius)
+        val bottomRight = Rect(rect.right - 2 * cornerRadius, rect.bottom - 2 * cornerRadius, rect.right, rect.bottom)
+        val bottomLeft = Rect(rect.left, rect.bottom - 2 * cornerRadius, rect.left + 2 * cornerRadius, rect.bottom)
+
+        // Compute the corner sweep angle
+        fun cornerSweepAngle(): Float {
+            val arcLength = (Math.PI.toFloat() * cornerRadius) / 2f
+            val leaderAngle = 90f * cornerRadius / arcLength
+            return (90f - leaderAngle) / 2f
+        }
+
+        // Start from top-left moving clockwise:
         moveTo(x = rect.left + cornerRadius, y = rect.top)
-        // Draw a line from 0,0 to the top-right start of the corner
-        lineTo(x = rect.right - cornerRadius, y = rect.top)
-        // Create the top-right corner rectangle
-        val topRightCorner = Rect(
-            left = rect.right - 2 * cornerRadius,
-            top = rect.top,
-            right = rect.right,
-            bottom = rect.top + 2 * cornerRadius
-        )
-        // Draw an arc representing the top-right corner
-        arcTo(
-            rect = topRightCorner,
-            startAngleDegrees = -90f,
-            sweepAngleDegrees = 90f,
-            forceMoveTo = false
-        )
-        // Draw a line from the end of the arc to the bottom-right start of the corner
-        lineTo(
-            x = rect.right,
-            y = rect.bottom - cornerRadius
-        )
-        // Create the bottom-right corner rectangle
-        val bottomRightCorner = Rect(
-            left = rect.right - 2 * cornerRadius,
-            top = rect.bottom - 2 * cornerRadius,
-            right = rect.right,
-            bottom = rect.bottom
-        )
-        // Draw an arc representing the bottom-right corner
-        arcTo(
-            rect = bottomRightCorner,
-            startAngleDegrees = 0f,
-            sweepAngleDegrees = 90f,
-            forceMoveTo = false
-        )
-        // Draw a line from the end of the arc to the start of the bottom leader
-        lineTo(
-            x = (size.width / 2) + (leaderWidth / 2),
-            y = rect.bottom
-        )
-        // Draw a line from start of the leader bottom to the leader tip
-        lineTo(
-            x = (size.width / 2),
-            y = rect.bottom + leaderHeight
-        )
-        // Draw a line from the leader tip to the bottom leader
-        lineTo(
-            x = (size.width / 2) - (leaderWidth / 2),
-            y = rect.bottom
-        )
-        // Draw a line from the bottom leader to the start of the bottom-left corner
-        lineTo(
-            x = rect.left + cornerRadius,
-            y = rect.bottom
-        )
-        // Create the bottom-left corner rectangle
-        val bottomLeftCorner = Rect(
-            left = rect.left,
-            top = rect.bottom - 2 * cornerRadius,
-            right = rect.left + 2 * cornerRadius,
-            bottom = rect.bottom
-        )
-        // Draw an arc representing the bottom-left corner
-        arcTo(
-            rect = bottomLeftCorner,
-            startAngleDegrees = 90f,
-            sweepAngleDegrees = 90f,
-            forceMoveTo = false
-        )
-        // Draw a line from the end of the arc to the top-left start of the corner
-        lineTo(
-            x = rect.left,
-            y = rect.top + cornerRadius
-        )
-        // Create the top-left corner rectangle
-        val topLeftCorner = Rect(
-            left = rect.left,
-            top = rect.top,
-            right = rect.left + 2 * cornerRadius,
-            bottom = rect.top + 2 * cornerRadius
-        )
-        // Draw an arc representing the top-left corner
-        arcTo(
-            rect = topLeftCorner,
-            startAngleDegrees = 180f,
-            sweepAngleDegrees = 90f,
-            forceMoveTo = false
-        )
-        // Close the path to complete the shape
+
+        when (leaderPosition) {
+            // Top side & corners:
+            LeaderPosition.UpperMiddle -> {
+                lineTo(x = (rect.width / 2f) - (leaderWidth / 2f), y = rect.top)
+                lineTo(x = (rect.width / 2f), y = rect.top - leaderHeight)
+                lineTo(x = (rect.width / 2f) + (leaderWidth / 2f), y = rect.top)
+                lineTo(x = rect.right - cornerRadius, y = rect.top)
+                arcAt(topRight, -90f, 90f)
+                lineTo(x = rect.right, y = rect.bottom - cornerRadius)
+                arcAt(bottomRight, 0f, 90f)
+                lineTo(x = rect.left + cornerRadius, y = rect.bottom)
+                arcAt(bottomLeft, 90f, 90f)
+                lineTo(x = rect.left, y = rect.top + cornerRadius)
+                arcAt(topLeft, 180f, 90f)
+            }
+
+            // Bottom
+            LeaderPosition.LowerMiddle -> {
+                lineTo(x = rect.right - cornerRadius, y = rect.top)
+                arcAt(topRight, -90f, 90f)
+                lineTo(x = rect.right, y = rect.bottom - cornerRadius)
+                arcAt(bottomRight, 0f, 90f)
+                // Bottom leader
+                lineTo(x = (size.width / 2f) + (leaderWidth / 2f), y = rect.bottom)
+                lineTo(x = (size.width / 2f), y = rect.bottom + leaderHeight)
+                lineTo(x = (size.width / 2f) - (leaderWidth / 2f), y = rect.bottom)
+                lineTo(x = rect.left + cornerRadius, y = rect.bottom)
+                arcAt(bottomLeft, 90f, 90f)
+                lineTo(x = rect.left, y = rect.top + cornerRadius)
+                arcAt(topLeft, 180f, 90f)
+            }
+
+            // Left / Right sides
+            LeaderPosition.LeftMiddle -> {
+                // Top edge and top-right corner
+                lineTo(rect.right - cornerRadius, rect.top)
+                arcAt(topRight, -90f, 90f)
+                // Right edge
+                lineTo(rect.right, rect.bottom - cornerRadius)
+                arcAt(bottomRight, 0f, 90f)
+                // Bottom edge
+                lineTo(rect.left + cornerRadius, rect.bottom)
+                arcAt(bottomLeft, 90f, 90f)
+                // Left edge leader centered
+                lineTo(x = rect.left, y = (rect.height / 2f) + (leaderWidth / 2f))
+                lineTo(x = rect.left - leaderHeight, y = (rect.height / 2f))
+                lineTo(x = rect.left, y = (rect.height / 2f) - (leaderWidth / 2f))
+                lineTo(x = rect.left, y = rect.top + cornerRadius)
+                arcAt(topLeft, 180f, 90f)
+            }
+
+            LeaderPosition.RightMiddle -> {
+                // Top edge
+                lineTo(rect.right - cornerRadius, rect.top)
+                arcAt(topRight, -90f, 90f)
+                // Right edge with leader
+                lineTo(x = rect.right, y = (rect.height / 2f) - (leaderWidth / 2f))
+                lineTo(x = rect.right + leaderHeight, y = (rect.height / 2f))
+                lineTo(x = rect.right, y = (rect.height / 2f) + (leaderWidth / 2f))
+                lineTo(x = rect.right, y = rect.bottom - cornerRadius)
+                arcAt(bottomRight, 0f, 90f)
+                // Bottom + left edges
+                lineTo(rect.left + cornerRadius, rect.bottom)
+                arcAt(bottomLeft, 90f, 90f)
+                lineTo(rect.left, rect.top + cornerRadius)
+                arcAt(topLeft, 180f, 90f)
+            }
+
+            // Corner leaders
+            LeaderPosition.UpperLeftCorner,
+            LeaderPosition.UpperRightCorner,
+            LeaderPosition.LowerRightCorner,
+            LeaderPosition.LowerLeftCorner -> {
+                val sweep = cornerSweepAngle()
+                // Draw the whole rounded-rect, at the corner, draw arcs split by the leader tip
+                when (leaderPosition) {
+                    LeaderPosition.UpperLeftCorner -> {
+                        lineTo(rect.right - cornerRadius, rect.top)
+                        arcAt(topRight, -90f, 90f)
+                        lineTo(rect.right, rect.bottom - cornerRadius)
+                        arcAt(bottomRight, 0f, 90f)
+                        lineTo(rect.left + cornerRadius, rect.bottom)
+                        arcAt(bottomLeft, 90f, 90f)
+                        lineTo(rect.left, rect.top + cornerRadius)
+                        // Draw corner with leader
+                        arcAt(topLeft, 180f, sweep)
+                        lineTo(
+                            x = rect.left - (leaderHeight / 2f),
+                            y = rect.top - (leaderHeight / 2f)
+                        )
+                        arcAt(topLeft, 180f + 90f - sweep, sweep)
+                    }
+
+                    LeaderPosition.UpperRightCorner -> {
+                        lineTo(rect.right - cornerRadius, rect.top)
+                        // Draw corner with leader
+                        arcAt(topRight, -90f, sweep)
+                        lineTo(
+                            x = rect.right + (leaderHeight / 2f),
+                            y = rect.top - (leaderHeight / 2f)
+                        )
+                        arcAt(topRight, -90f + 90f - sweep, sweep)
+                        lineTo(rect.right, rect.bottom - cornerRadius)
+                        arcAt(bottomRight, 0f, 90f)
+                        lineTo(rect.left + cornerRadius, rect.bottom)
+                        arcAt(bottomLeft, 90f, 90f)
+                        lineTo(rect.left, rect.top + cornerRadius)
+                        arcAt(topLeft, 180f, 90f)
+                    }
+
+                    LeaderPosition.LowerRightCorner -> {
+                        lineTo(rect.right - cornerRadius, rect.top)
+                        arcAt(topRight, -90f, 90f)
+                        lineTo(rect.right, rect.bottom - cornerRadius)
+                        // Draw corner with leader
+                        arcAt(bottomRight, 0f, sweep)
+                        lineTo(
+                            x = rect.right + (leaderHeight / 2f),
+                            y = rect.bottom + (leaderHeight / 2f)
+                        )
+                        arcAt(bottomRight, 0f + 90f - sweep, sweep)
+                        lineTo(rect.left + cornerRadius, rect.bottom)
+                        arcAt(bottomLeft, 90f, 90f)
+                        lineTo(rect.left, rect.top + cornerRadius)
+                        arcAt(topLeft, 180f, 90f)
+                    }
+
+                    LeaderPosition.LowerLeftCorner -> {
+                        lineTo(rect.right - cornerRadius, rect.top)
+                        arcAt(topRight, -90f, 90f)
+                        lineTo(rect.right, rect.bottom - cornerRadius)
+                        arcAt(bottomRight, 0f, 90f)
+                        lineTo(rect.left + cornerRadius, rect.bottom)
+                        // Draw corner with leader
+                        arcAt(bottomLeft, 90f, sweep)
+                        lineTo(
+                            x = rect.left - (leaderHeight / 2f),
+                            y = rect.bottom + (leaderHeight / 2f)
+                        )
+                        arcAt(bottomLeft, 90f + 90f - sweep, sweep)
+                        lineTo(rect.left, rect.top + cornerRadius)
+                        arcAt(topLeft, 180f, 90f)
+                    }
+
+                    else -> {}
+                }
+            }
+
+            LeaderPosition.Automatic -> {}
+        }
         close()
     }
 }
 
+
+/**
+ * Bounds of the callout container relative to the anchor point.
+ * @since 300.0.0
+ */
+private fun boundsRelativeToAnchor(
+    width: Int,
+    height: Int,
+    pos: LeaderPosition
+): RectF {
+    return when (pos) {
+        LeaderPosition.UpperLeftCorner -> RectF(0f, 0f, width.toFloat(), height.toFloat())
+        LeaderPosition.LeftMiddle -> RectF(0f, -height / 2f, width.toFloat(), height / 2f)
+        LeaderPosition.LowerLeftCorner -> RectF(0f, -height.toFloat(), width.toFloat(), 0f)
+        LeaderPosition.UpperMiddle -> RectF(-width / 2f, 0f, width / 2f, height.toFloat())
+        LeaderPosition.LowerMiddle -> RectF(-width / 2f, -height.toFloat(), width / 2f, 0f)
+        LeaderPosition.UpperRightCorner -> RectF(-width.toFloat(), 0f, 0f, height.toFloat())
+        LeaderPosition.RightMiddle -> RectF(-width.toFloat(), -height / 2f, 0f, height / 2f)
+        LeaderPosition.LowerRightCorner -> RectF(-width.toFloat(), -height.toFloat(), 0f, 0f)
+        LeaderPosition.Automatic -> error("Actual leader position must never be Automatic")
+    }
+}
+
+/**
+ * Moves the leader position following one of 4 directions: Down, Up, Left or Right
+ * using [LeaderMoveDirection] types.
+ *
+ * @param direction one of the 4 directions
+ * @param bounds current bounds of the CalloutWindow
+ * @param anchorPoint screen coordinates of the anchor point
+ * @param actualLeaderPosition the true position of the leader relative to the body of the Callout
+ * @return [LeaderPosition] if the callout leader position needs to be refreshed
+ * @since 300.0.0
+ */
+private fun moveLeader(
+    direction: LeaderMoveDirection,
+    actualLeaderPosition: LeaderPosition,
+    geoViewSize: IntSize,
+    bounds: RectF,
+    anchorPoint: DoubleXY
+): LeaderPosition? {
+    val geoViewWidthF = geoViewSize.width.toFloat()
+    val geoViewHeightF = geoViewSize.height.toFloat()
+    val x = anchorPoint.x.toFloat()
+    val y = anchorPoint.y.toFloat()
+
+    // Callout is 'narrow' if it's less than half the width of the GeoView
+    val narrowCallout = bounds.width() <= geoViewWidthF / 2f
+    // Callout is 'short' if it's less than half the height of the GeoView
+    val shortCallout = bounds.height() <= geoViewHeightF / 2f
+
+    val oneThirdWidth = geoViewWidthF / 3f
+    val halfWidth = geoViewWidthF / 2f
+    val twoThirdWidth = geoViewWidthF * 2f / 3f
+
+    val oneThirdHeight = geoViewHeightF / 3f
+    val halfHeight = geoViewHeightF / 2f
+    val twoThirdHeight = geoViewHeightF * 2f / 3f
+
+    return when (direction) {
+        // Bottom edge of callout is below bottom edge of map.
+        is LeaderMoveDirection.Down -> when (actualLeaderPosition) {
+            LeaderPosition.UpperLeftCorner -> if (shortCallout || y > oneThirdHeight) LeaderPosition.LeftMiddle else null
+            LeaderPosition.LeftMiddle -> if (shortCallout || y > twoThirdHeight) LeaderPosition.LowerLeftCorner else null
+            LeaderPosition.UpperMiddle -> if (shortCallout || y > halfHeight) LeaderPosition.LowerMiddle else null
+            LeaderPosition.UpperRightCorner -> if (shortCallout || y > oneThirdHeight) LeaderPosition.RightMiddle else null
+            LeaderPosition.RightMiddle -> if (shortCallout || y > twoThirdHeight) LeaderPosition.LowerRightCorner else null
+            else -> null
+        }
+
+        // Top edge of callout is above top edge of map.
+        is LeaderMoveDirection.Up -> when (actualLeaderPosition) {
+            LeaderPosition.LowerLeftCorner -> if (shortCallout || y < twoThirdHeight) LeaderPosition.LeftMiddle else null
+            LeaderPosition.LeftMiddle -> if (shortCallout || y < oneThirdHeight) LeaderPosition.UpperLeftCorner else null
+            LeaderPosition.LowerMiddle -> if (shortCallout || y < halfHeight) LeaderPosition.UpperMiddle else null
+            LeaderPosition.LowerRightCorner -> if (shortCallout || y < twoThirdHeight) LeaderPosition.RightMiddle else null
+            LeaderPosition.RightMiddle -> if (shortCallout || y < oneThirdHeight) LeaderPosition.UpperRightCorner else null
+            else -> null
+        }
+
+        // Left edge of callout is left of left edge of map.
+        is LeaderMoveDirection.Left -> when (actualLeaderPosition) {
+            LeaderPosition.UpperRightCorner -> if (narrowCallout || x < twoThirdWidth) LeaderPosition.UpperMiddle else null
+            LeaderPosition.RightMiddle -> if (narrowCallout || x < halfWidth) LeaderPosition.LeftMiddle else null
+            LeaderPosition.LowerRightCorner -> if (narrowCallout || x < twoThirdWidth) LeaderPosition.LowerMiddle else null
+            LeaderPosition.UpperMiddle -> if (narrowCallout || x < oneThirdWidth) LeaderPosition.UpperLeftCorner else null
+            LeaderPosition.LowerMiddle -> if (narrowCallout || x < oneThirdWidth) LeaderPosition.LowerLeftCorner else null
+            else -> null
+        }
+
+        // Right edge of callout is right of right edge of map.
+        is LeaderMoveDirection.Right -> when (actualLeaderPosition) {
+            LeaderPosition.UpperLeftCorner -> if (narrowCallout || x > oneThirdWidth) LeaderPosition.UpperMiddle else null
+            LeaderPosition.LeftMiddle -> if (narrowCallout || x > halfWidth) LeaderPosition.RightMiddle else null
+            LeaderPosition.LowerLeftCorner -> if (narrowCallout || x > oneThirdWidth) LeaderPosition.LowerMiddle else null
+            LeaderPosition.UpperMiddle -> if (narrowCallout || x > twoThirdWidth) LeaderPosition.UpperRightCorner else null
+            LeaderPosition.LowerMiddle -> if (narrowCallout || x > twoThirdWidth) LeaderPosition.LowerRightCorner else null
+            else -> null
+        }
+    }
+}
+
+/**
+ * Indicates the side or corner of a callout on which the leader is drawn.
+ *
+ * @since 300.0.0
+ */
+public sealed class LeaderPosition(internal val position: Int) {
+
+    /**
+     * Positions the leader at the top left corner of the callout.
+     *
+     * @since 300.0.0
+     */
+    public data object UpperLeftCorner : LeaderPosition(0)
+
+    /**
+     * Positions the leader at the top center of the callout.
+     *
+     * @since 300.0.0
+     */
+    public data object UpperMiddle : LeaderPosition(1)
+
+    /**
+     * Positions the leader at the top right corner of the callout.
+     *
+     * @since 300.0.0
+     */
+    public data object UpperRightCorner : LeaderPosition(2)
+
+    /**
+     * Positions the leader at the right center of the callout.
+     *
+     * @since 300.0.0
+     */
+    public data object RightMiddle : LeaderPosition(3)
+
+    /**
+     * Positions the leader at the bottom right corner of the callout.
+     *
+     * @since 300.0.0
+     */
+    public data object LowerRightCorner : LeaderPosition(4)
+
+    /**
+     * Positions the leader at the bottom center of the callout.
+     *
+     * @since 300.0.0
+     */
+    public data object LowerMiddle : LeaderPosition(5)
+
+    /**
+     * Positions the leader at the bottom left corner of the callout.
+     *
+     * @since 300.0.0
+     */
+    public data object LowerLeftCorner : LeaderPosition(6)
+
+    /**
+     * Positions the leader at the left center of the callout.
+     *
+     * @since 300.0.0
+     */
+    public data object LeftMiddle : LeaderPosition(7)
+
+    /**
+     * Dynamically positions the leader to keep the callout as much as possible within the bounds of the [GeoView].
+     *
+     * @since 300.0.0
+     */
+    public data object Automatic : LeaderPosition(8)
+
+}
+
+/**
+ * Specifies the direction in which the leader needs to be moved when adjusting its position automatically.
+ *
+ * @since 300.0.0
+ */
+private sealed class LeaderMoveDirection() {
+    /**
+     * Move the leader downwards e.g. from [LeaderPosition.LeftMiddle] to [LeaderPosition.LowerLeftCorner]
+     *
+     * @since 300.0.0
+     */
+    object Down : LeaderMoveDirection()
+
+    /**
+     * Move the leader upwards e.g. from [LeaderPosition.LeftMiddle] to [LeaderPosition.UpperLeftCorner]
+     *
+     * @since 300.0.0
+     */
+    object Up : LeaderMoveDirection()
+
+    /**
+     * Move the leader to the left e.g. from [LeaderPosition.UpperRightCorner] to [LeaderPosition.UpperMiddle]
+     *
+     * @since 300.0.0
+     */
+    object Left : LeaderMoveDirection()
+
+    /**
+     * Move the leader to the right e.g. from [LeaderPosition.LowerLeftCorner] to [LeaderPosition.LowerMiddle]
+     *
+     * @since 300.0.0
+     */
+    object Right : LeaderMoveDirection()
+}
+
+
 /**
  * This function is used to wait for the GeoView to be ready to return positive values
  * for operations like locationToScreen. We determine that by waiting for the first drawStatus
diff --git a/toolkit/geoview-compose/src/main/java/com/arcgismaps/toolkit/geoviewcompose/MapView.kt b/toolkit/geoview-compose/src/main/java/com/arcgismaps/toolkit/geoviewcompose/MapView.kt
index aa2482fe3..9adbdf2f1 100644
--- a/toolkit/geoview-compose/src/main/java/com/arcgismaps/toolkit/geoviewcompose/MapView.kt
+++ b/toolkit/geoview-compose/src/main/java/com/arcgismaps/toolkit/geoviewcompose/MapView.kt
@@ -278,149 +278,6 @@ public fun MapView(
         onVisibleAreaChanged = onVisibleAreaChanged
     )
 }
-/**
- * A compose equivalent of the view-based [MapView].
- *
- * @param arcGISMap the [ArcGISMap] to be rendered by this composable MapView
- * @param modifier Modifier to be applied to the composable MapView
- * @param onViewpointChangedForCenterAndScale lambda invoked when the viewpoint changes, passing a viewpoint
- * type of [ViewpointType.CenterAndScale]
- * @param onViewpointChangedForBoundingGeometry lambda invoked when the viewpoint changes, passing a viewpoint
- * type of [ViewpointType.BoundingGeometry]
- * @param onVisibleAreaChanged lambda invoked when the visible area of the composable MapView has changed
- * @param viewpointPersistence the [ViewpointPersistence] to specify how the viewpoint of the composable MapView is persisted
- * across configuration changes.
- * @param graphicsOverlays graphics overlays used by this composable MapView
- * @param locationDisplay the [LocationDisplay] used by the composable MapView
- * @param geometryEditor the [GeometryEditor] used by the composable MapView to create and edit geometries by user interaction.
- * @param mapViewProxy the [MapViewProxy] to associate with the composable MapView
- * @param mapViewInteractionOptions the [MapViewInteractionOptions] used by this composable MapView
- * @param viewLabelProperties the [ViewLabelProperties] used by the composable MapView
- * @param selectionProperties the [SelectionProperties] used by the composable MapView
- * @param insets the inset values to control the active visible area, instructing the MapView to ignore parts that may be obstructed
- * by overlaid UI elements and affecting the MapView's logical center, the reported visible area and the location display
- * @param grid represents the display of a coordinate system [Grid] on the composable MapView
- * @param backgroundGrid the default color and context grid behind the map surface
- * @param wrapAroundMode the [WrapAroundMode] to specify whether continuous panning across the international date line is enabled
- * @param isAttributionBarVisible true if attribution bar is visible in the composable MapView, false otherwise
- * @param onAttributionTextChanged lambda invoked when the attribution text of the composable MapView has changed
- * @param onAttributionBarLayoutChanged lambda invoked when the attribution bar's position or size changes
- * @param timeExtent the [TimeExtent] used by the composable MapView
- * @param onTimeExtentChanged lambda invoked when the composable MapView's [TimeExtent] is changed
- * @param onNavigationChanged lambda invoked when the navigation status of the composable MapView has changed
- * @param onMapRotationChanged lambda invoked when the rotation of this composable MapView has changed
- * @param onMapScaleChanged lambda invoked when the scale of this composable MapView has changed
- * @param onUnitsPerDipChanged lambda invoked when the Units per DIP of this composable MapView has changed
- * @param onSpatialReferenceChanged lambda invoked when the spatial reference of the composable MapView has changed
- * @param onLayerViewStateChanged lambda invoked when the composable MapView's layer view state is changed
- * @param onInteractingChanged lambda invoked when the user starts and ends interacting with the composable MapView
- * @param onRotate lambda invoked when a user performs a rotation gesture on the composable MapView
- * @param onScale lambda invoked when a user performs a pinch gesture on the composable MapView
- * @param onUp lambda invoked when the user removes all their pointers from the composable MapView
- * @param onDown lambda invoked when the user first presses on the composable MapView
- * @param onSingleTapConfirmed lambda invoked when the user taps once on the composable MapView
- * @param onDoubleTap lambda invoked the user double taps on the composable MapView
- * @param onLongPress lambda invoked when a user holds a pointer on the composable MapView
- * @param onTwoPointerTap lambda invoked when a user taps two pointers on the composable MapView
- * @param onPan lambda invoked when a user drags a pointer or pointers across composable MapView
- * @param onDrawStatusChanged lambda invoked when the draw status of the composable MapView is changed
- * @param content the content of the composable MapView
- * @sample com.arcgismaps.toolkit.geoviewcompose.samples.MapViewSample
- * @see
- * - <a href="https://developers.arcgis.com/kotlin/maps-2d/tutorials/display-a-map/">Display a map tutorial</a>
- * - <a href="https://developers.arcgis.com/kotlin/maps-2d/tutorials/display-a-web-map/">Display a web map tutorial</a>
- * - <a href="https://developers.arcgis.com/kotlin/maps-2d/tutorials/add-a-point-line-and-polygon/">Add a point, line, and polygon tutorial</a>
- * @since 200.4.0
- */
-@Deprecated("Deprecation added for backwards compatibility. Use MapView function with imageOverlays instead.", level = DeprecationLevel.HIDDEN)
-@Composable
-public fun MapView(
-    arcGISMap: ArcGISMap,
-    modifier: Modifier = Modifier,
-    onViewpointChangedForCenterAndScale: ((Viewpoint) -> Unit)? = null,
-    onViewpointChangedForBoundingGeometry: ((Viewpoint) -> Unit)? = null,
-    onVisibleAreaChanged: ((Polygon) -> Unit)? = null,
-    viewpointPersistence: ViewpointPersistence = MapViewDefaults.DefaultViewpointPersistence,
-    graphicsOverlays: List<GraphicsOverlay> = remember { emptyList() },
-    locationDisplay: LocationDisplay = rememberLocationDisplay(),
-    geometryEditor: GeometryEditor? = null,
-    mapViewProxy: MapViewProxy? = null,
-    mapViewInteractionOptions: MapViewInteractionOptions = remember { MapViewInteractionOptions() },
-    viewLabelProperties: ViewLabelProperties = remember { ViewLabelProperties() },
-    selectionProperties: SelectionProperties = remember { SelectionProperties() },
-    insets: PaddingValues = MapViewDefaults.DefaultInsets,
-    grid: Grid? = null,
-    backgroundGrid: BackgroundGrid = remember { BackgroundGrid() },
-    wrapAroundMode: WrapAroundMode = WrapAroundMode.EnabledWhenSupported,
-    isAttributionBarVisible: Boolean = true,
-    onAttributionTextChanged: ((String) -> Unit)? = null,
-    onAttributionBarLayoutChanged: ((AttributionBarLayoutChangeEvent) -> Unit)? = null,
-    timeExtent: TimeExtent? = null,
-    onTimeExtentChanged: ((TimeExtent?) -> Unit)? = null,
-    onNavigationChanged: ((isNavigating: Boolean) -> Unit)? = null,
-    onMapRotationChanged: ((Double) -> Unit)? = null,
-    onMapScaleChanged: ((Double) -> Unit)? = null,
-    onUnitsPerDipChanged: ((Double) -> Unit)? = null,
-    onSpatialReferenceChanged: ((spatialReference: SpatialReference?) -> Unit)? = null,
-    onLayerViewStateChanged: ((GeoView.GeoViewLayerViewStateChanged) -> Unit)? = null,
-    onInteractingChanged: ((isInteracting: Boolean) -> Unit)? = null,
-    onRotate: ((RotationChangeEvent) -> Unit)? = null,
-    onScale: ((ScaleChangeEvent) -> Unit)? = null,
-    onUp: ((UpEvent) -> Unit)? = null,
-    onDown: ((DownEvent) -> Unit)? = null,
-    onSingleTapConfirmed: ((SingleTapConfirmedEvent) -> Unit)? = null,
-    onDoubleTap: ((DoubleTapEvent) -> Unit)? = null,
-    onLongPress: ((LongPressEvent) -> Unit)? = null,
-    onTwoPointerTap: ((TwoPointerTapEvent) -> Unit)? = null,
-    onPan: ((PanChangeEvent) -> Unit)? = null,
-    onDrawStatusChanged: ((DrawStatus) -> Unit)? = null,
-    content: (@Composable MapViewScope.() -> Unit)? = null
-) {
-    // Just call through to the new MapView function that takes imageOverlays
-    MapView(
-        arcGISMap = arcGISMap,
-        modifier = modifier,
-        onViewpointChangedForCenterAndScale = onViewpointChangedForCenterAndScale,
-        onViewpointChangedForBoundingGeometry = onViewpointChangedForBoundingGeometry,
-        onVisibleAreaChanged = onVisibleAreaChanged,
-        viewpointPersistence = viewpointPersistence,
-        graphicsOverlays = graphicsOverlays,
-        imageOverlays = remember { emptyList() }, // pass an empty list for imageOverlays
-        locationDisplay = locationDisplay,
-        geometryEditor = geometryEditor,
-        mapViewProxy = mapViewProxy,
-        mapViewInteractionOptions = mapViewInteractionOptions,
-        viewLabelProperties = viewLabelProperties,
-        selectionProperties = selectionProperties,
-        insets = insets,
-        grid = grid,
-        backgroundGrid = backgroundGrid,
-        wrapAroundMode = wrapAroundMode,
-        isAttributionBarVisible = isAttributionBarVisible,
-        onAttributionTextChanged = onAttributionTextChanged,
-        onAttributionBarLayoutChanged = onAttributionBarLayoutChanged,
-        timeExtent = timeExtent,
-        onTimeExtentChanged = onTimeExtentChanged,
-        onNavigationChanged = onNavigationChanged,
-        onMapRotationChanged = onMapRotationChanged,
-        onMapScaleChanged = onMapScaleChanged,
-        onUnitsPerDipChanged = onUnitsPerDipChanged,
-        onSpatialReferenceChanged = onSpatialReferenceChanged,
-        onLayerViewStateChanged = onLayerViewStateChanged,
-        onInteractingChanged = onInteractingChanged,
-        onRotate = onRotate,
-        onScale = onScale,
-        onUp = onUp,
-        onDown = onDown,
-        onSingleTapConfirmed = onSingleTapConfirmed,
-        onDoubleTap = onDoubleTap,
-        onLongPress = onLongPress,
-        onTwoPointerTap = onTwoPointerTap,
-        onPan = onPan,
-        onDrawStatusChanged = onDrawStatusChanged,
-        content = content
-    )
-}
 
 /**
  * Sets up the callbacks for all the view-based [mapView] events except the viewpoint changed events.
diff --git a/toolkit/geoview-compose/src/main/java/com/arcgismaps/toolkit/geoviewcompose/SceneView.kt b/toolkit/geoview-compose/src/main/java/com/arcgismaps/toolkit/geoviewcompose/SceneView.kt
index aaadddd37..07a96367d 100644
--- a/toolkit/geoview-compose/src/main/java/com/arcgismaps/toolkit/geoviewcompose/SceneView.kt
+++ b/toolkit/geoview-compose/src/main/java/com/arcgismaps/toolkit/geoviewcompose/SceneView.kt
@@ -54,6 +54,7 @@ import com.arcgismaps.mapping.view.DrawStatus
 import com.arcgismaps.mapping.view.GeoView
 import com.arcgismaps.mapping.view.GlobeCameraController
 import com.arcgismaps.mapping.view.GraphicsOverlay
+import com.arcgismaps.mapping.view.Grid
 import com.arcgismaps.mapping.view.ImageOverlay
 import com.arcgismaps.mapping.view.LightingMode
 import com.arcgismaps.mapping.view.LongPressEvent
@@ -122,6 +123,10 @@ import java.time.Instant
  * - <a href="https://developers.arcgis.com/kotlin/scenes-3d/tutorials/display-a-web-scene/">Display a web scene tutorial</a>
  * @since 200.4.0
  */
+@Deprecated(
+    message = "Use the SceneView function with `grid` instead. This deprecated function remains to maintain binary compatibility",
+    level = DeprecationLevel.HIDDEN,
+)
 @Composable
 public fun SceneView(
     arcGISScene: ArcGISScene,
@@ -162,6 +167,141 @@ public fun SceneView(
     onPan: ((PanChangeEvent) -> Unit)? = null,
     onDrawStatusChanged: ((DrawStatus) -> Unit)? = null,
     content: (@Composable SceneViewScope.() -> Unit)? = null
+) {
+    // Just call through to the new SceneView function that takes grid
+    SceneView(
+        arcGISScene = arcGISScene,
+        modifier = modifier,
+        onViewpointChangedForCenterAndScale = onViewpointChangedForCenterAndScale,
+        onViewpointChangedForBoundingGeometry = onViewpointChangedForBoundingGeometry,
+        graphicsOverlays = graphicsOverlays,
+        sceneViewProxy = sceneViewProxy,
+        sceneViewInteractionOptions = sceneViewInteractionOptions,
+        viewLabelProperties = viewLabelProperties,
+        selectionProperties = selectionProperties,
+        grid = null,
+        isAttributionBarVisible = isAttributionBarVisible,
+        onAttributionTextChanged = onAttributionTextChanged,
+        onAttributionBarLayoutChanged = onAttributionBarLayoutChanged,
+        cameraController = cameraController,
+        analysisOverlays = analysisOverlays,
+        imageOverlays = imageOverlays,
+        atmosphereEffect = atmosphereEffect,
+        timeExtent = timeExtent,
+        onTimeExtentChanged = onTimeExtentChanged,
+        spaceEffect = spaceEffect,
+        sunTime = sunTime,
+        sunLighting = sunLighting,
+        ambientLightColor = ambientLightColor,
+        onNavigationChanged = onNavigationChanged,
+        onSpatialReferenceChanged = onSpatialReferenceChanged,
+        onLayerViewStateChanged = onLayerViewStateChanged,
+        onInteractingChanged = onInteractingChanged,
+        onCurrentViewpointCameraChanged = onCurrentViewpointCameraChanged,
+        onRotate = onRotate,
+        onScale = onScale,
+        onUp = onUp,
+        onDown = onDown,
+        onSingleTapConfirmed = onSingleTapConfirmed,
+        onDoubleTap = onDoubleTap,
+        onLongPress = onLongPress,
+        onTwoPointerTap = onTwoPointerTap,
+        onPan = onPan,
+        onDrawStatusChanged = onDrawStatusChanged,
+        content = content
+    )
+}
+/**
+ * A compose equivalent of the view-based [SceneView].
+ *
+ * @param arcGISScene the [ArcGISScene] to be rendered by this composable SceneView
+ * @param modifier Modifier to be applied to the composable SceneView
+ * @param onViewpointChangedForCenterAndScale lambda invoked when the viewpoint changes, passing a viewpoint
+ * type of [ViewpointType.CenterAndScale]
+ * @param onViewpointChangedForBoundingGeometry lambda invoked when the viewpoint changes, passing a viewpoint
+ * type of [ViewpointType.BoundingGeometry]
+ * @param graphicsOverlays graphics overlays used by this composable SceneView
+ * @param sceneViewProxy the [SceneViewProxy] to associate with the composable SceneView
+ * @param sceneViewInteractionOptions the [SceneViewInteractionOptions] used by this composable SceneView
+ * @param viewLabelProperties the [ViewLabelProperties] used by the composable SceneView
+ * @param selectionProperties the [SelectionProperties] used by the composable SceneView
+ * @param grid represents the display of a coordinate system [Grid] on the composable SceneView
+ * @param isAttributionBarVisible true if attribution bar is visible in the composable SceneView, false otherwise
+ * @param onAttributionTextChanged lambda invoked when the attribution text of the composable SceneView has changed
+ * @param onAttributionBarLayoutChanged lambda invoked when the attribution bar's position or size changes
+ * @param cameraController the [CameraController] to manage the position, orientation, and movement of the camera
+ * @param analysisOverlays analysis overlays that render the results of 3D visual analysis on the composable SceneView
+ * @param imageOverlays image overlays for displaying images in the composable SceneView
+ * @param atmosphereEffect the effect applied to the scene's atmosphere
+ * @param timeExtent the [TimeExtent] used by the composable SceneView
+ * @param onTimeExtentChanged lambda invoked when the composable SceneView's [TimeExtent] is changed
+ * @param spaceEffect the visual effect of outer space in the composable SceneView
+ * @param sunTime the position of the sun in the composable SceneView based on a specific date and time
+ * @param sunLighting the type of ambient sunlight and shadows in the composable SceneView
+ * @param ambientLightColor the color of the composable SceneView's ambient light
+ * @param onNavigationChanged lambda invoked when the navigation status of the composable SceneView has changed
+ * @param onSpatialReferenceChanged lambda invoked when the spatial reference of the composable SceneView has changed
+ * @param onLayerViewStateChanged lambda invoked when the composable SceneView's layer view state is changed
+ * @param onInteractingChanged lambda invoked when the user starts and ends interacting with the composable SceneView
+ * @param onCurrentViewpointCameraChanged lambda invoked when the viewpoint camera of the composable SceneView has changed
+ * @param onRotate lambda invoked when a user performs a rotation gesture on the composable SceneView
+ * @param onScale lambda invoked when a user performs a pinch gesture on the composable SceneView
+ * @param onUp lambda invoked when the user removes all their pointers from the composable SceneView
+ * @param onDown lambda invoked when the user first presses on the composable SceneView
+ * @param onSingleTapConfirmed lambda invoked when the user taps once on the composable SceneView
+ * @param onDoubleTap lambda invoked the user double taps on the composable SceneView
+ * @param onLongPress lambda invoked when a user holds a pointer on the composable SceneView
+ * @param onTwoPointerTap lambda invoked when a user taps two pointers on the composable SceneView
+ * @param onPan lambda invoked when a user drags a pointer or pointers across composable SceneView
+ * @param onDrawStatusChanged lambda invoked when the draw status of the composable SceneView is changed
+ * @param content the content of the composable SceneView
+ * @sample com.arcgismaps.toolkit.geoviewcompose.samples.SceneViewSample
+ * @see
+ * - <a href="https://developers.arcgis.com/kotlin/scenes-3d/tutorials/display-a-scene/">Display a scene tutorial</a>
+ * - <a href="https://developers.arcgis.com/kotlin/scenes-3d/tutorials/display-a-web-scene/">Display a web scene tutorial</a>
+ * @since 300.0.0
+ */
+@Composable
+public fun SceneView(
+    arcGISScene: ArcGISScene,
+    modifier: Modifier = Modifier,
+    onViewpointChangedForCenterAndScale: ((Viewpoint) -> Unit)? = null,
+    onViewpointChangedForBoundingGeometry: ((Viewpoint) -> Unit)? = null,
+    graphicsOverlays: List<GraphicsOverlay> = remember { emptyList() },
+    sceneViewProxy: SceneViewProxy? = null,
+    sceneViewInteractionOptions: SceneViewInteractionOptions = remember { SceneViewInteractionOptions() },
+    viewLabelProperties: ViewLabelProperties = remember { ViewLabelProperties() },
+    selectionProperties: SelectionProperties = remember { SelectionProperties() },
+    grid: Grid? = null,
+    isAttributionBarVisible: Boolean = true,
+    onAttributionTextChanged: ((String) -> Unit)? = null,
+    onAttributionBarLayoutChanged: ((AttributionBarLayoutChangeEvent) -> Unit)? = null,
+    cameraController: CameraController = remember { GlobeCameraController() },
+    analysisOverlays: List<AnalysisOverlay> = remember { emptyList() },
+    imageOverlays: List<ImageOverlay> = remember { emptyList() },
+    atmosphereEffect: AtmosphereEffect = AtmosphereEffect.HorizonOnly,
+    timeExtent: TimeExtent? = null,
+    onTimeExtentChanged: ((TimeExtent?) -> Unit)? = null,
+    spaceEffect: SpaceEffect = SpaceEffect.Stars,
+    sunTime: Instant = SceneViewDefaults.DefaultSunTime,
+    sunLighting: LightingMode = LightingMode.NoLight,
+    ambientLightColor: Color = SceneViewDefaults.DefaultAmbientLightColor,
+    onNavigationChanged: ((isNavigating: Boolean) -> Unit)? = null,
+    onSpatialReferenceChanged: ((spatialReference: SpatialReference?) -> Unit)? = null,
+    onLayerViewStateChanged: ((GeoView.GeoViewLayerViewStateChanged) -> Unit)? = null,
+    onInteractingChanged: ((isInteracting: Boolean) -> Unit)? = null,
+    onCurrentViewpointCameraChanged: ((camera: Camera) -> Unit)? = null,
+    onRotate: ((RotationChangeEvent) -> Unit)? = null,
+    onScale: ((ScaleChangeEvent) -> Unit)? = null,
+    onUp: ((UpEvent) -> Unit)? = null,
+    onDown: ((DownEvent) -> Unit)? = null,
+    onSingleTapConfirmed: ((SingleTapConfirmedEvent) -> Unit)? = null,
+    onDoubleTap: ((DoubleTapEvent) -> Unit)? = null,
+    onLongPress: ((LongPressEvent) -> Unit)? = null,
+    onTwoPointerTap: ((TwoPointerTapEvent) -> Unit)? = null,
+    onPan: ((PanChangeEvent) -> Unit)? = null,
+    onDrawStatusChanged: ((DrawStatus) -> Unit)? = null,
+    content: (@Composable SceneViewScope.() -> Unit)? = null
 ) {
     val lifecycleOwner = LocalLifecycleOwner.current
     val context = LocalContext.current
@@ -178,6 +318,7 @@ public fun SceneView(
                 it.interactionOptions = sceneViewInteractionOptions
                 it.labeling = viewLabelProperties
                 it.selectionProperties = selectionProperties
+                it.grid = grid
                 it.setTimeExtent(timeExtent)
                 it.cameraController = cameraController
                 it.atmosphereEffect = atmosphereEffect
diff --git a/toolkit/indoors/api/indoors.api b/toolkit/indoors/api/indoors.api
index 34582582e..bc766215a 100644
--- a/toolkit/indoors/api/indoors.api
+++ b/toolkit/indoors/api/indoors.api
@@ -84,9 +84,7 @@ public abstract interface class com/arcgismaps/toolkit/indoors/FloorFilterState
 
 public final class com/arcgismaps/toolkit/indoors/FloorFilterStateKt {
 	public static final fun FloorFilterState (Lcom/arcgismaps/mapping/GeoModel;Lcom/arcgismaps/toolkit/indoors/UIProperties;Lkotlin/jvm/functions/Function1;)Lcom/arcgismaps/toolkit/indoors/FloorFilterState;
-	public static final fun FloorFilterState (Lcom/arcgismaps/mapping/GeoModel;Lkotlinx/coroutines/CoroutineScope;Lcom/arcgismaps/toolkit/indoors/UIProperties;Lkotlin/jvm/functions/Function1;)Lcom/arcgismaps/toolkit/indoors/FloorFilterState;
 	public static synthetic fun FloorFilterState$default (Lcom/arcgismaps/mapping/GeoModel;Lcom/arcgismaps/toolkit/indoors/UIProperties;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/arcgismaps/toolkit/indoors/FloorFilterState;
-	public static synthetic fun FloorFilterState$default (Lcom/arcgismaps/mapping/GeoModel;Lkotlinx/coroutines/CoroutineScope;Lcom/arcgismaps/toolkit/indoors/UIProperties;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/arcgismaps/toolkit/indoors/FloorFilterState;
 }
 
 public abstract class com/arcgismaps/toolkit/indoors/InitializationStatus {
diff --git a/toolkit/indoors/build.gradle.kts b/toolkit/indoors/build.gradle.kts
index 5ebdef99b..072341383 100644
--- a/toolkit/indoors/build.gradle.kts
+++ b/toolkit/indoors/build.gradle.kts
@@ -1,64 +1,9 @@
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("artifact-deploy")
-    alias(libs.plugins.binary.compatibility.validator) apply true
+    alias(libs.plugins.arcgismaps.kotlin.toolkit)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.indoors"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
-    defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt()
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    buildFeatures {
-        compose = true
-    }
-    // If this were not an android project, we would just write `explicitApi()` in the Kotlin scope.
-    // but as an android project could write `freeCompilerArgs = listOf("-Xexplicit-api=strict")`
-    // in the kotlinOptions above, but that would enforce api rules on the test code, which we don't want.
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-        if ("Test" !in name) {
-            compilerOptions {
-                freeCompilerArgs.add("-Xexplicit-api=strict")
-            }
-        }
-    }
-
-    /**
-     * Configures the test report for connected (instrumented) tests to be copied to a central
-     * folder in the project's root directory.
-     */
-    @Suppress("UnstableApiUsage")
-    testOptions {
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        val connectedTestReportsPath: String by project
-        reportDir = "$connectedTestReportsPath/${project.name}"
-    }
-
-    publishing {
-        singleVariant("release") {
-            // This is the default variant.
-        }
-    }
 }
 
 apiValidation {
@@ -73,17 +18,7 @@ apiValidation {
     ignoredClasses.addAll(composableSingletons)
 }
 
-
 dependencies {
-    api(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.lifecycle.runtime.compose)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.material.icons)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(libs.bundles.composeTest)
-    androidTestImplementation(project(mapOf("path" to ":composable-map")))
-    debugImplementation(libs.bundles.debug)
+    // Module-specific dependencies go here
+    androidTestImplementation(project(":geoview-compose"))
 }
diff --git a/toolkit/indoors/src/androidTest/java/com/arcgismaps/toolkit/indoors/FloorFilterTests.kt b/toolkit/indoors/src/androidTest/java/com/arcgismaps/toolkit/indoors/FloorFilterTests.kt
index 0b5470d9b..d5f4fe2d9 100644
--- a/toolkit/indoors/src/androidTest/java/com/arcgismaps/toolkit/indoors/FloorFilterTests.kt
+++ b/toolkit/indoors/src/androidTest/java/com/arcgismaps/toolkit/indoors/FloorFilterTests.kt
@@ -15,10 +15,9 @@
  *
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.arcgismaps.toolkit.indoors
 
+import android.util.Log
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.assertIsNotDisplayed
 import androidx.compose.ui.test.junit4.createComposeRule
@@ -26,13 +25,11 @@ import androidx.compose.ui.test.onAllNodesWithContentDescription
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.performClick
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
 import com.arcgismaps.mapping.ArcGISMap
 import com.arcgismaps.mapping.PortalItem
 import com.arcgismaps.mapping.Viewpoint
 import com.arcgismaps.portal.Portal
-import com.arcgismaps.toolkit.composablemap.MapInterface
-import com.arcgismaps.toolkit.composablemap.MapInterfaceImpl
+import com.arcgismaps.toolkit.geoviewcompose.MapViewProxy
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -152,15 +149,16 @@ class FloorFilterTests {
 
 class MapViewModel(
     arcGISMap: ArcGISMap
-) : ViewModel(), MapInterface by MapInterfaceImpl(arcGISMap) {
+) : ViewModel() {
+    private val mapProxy = MapViewProxy()
     val floorFilterState: FloorFilterState =
-        FloorFilterState(this.map.value, viewModelScope) { floorFilterSelection ->
+        FloorFilterState(geoModel = arcGISMap) { floorFilterSelection ->
             when (floorFilterSelection.type) {
                 is FloorFilterSelection.Type.FloorSite -> {
                     val floorFilterSelectionType =
                         floorFilterSelection.type as FloorFilterSelection.Type.FloorSite
                     floorFilterSelectionType.site.geometry?.let {
-                        this.setViewpoint(Viewpoint(it))
+                        mapProxy.setViewpoint(Viewpoint(it))
                     }
                 }
 
@@ -168,11 +166,10 @@ class MapViewModel(
                     val floorFilterSelectionType =
                         floorFilterSelection.type as FloorFilterSelection.Type.FloorFacility
                     floorFilterSelectionType.facility.geometry?.let {
-                        this.setViewpoint(Viewpoint(it))
+                        mapProxy.setViewpoint(Viewpoint(it))
                     }
                 }
-
-                else -> {}
+                else -> {/* Do nothing for other FloorFilterSelection types */ }
             }
         }
 }
diff --git a/toolkit/indoors/src/main/java/com/arcgismaps/toolkit/indoors/FloorFilter.kt b/toolkit/indoors/src/main/java/com/arcgismaps/toolkit/indoors/FloorFilter.kt
index c511572a0..242b06099 100644
--- a/toolkit/indoors/src/main/java/com/arcgismaps/toolkit/indoors/FloorFilter.kt
+++ b/toolkit/indoors/src/main/java/com/arcgismaps/toolkit/indoors/FloorFilter.kt
@@ -74,15 +74,14 @@ import com.arcgismaps.mapping.floor.FloorFacility
  *
  * The simplest workflow is for the app to instantiate a [FloorFilter] using an instance of
  * the [FloorFilterState] to ideally display it within the GeoView. The [Modifier] properties of
- * [Box],[Column] or [Row] could be used to position the [FloorFilter] inside of a Composable Map.
+ * [Box],[Column] or [Row] could be used to position the [FloorFilter] inside of a composable MapView.
  *
  * _Workflow example:_
  *
  * ```
- *  val mapViewModel = viewModel<MapViewModel>(factory = MapViewModelFactory(floorAwareWebMap))
- *  ComposableMap(
+ *  MapView(
  *      modifier = Modifier.fillMaxSize(),
- *      mapInterface = mapViewModel
+ *      arcGISMap = mapViewModel.floorAwareWebMap
  *  ) {
  *      Box(
  *          modifier = Modifier.fillMaxSize().padding(horizontal = 20.dp, vertical = 40.dp),
diff --git a/toolkit/indoors/src/main/java/com/arcgismaps/toolkit/indoors/FloorFilterState.kt b/toolkit/indoors/src/main/java/com/arcgismaps/toolkit/indoors/FloorFilterState.kt
index 08ce965c8..8a74681d6 100644
--- a/toolkit/indoors/src/main/java/com/arcgismaps/toolkit/indoors/FloorFilterState.kt
+++ b/toolkit/indoors/src/main/java/com/arcgismaps/toolkit/indoors/FloorFilterState.kt
@@ -425,29 +425,6 @@ public enum class ButtonPosition {
     Bottom
 }
 
-/**
- * Factory function for the creating FloorFilterState.
- *
- * @param geoModel the floor aware geoModel that drives the [FloorFilter]
- * @param coroutineScope scope for [FloorFilterState] that it can use to load the [GeoModel] and the
- *        FloorManager
- * @param uiProperties set of properties to customize the UI used in the [FloorFilter]
- * @param onSelectionChangedListener a lambda to facilitate setting of new ViewPoint on the [GeoView]
- *        with the Site or Facilities extent whenever a new Site or Facility is selected
- * @since 200.2.0
- */
-@Deprecated(
-    "Use the factory function without the coroutineScope parameter",
-    ReplaceWith("FloorFilterState(geoModel, uiProperties, onSelectionChangedListener)")
-)
-public fun FloorFilterState(
-    geoModel: GeoModel,
-    coroutineScope: CoroutineScope,
-    uiProperties: UIProperties = UIProperties(),
-    onSelectionChangedListener: (FloorFilterSelection) -> Unit = { }
-): FloorFilterState =
-    FloorFilterStateImpl(geoModel, uiProperties, onSelectionChangedListener)
-
 /**
  * Factory function for the creating FloorFilterState.
  *
diff --git a/toolkit/legend/build.gradle.kts b/toolkit/legend/build.gradle.kts
index fe9a99d38..7c814795a 100644
--- a/toolkit/legend/build.gradle.kts
+++ b/toolkit/legend/build.gradle.kts
@@ -16,70 +16,12 @@
  *
  */
 
-
 plugins {
-    alias(libs.plugins.binary.compatibility.validator) apply true
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("artifact-deploy")
+    alias(libs.plugins.arcgismaps.kotlin.toolkit)
 }
+
 android {
     namespace = "com.arcgismaps.toolkit.legend"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
-    defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt()
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    buildFeatures {
-        compose = true
-    }
-    // If this were not an android project, we would just write `explicitApi()` in the Kotlin scope.
-    // but as an android project could write `freeCompilerArgs = listOf("-Xexplicit-api=strict")`
-    // in the kotlinOptions above, but that would enforce api rules on the test code, which we don't want.
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-        if ("Test" !in name) {
-            compilerOptions {
-                freeCompilerArgs.add("-Xexplicit-api=strict")
-            }
-        }
-    }
-
-    /**
-     * Configures the test report for connected (instrumented) tests to be copied to a central
-     * folder in the project's root directory.
-     */
-    @Suppress("UnstableApiUsage")
-    testOptions {
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        val connectedTestReportsPath: String by project
-        reportDir = "$connectedTestReportsPath/${project.name}"
-    }
-    lint {
-        targetSdk = libs.versions.compileSdk.get().toInt()
-    }
-
-    publishing {
-        singleVariant("release") {
-            // This is the default variant.
-        }
-    }
 }
 
 apiValidation {
@@ -94,13 +36,6 @@ apiValidation {
 }
 
 dependencies {
-    api(arcgis.mapsSdk)
-    implementation(project(":geoview-compose"))
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
+    // Module-specific dependencies go here
+    androidTestImplementation(project(":geoview-compose"))
 }
diff --git a/toolkit/offline/build.gradle.kts b/toolkit/offline/build.gradle.kts
index 6efcead7b..6cd63b8ca 100644
--- a/toolkit/offline/build.gradle.kts
+++ b/toolkit/offline/build.gradle.kts
@@ -16,72 +16,12 @@
  *
  */
 
-
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("artifact-deploy")
-    id("kotlin-parcelize")
-    alias(libs.plugins.kotlin.serialization) apply true
-    alias(libs.plugins.binary.compatibility.validator) apply true
+    alias(libs.plugins.arcgismaps.kotlin.toolkit)
 }
+
 android {
     namespace = "com.arcgismaps.toolkit.offline"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
-    defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt()
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    buildFeatures {
-        compose = true
-    }
-    // If this were not an android project, we would just write `explicitApi()` in the Kotlin scope.
-    // but as an android project could write `freeCompilerArgs = listOf("-Xexplicit-api=strict")`
-    // in the kotlinOptions above, but that would enforce api rules on the test code, which we don't want.
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-        if ("Test" !in name) {
-            compilerOptions {
-                freeCompilerArgs.add("-Xexplicit-api=strict")
-            }
-        }
-    }
-    lint {
-        disable += "MissingTranslation"
-    }
-
-    /**
-     * Configures the test report for connected (instrumented) tests to be copied to a central
-     * folder in the project's root directory.
-     */
-    @Suppress("UnstableApiUsage")
-    testOptions {
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        val connectedTestReportsPath: String by project
-        reportDir = "$connectedTestReportsPath/${project.name}"
-    }
-
-    publishing {
-        singleVariant("release") {
-            // This is the default variant.
-        }
-    }
 }
 
 apiValidation {
@@ -101,16 +41,7 @@ apiValidation {
 }
 
 dependencies {
-    api(arcgis.mapsSdk)
+    // Module-specific dependency here
     implementation(project(":geoview-compose"))
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.work.runtime.ktx)
-    implementation(libs.androidx.material.icons)
-    implementation(libs.kotlinx.serialization.json)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
 }
diff --git a/toolkit/popup/api/popup.api b/toolkit/popup/api/popup.api
index 18e0e8002..6f71ee9f8 100644
--- a/toolkit/popup/api/popup.api
+++ b/toolkit/popup/api/popup.api
@@ -2,27 +2,3 @@ public final class com/arcgismaps/toolkit/popup/PopupKt {
 	public static final fun Popup (Lcom/arcgismaps/mapping/popup/Popup;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
 }
 
-public final class com/arcgismaps/toolkit/popup/internal/element/fieldselement/FieldsElementState$Creator : android/os/Parcelable$Creator {
-	public fun <init> ()V
-	public final fun createFromParcel (Landroid/os/Parcel;)Lcom/arcgismaps/toolkit/popup/internal/element/fieldselement/FieldsElementState;
-	public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object;
-	public final fun newArray (I)[Lcom/arcgismaps/toolkit/popup/internal/element/fieldselement/FieldsElementState;
-	public synthetic fun newArray (I)[Ljava/lang/Object;
-}
-
-public final class com/arcgismaps/toolkit/popup/internal/element/textelement/TextElementState$Creator : android/os/Parcelable$Creator {
-	public fun <init> ()V
-	public final fun createFromParcel (Landroid/os/Parcel;)Lcom/arcgismaps/toolkit/popup/internal/element/textelement/TextElementState;
-	public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object;
-	public final fun newArray (I)[Lcom/arcgismaps/toolkit/popup/internal/element/textelement/TextElementState;
-	public synthetic fun newArray (I)[Ljava/lang/Object;
-}
-
-public final class com/arcgismaps/toolkit/popup/internal/ui/fileviewer/ViewableFile$Creator : android/os/Parcelable$Creator {
-	public fun <init> ()V
-	public final fun createFromParcel (Landroid/os/Parcel;)Lcom/arcgismaps/toolkit/popup/internal/ui/fileviewer/ViewableFile;
-	public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object;
-	public final fun newArray (I)[Lcom/arcgismaps/toolkit/popup/internal/ui/fileviewer/ViewableFile;
-	public synthetic fun newArray (I)[Ljava/lang/Object;
-}
-
diff --git a/toolkit/popup/build.gradle.kts b/toolkit/popup/build.gradle.kts
index 05489ca9a..cf3c1376f 100644
--- a/toolkit/popup/build.gradle.kts
+++ b/toolkit/popup/build.gradle.kts
@@ -17,65 +17,15 @@
  */
 
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("artifact-deploy")
-    id("kotlin-parcelize")
-    alias(libs.plugins.binary.compatibility.validator) apply true
+    alias(libs.plugins.arcgismaps.kotlin.toolkit)
 }
+
 android {
     namespace = "com.arcgismaps.toolkit.popup"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
-    defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt()
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
     kotlinOptions {
-        jvmTarget = "1.8"
         // This flag is the same as applying '@ConsistentCopyVisibility' annotation to all data classes in the module.
         freeCompilerArgs = freeCompilerArgs + listOf("-Xconsistent-data-class-copy-visibility")
     }
-
-    buildFeatures {
-        compose = true
-    }
-    // If this were not an android project, we would just write `explicitApi()` in the Kotlin scope.
-    // but as an android project could write `freeCompilerArgs = listOf("-Xexplicit-api=strict")`
-    // in the kotlinOptions above, but that would enforce api rules on the test code, which we don't want.
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-        if ("Test" !in name) {
-            compilerOptions {
-                freeCompilerArgs.add("-Xexplicit-api=strict")
-            }
-        }
-    }
-
-    // Avoids an empty test report showing up in the CI integration test report.
-    // Remove this if tests will be added.
-    tasks.withType<Test> {
-        enabled = false
-    }
-
-    publishing {
-        singleVariant("release") {
-            // This is the default variant.
-        }
-    }
-
 }
 
 apiValidation {
@@ -92,18 +42,10 @@ apiValidation {
 }
 
 dependencies {
-    api(arcgis.mapsSdk)
+    // Module-specific dependencies go here
     implementation(platform(libs.coil.bom))
     implementation(libs.coil.compose)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.material.icons)
     implementation(libs.androidx.media3.exoplayer)
     implementation(libs.androidx.media3.exoplayer.dash)
     implementation(libs.androidx.media3.ui)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
 }
diff --git a/toolkit/scalebar/build.gradle.kts b/toolkit/scalebar/build.gradle.kts
index 70e08a20f..7252f5f74 100644
--- a/toolkit/scalebar/build.gradle.kts
+++ b/toolkit/scalebar/build.gradle.kts
@@ -17,75 +17,13 @@
  */
 
 plugins {
-    alias(libs.plugins.binary.compatibility.validator) apply true
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("artifact-deploy")
+    alias(libs.plugins.arcgismaps.kotlin.toolkit)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.scalebar"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
-    defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt()
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    buildFeatures {
-        compose = true
-    }
-    // If this were not an android project, we would just write `explicitApi()` in the Kotlin scope.
-    // but as an android project could write `freeCompilerArgs = listOf("-Xexplicit-api=strict")`
-    // in the kotlinOptions above, but that would enforce api rules on the test code, which we don't want.
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-        if ("Test" !in name) {
-            compilerOptions {
-                freeCompilerArgs.add("-Xexplicit-api=strict")
-            }
-        }
-    }
-
-    /**
-     * Configures the test report for connected (instrumented) tests to be copied to a central
-     * folder in the project's root directory.
-     */
-    @Suppress("UnstableApiUsage")
-    testOptions {
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        val connectedTestReportsPath: String by project
-        reportDir = "$connectedTestReportsPath/${project.name}"
-    }
-
-    publishing {
-        singleVariant("release") {
-            // This is the default variant.
-        }
-    }
 }
 
 dependencies {
-    api(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
+    // Module-specific dependencies go here
 }
diff --git a/toolkit/template/build.gradle.kts b/toolkit/template/build.gradle.kts
index c5abca024..4b60123a1 100644
--- a/toolkit/template/build.gradle.kts
+++ b/toolkit/template/build.gradle.kts
@@ -17,68 +17,17 @@
  */
 
 plugins {
-    alias(libs.plugins.binary.compatibility.validator) apply true
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
+    alias(libs.plugins.arcgismaps.kotlin.toolkit)
 }
 
 android {
     namespace = "com.arcgismaps.toolkit.template"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
-    defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt()
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    buildFeatures {
-        compose = true
-    }
-    // If this were not an android project, we would just write `explicitApi()` in the Kotlin scope.
-    // but as an android project could write `freeCompilerArgs = listOf("-Xexplicit-api=strict")`
-    // in the kotlinOptions above, but that would enforce api rules on the test code, which we don't want.
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-        if ("Test" !in name) {
-            compilerOptions {
-                freeCompilerArgs.add("-Xexplicit-api=strict")
-            }
-        }
-    }
+}
 
-    /**
-     * Configures the test report for connected (instrumented) tests to be copied to a central
-     * folder in the project's root directory.
-     */
-    @Suppress("UnstableApiUsage")
-    testOptions {
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        val connectedTestReportsPath: String by project
-        reportDir = "$connectedTestReportsPath/${project.name}"
-    }
+toolkit {
+    releasable = false
 }
 
 dependencies {
-    api(arcgis.mapsSdk)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.activity.compose)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
+    // Module-specific dependencies go here
 }
diff --git a/toolkit/utilitynetworks/build.gradle.kts b/toolkit/utilitynetworks/build.gradle.kts
index ef879172e..e4d03f8f7 100644
--- a/toolkit/utilitynetworks/build.gradle.kts
+++ b/toolkit/utilitynetworks/build.gradle.kts
@@ -17,12 +17,8 @@
  */
 
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
-    id("artifact-deploy")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-    alias(libs.plugins.binary.compatibility.validator) apply true
+    alias(libs.plugins.arcgismaps.kotlin.toolkit)
+    alias(libs.plugins.gradle.secrets)
 }
 
 secrets {
@@ -31,61 +27,13 @@ secrets {
 
 android {
     namespace = "com.arcgismaps.toolkit.utilitynetworks"
-    compileSdk = libs.versions.compileSdk.get().toInt()
-
-    defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt()
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+    buildFeatures {
+        buildConfig = true
     }
     kotlinOptions {
-        jvmTarget = "1.8"
         // This flag is the same as applying '@ConsistentCopyVisibility' annotation to all data classes in the module.
         freeCompilerArgs = freeCompilerArgs + listOf("-Xconsistent-data-class-copy-visibility")
     }
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-    
-    // If this were not an android project, we would just write `explicitApi()` in the Kotlin scope.
-    // but as an android project could write `freeCompilerArgs = listOf("-Xexplicit-api=strict")`
-    // in the kotlinOptions above, but that would enforce api rules on the test code, which we don't want.
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-        if ("Test" !in name) {
-            compilerOptions {
-                freeCompilerArgs.add("-Xexplicit-api=strict")
-            }
-        }
-    }
-
-    /**
-     * Configures the test report for connected (instrumented) tests to be copied to a central
-     * folder in the project's root directory.
-     */
-    @Suppress("UnstableApiUsage")
-    testOptions {
-        targetSdk = libs.versions.compileSdk.get().toInt()
-        val connectedTestReportsPath: String by project
-        reportDir = "$connectedTestReportsPath/${project.name}"
-    }
-
-    publishing {
-        singleVariant("release") {
-            // This is the default variant.
-        }
-    }
 }
 
 apiValidation {
@@ -110,18 +58,7 @@ apiValidation {
 }
 
 dependencies {
-    api(arcgis.mapsSdk)
+    // Module-specific dependencies go here
     implementation(project(":geoview-compose"))
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.composeCore)
-    implementation(libs.bundles.core)
-    implementation(libs.androidx.lifecycle.runtime.compose)
-    implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.compose.navigation)
-    implementation(libs.androidx.material.icons)
-    testImplementation(libs.bundles.unitTest)
-    androidTestImplementation(libs.truth)
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.bundles.composeTest)
-    debugImplementation(libs.bundles.debug)
 }