Merge remote-tracking branch 'origin/feature-branches/forms' into feature-branches/forms

Author: Soren Roth

build.gradle.kts

@@ -23,23 +23,12 @@ plugins {
     alias(libs.plugins.binary.compatibility.validator) apply false
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.gradle.secrets) apply false
-    alias(libs.plugins.kapt) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.hilt) apply false
     alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.dokka) apply false
 }
 
-allprojects{
-    // kapt compiler cannot figure out that it needs to target the same bytecode as kotlin and java compilers
-    // without this. Furthermore, KaptGenerateStubs is unresolved in module gradle.
-    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs::class).all {
-        kotlinOptions {
-            jvmTarget = JavaVersion.VERSION_1_8.toString()
-        }
-    }
-}
-
 buildscript {
     dependencies {
         // there doesn't appear to be a better way to provide this to subprojects.

gradle/libs.versions.toml

@@ -76,7 +76,6 @@ android-library = { id = "com.android.library", version.ref = "androidGradlePlug
 binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binaryCompatibilityValidator"}
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 gradle-secrets = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version = "2.0.1"}

microapps/FeatureFormsApp/README.md

@@ -0,0 +1,20 @@
+# FeatureForms Micro-app
+
+This micro-app demonstrates the use of the [FeatureForm](../../toolkit/featureforms/README.md) toolkit component which provides a rich, dynamic, and responsive form
+for editing Feature attributes.
+
+![Screenshot](screenshot.gif)
+
+## Usage
+
+The application provides a web map gallery and a map viewer which invokes the form when Features are tapped.
+Authentication is optional but limited to specific public web maps.
+
+To authenticate ArcGIS Online with username and password, please provide values in `local.properties` as follows
+
+```
+webMapUser=XXX
+webMapPassword=YYY
+```
+
+For more information on the `FeatureForm` component and how it works, see it's [Readme](../../toolkit/featureforms/README.md).

microapps/FeatureFormsApp/app/build.gradle.kts

@@ -20,9 +20,8 @@ plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
     id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
-    id("org.jetbrains.kotlin.kapt")
-    id("com.google.devtools.ksp")
     id("com.google.dagger.hilt.android")
+    id("com.google.devtools.ksp")
 }
 
 secrets {
@@ -88,12 +87,12 @@ dependencies {
     // hilt
     implementation(libs.hilt.android.core)
     implementation(libs.androidx.hilt.navigation.compose)
-    kapt(libs.hilt.compiler)
+    ksp(libs.hilt.compiler)
     // room
     implementation(libs.room.runtime)
     annotationProcessor(libs.room.compiler)
     implementation(libs.room.ext)
-    kapt(libs.room.compiler)
+    ksp(libs.room.compiler)
     // jetpack window manager
     implementation(libs.androidx.window)
     implementation(libs.androidx.window.core)