diff --git a/.gitignore b/.gitignore
index fa0506f..89f36f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 .idea
 .gradle
+.kotlin
 local.properties
 build
 capture
+app/release
 
diff --git a/app/build.gradle b/app/build.gradle
deleted file mode 100644
index 04ce6af..0000000
--- a/app/build.gradle
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Copyright 2020 Google LLC
- *
- * 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
- *
- *     https://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.
- */
-apply plugin: 'com.android.application'
-apply plugin: 'com.google.android.gms.strict-version-matcher-plugin'
-apply plugin: 'kotlin-android'
-apply plugin: 'com.google.android.gms.oss-licenses-plugin'
-
-android {
-    compileSdkVersion 30
-
-    defaultConfig {
-        applicationId "com.amapi.extensibility.demo"
-        minSdkVersion 21
-        targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt')
-        }
-    }
-
-    compileOptions {
-        // Flag to enable support for the new language APIs
-        coreLibraryDesugaringEnabled true
-
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        freeCompilerArgs = ['-Xjvm-default=enable']
-        jvmTarget = '1.8'
-    }
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
-
-    implementation 'io.grpc:grpc-okhttp:1.44.0' // CURRENT_GRPC_VERSION
-    implementation 'com.google.android.libraries.enterprise.amapi:amapi:1.0.1'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.5.0'
-    implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'com.google.android.material:material:1.2.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'com.google.guava:guava:30.0-android'
-    implementation 'androidx.core:core:1.3.2'
-    implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
-
-    testImplementation 'junit:junit:4.12'
-
-    androidTestImplementation 'androidx.test:rules:1.1.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test:runner:1.1.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-}
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
new file mode 100644
index 0000000..1ab97ee
--- /dev/null
+++ b/app/build.gradle.kts
@@ -0,0 +1,89 @@
+/* Copyright 2020 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+//classpath("com.google.android.gms:strict-version-matcher-plugin:1.2.4")
+
+plugins {
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+//    id("com.google.android.gms.strict-version-matcher-plugin")
+    id("com.google.android.gms.oss-licenses-plugin")
+}
+
+android {
+    namespace = "com.amapi.extensibility.demo"
+    compileSdk = 35
+
+    defaultConfig {
+        applicationId = "com.amapi.extensibility.demo"
+        minSdk = 21
+        targetSdk = 34
+        versionCode = 1
+        versionName = "1.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        debug {
+            isMinifyEnabled = false
+            isDebuggable = true
+        }
+
+        release {
+            isMinifyEnabled = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+
+    buildFeatures {
+        viewBinding = true
+    }
+}
+
+dependencies {
+//    implementation 'io.grpc:grpc-okhttp:1.44.0' // CURRENT_GRPC_VERSION
+//    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+//    implementation 'com.google.android.material:material:1.12.0'
+//    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
+//    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
+//    implementation 'com.google.android.gms:play-services-oss-licenses:17.1.0'
+
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.constraint.layout)
+    api(libs.amapi)
+    implementation(libs.play.services.oss.licenses)
+    implementation(libs.material)
+    implementation(libs.androidx.constraint.layout)
+    implementation(libs.androidx.constraint.layout)
+    implementation(libs.coroutines)
+
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.rules)
+    androidTestImplementation(libs.androidx.runner)
+    androidTestImplementation(libs.androidx.espresso.core)
+}
diff --git a/app/src/androidTest/java/com/amapi/extensibility/demo/commands/CommandTest.kt b/app/src/androidTest/java/com/amapi/extensibility/demo/commands/CommandTest.kt
index 3e922a5..8fef9bb 100644
--- a/app/src/androidTest/java/com/amapi/extensibility/demo/commands/CommandTest.kt
+++ b/app/src/androidTest/java/com/amapi/extensibility/demo/commands/CommandTest.kt
@@ -18,36 +18,75 @@ import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.replaceText
 import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withSubstring
+import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.rule.ActivityTestRule
 import com.amapi.extensibility.demo.R
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-/** Tests main activity from test app. */
+/**
+ * Instrumentation tests for CommandActivity.
+ */
 @RunWith(AndroidJUnit4::class)
 class CommandTest {
-  @Rule
-  @JvmField
-  var mActivityRule: ActivityTestRule<CommandActivity> =
-    ActivityTestRule(CommandActivity::class.java)
+  /**
+   *  Replaced ActivityTestRule with ActivityScenarioRule to better manage the Activity's lifecycle.
+   */
+  @get:Rule
+  val activityRule = ActivityScenarioRule(CommandActivity::class.java)
 
+  /**
+   * Tests retrieving a command by ID.
+   */
   @Test
-  fun getCommandById() {
+  fun getCommandById_displaysUnimplementedMessage() {
+    // Arrange: Input a command ID.
     onView(withId(R.id.command_id_edittext)).perform(replaceText("1"))
+
+    // Act: Click the button to retrieve the command.
     onView(withId(R.id.get_command_button)).perform(click())
+
+    // Assert: Verify the result text view displays the expected "UNIMPLEMENTED" message.
     onView(withId(R.id.command_result_textview))
       .check(ViewAssertions.matches(withSubstring("UNIMPLEMENTED")))
   }
 
   @Test
-  fun issueCommand() {
-    onView(withId(R.id.clear_app_package_edittext)).perform(replaceText("com.android.settings"))
+  fun testClearAppDataCommand_editTextIsPresent(){
+    onView(withId(R.id.clear_app_package_edittext))
+      .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+  }
+
+  @Test
+  fun testClearAppDataCommand_editTextCanBeFilled(){
+    onView(withId(R.id.clear_app_package_edittext)).perform(replaceText(TEST_PACKAGE_NAME))
+    onView(withId(R.id.clear_app_package_edittext))
+      .check(ViewAssertions.matches(ViewMatchers.withText(TEST_PACKAGE_NAME)))
+  }
+
+  @Test
+  fun testClearAppDataCommand_buttonIsPresent(){
+    onView(withId(R.id.clear_app_command_button))
+      .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+  }
+
+  /**
+   * Verifies that attempting to clear an app's data via the UI results in the correct "UNIMPLEMENTED"
+   * message being displayed. This checks that the command is received, but the action is not supported yet.
+   */
+  @Test
+  fun testClearAppDataCommand_displaysUnimplementedMessage() {
+    onView(withId(R.id.clear_app_package_edittext)).perform(replaceText(TEST_PACKAGE_NAME))
     onView(withId(R.id.clear_app_command_button)).perform(click())
     onView(withId(R.id.command_result_textview))
       .check(ViewAssertions.matches(withSubstring("UNIMPLEMENTED")))
   }
-}
+
+  companion object {
+    private const val TEST_PACKAGE_NAME = "com.android.settings"
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/amapi/extensibility/demo/commands/CommandActivity.kt b/app/src/main/java/com/amapi/extensibility/demo/commands/CommandActivity.kt
index 23ace23..c58e98b 100644
--- a/app/src/main/java/com/amapi/extensibility/demo/commands/CommandActivity.kt
+++ b/app/src/main/java/com/amapi/extensibility/demo/commands/CommandActivity.kt
@@ -16,36 +16,37 @@ package com.amapi.extensibility.demo.commands
 
 import android.content.Intent
 import android.os.Bundle
-import android.widget.Button
-import android.widget.EditText
-import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.ViewModelProvider
-import com.amapi.extensibility.demo.R
+import com.amapi.extensibility.demo.databinding.ActivityCommandBinding
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
 
 class CommandActivity : AppCompatActivity() {
   private lateinit var commandViewModel: CommandViewModel
+  private lateinit var binding: ActivityCommandBinding
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
-    setContentView(R.layout.activity_command)
-    commandViewModel = ViewModelProvider(this).get(CommandViewModel::class.java)
+    binding = ActivityCommandBinding.inflate(layoutInflater)
+    setContentView(binding.root)
+
+    commandViewModel = ViewModelProvider(this)[CommandViewModel::class.java]
     commandViewModel.commandResultLiveData.observe(this) { results ->
-      findViewById<TextView>(R.id.command_result_textview).apply {
-        text = results
-      }
-    }
-    findViewById<Button>(R.id.get_command_button).setOnClickListener {
-      commandViewModel.getCommand(findViewById<EditText>(R.id.command_id_edittext).text.toString())
+      binding.commandResultTextview.text = results
     }
-    findViewById<Button>(R.id.clear_app_command_button).setOnClickListener {
-      commandViewModel.issueClearAppDataCommand(
-        findViewById<EditText>(R.id.clear_app_package_edittext).text.toString()
-      )
-    }
-    findViewById<Button>(R.id.license_button).setOnClickListener {
+
+    setupListeners()
+  }
+
+  private fun setupListeners() {
+    binding.getCommandButton.setOnClickListener {
+      commandViewModel.getCommand(binding.commandIdEdittext.text.toString())
+      }
+    binding.clearAppCommandButton.setOnClickListener {
+      commandViewModel.issueClearAppDataCommand(binding.clearAppPackageEdittext.text.toString())
+      }
+    binding.licenseButton.setOnClickListener {
       startActivity(Intent(this, OssLicensesMenuActivity::class.java))
-    }
+      }
   }
 }
diff --git a/app/src/main/java/com/amapi/extensibility/demo/commands/CommandUtils.kt b/app/src/main/java/com/amapi/extensibility/demo/commands/CommandUtils.kt
index 6a087d2..558a88a 100644
--- a/app/src/main/java/com/amapi/extensibility/demo/commands/CommandUtils.kt
+++ b/app/src/main/java/com/amapi/extensibility/demo/commands/CommandUtils.kt
@@ -17,11 +17,19 @@ package com.amapi.extensibility.demo.commands
 import com.google.android.managementapi.commands.model.Command
 import java.lang.StringBuilder
 
-/** Contains command related utility methods. */
+/**
+ * Utility methods for working with [Command] objects.
+ */
 object CommandUtils {
   /**
-   * Returns the properly formatted string representation of the given [Command] in a way that can
-   * be logged and/or surfaced in UI.
+   * Generates a human-readable string representation of a [Command] for logging or UI display.
+   *
+   * The output includes the command's ID, creation time, completion time, and state.
+   * If the command's status is `CLEAR_APPS_DATA_STATUS`, it will also include a detailed breakdown
+   * of the status of each app, mapping app identifiers to their clear status.
+   *
+   * @param command The [Command] to parse and format.
+   * @return A formatted string representation of the command.
    */
   fun parseCommandForPrettyPrint(command: Command): String {
     val stringBuilder =
diff --git a/app/src/main/java/com/amapi/extensibility/demo/commands/InMemoryCommandRepository.kt b/app/src/main/java/com/amapi/extensibility/demo/commands/InMemoryCommandRepository.kt
index 3798a85..c7dbdea 100644
--- a/app/src/main/java/com/amapi/extensibility/demo/commands/InMemoryCommandRepository.kt
+++ b/app/src/main/java/com/amapi/extensibility/demo/commands/InMemoryCommandRepository.kt
@@ -20,7 +20,7 @@ import com.google.android.managementapi.commands.model.Command
 
 object InMemoryCommandRepository {
   private val commandLiveData: MutableLiveData<Command> = MutableLiveData()
-  fun onCommandStatusChanged(command: Command?) {
+  fun onCommandStatusChanged(command: Command) {
     commandLiveData.postValue(command)
   }
 
diff --git a/app/src/main/java/com/amapi/extensibility/demo/notification/NotificationReceiverService.kt b/app/src/main/java/com/amapi/extensibility/demo/notification/NotificationReceiverService.kt
index 71810eb..d59a1d2 100644
--- a/app/src/main/java/com/amapi/extensibility/demo/notification/NotificationReceiverService.kt
+++ b/app/src/main/java/com/amapi/extensibility/demo/notification/NotificationReceiverService.kt
@@ -22,8 +22,22 @@ import com.google.android.managementapi.commands.CommandListener
 import com.google.android.managementapi.commands.model.Command
 import com.google.android.managementapi.notification.NotificationReceiverService
 
+/**
+ * Service responsible for receiving and processing notifications from Android Policy Controller.
+ *
+ * This service extends [NotificationReceiverService] to handle incoming notifications.
+ * It provides a custom [CommandListener] to listen for changes in command status.
+ */
 class NotificationReceiverService : NotificationReceiverService() {
 
+  /**
+   * Returns a [CommandListener] that listens for command status changes.
+   *
+   * This listener is notified when the status of a command changes. When a command's status
+   * changes, the listener logs the change and updates the in-memory command repository.
+   *
+   * @return A [CommandListener] instance.
+   */
   override fun getCommandListener(): CommandListener {
     return object : CommandListener {
       override fun onCommandStatusChanged(command: Command) {
diff --git a/app/src/main/java/com/amapi/extensibility/demo/util/LogConstants.kt b/app/src/main/java/com/amapi/extensibility/demo/util/LogConstants.kt
index 2e26051..d392782 100644
--- a/app/src/main/java/com/amapi/extensibility/demo/util/LogConstants.kt
+++ b/app/src/main/java/com/amapi/extensibility/demo/util/LogConstants.kt
@@ -14,4 +14,7 @@
  */
 package com.amapi.extensibility.demo.util
 
+/**
+ * The tag used for logging throughout the Amapi Extensibility Demo application.
+ */
 const val TAG = "AmapiExtensibilityDemo"
diff --git a/app/src/main/res/layout/activity_command.xml b/app/src/main/res/layout/activity_command.xml
index ce03bff..0e381b6 100644
--- a/app/src/main/res/layout/activity_command.xml
+++ b/app/src/main/res/layout/activity_command.xml
@@ -18,7 +18,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".CommandActivity">
+    tools:context=".commands.CommandActivity">
 
   <TextView
       android:id="@+id/command_result_textview"
@@ -31,7 +31,7 @@
       app:layout_constraintTop_toTopOf="parent"
       app:layout_constraintLeft_toLeftOf="parent"
       app:layout_constraintRight_toRightOf="parent"
-      android:text="Issue Command result"/>
+      android:text="@string/issue_command_result"/>
 
   <EditText
       android:id="@+id/command_id_edittext"
@@ -90,5 +90,4 @@
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@+id/clear_app_command_button"/>
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 817f2bd..aee48e5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,4 +7,5 @@
   <string name="get_command_button" description="Button text for command to be fetched. [CHAR LIMIT=NONE]">Get command</string>
 
   <string name="license_button_txt" description="See licenses button text. [CHAR LIMIT=NONE]">See Licenses</string>
+    <string name="issue_command_result">Issue Command result</string>
 </resources>
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index db98b59..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2020 Google LLC
- *
- * 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
- *
- *     https://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.
- */
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
-    ext.kotlin_version = "1.6.10"
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools:r8:3.0.65'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:4.0.2'
-        classpath 'com.google.android.gms:strict-version-matcher-plugin:1.2.1'
-        classpath 'net.sf.proguard:proguard-gradle:6.2.2'
-        classpath 'com.google.android.gms:oss-licenses-plugin:0.10.2'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
diff --git a/settings.gradle b/build.gradle.kts
similarity index 74%
rename from settings.gradle
rename to build.gradle.kts
index 8ba98e7..b8a9f4a 100644
--- a/settings.gradle
+++ b/build.gradle.kts
@@ -12,5 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-include ':app'
-rootProject.name = "AmapiExtensibilityDemo"
\ No newline at end of file
+
+plugins {
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.kotlin.android) apply false
+    id("com.google.android.gms.oss-licenses-plugin") version("0.10.6") apply(false)
+}
diff --git a/gradle.properties b/gradle.properties
index 26ebcdf..af1fbe6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
@@ -16,8 +16,9 @@ org.gradle.jvmargs=-Xmx1536m
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
-# Disable R8 until R8 is able to fully replace proguard
-android.enableR8=false
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..38f4636
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,35 @@
+[versions]
+agp = "8.10.0"
+kotlin = "2.1.21"
+coreKtx = "1.16.0"
+junit = "4.13.2"
+junitVersion = "1.2.1"
+espressoCore = "3.6.1"
+lifecycleRuntimeKtx = "2.9.0"
+appcompatVersion = "1.7.0"
+constraintLayoutVersion = "2.2.1"
+amapiVersion = "1.3.0"
+material = "1.12.0"
+playServicesOssLicenses = "17.1.0"
+rules = "1.6.1"
+runner = "1.6.2"
+googleServices = "4.4.2"
+
+[libraries]
+androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+androidx-rules = { module = "androidx.test:rules", version.ref = "rules" }
+androidx-runner = { module = "androidx.test:runner", version.ref = "runner" }
+junit = { group = "junit", name = "junit", version.ref = "junit" }
+androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
+androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
+androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
+androidx-constraint-layout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintLayoutVersion" }
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompatVersion" }
+amapi = { group = "com.google.android.libraries.enterprise.amapi", name = "amapi", version.ref = "amapiVersion" }
+coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android" }
+material = { module = "com.google.android.material:material", version.ref = "material" }
+play-services-oss-licenses = { module = "com.google.android.gms:play-services-oss-licenses", version.ref = "playServicesOssLicenses" }
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "agp" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c..d64cd49 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7545dab..260504c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Aug 14 10:59:44 CDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
diff --git a/gradlew b/gradlew
index 4f906e0..1aa94a4 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,99 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,88 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f..6689b85 100755
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000..84f339b
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,49 @@
+import org.gradle.kotlin.dsl.internal.sharedruntime.support.classFilePathCandidatesFor
+
+/* Copyright 2020 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+
+pluginManagement {
+    repositories {
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    resolutionStrategy {
+        eachPlugin {
+            if (requested.id.id == "com.google.android.gms.oss-licenses-plugin") {
+                useModule("com.google.android.gms:oss-licenses-plugin:${requested.version}")
+            }
+        }
+    }
+}
+
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+        mavenLocal()
+    }
+}
+
+rootProject.name = "AmapiExtensibilityDemo"
+include(":app")