merge

Author: irisieren

.java-version

@@ -0,0 +1 @@
+17

client-addons/build.gradle.kts

@@ -28,6 +28,8 @@ android {
         }
     }
     compileOptions {
+        isCoreLibraryDesugaringEnabled = true
+
         sourceCompatibility = Constants.sourceCompatibilityVersion
         targetCompatibility = Constants.targetCompatibilityVersion
     }
@@ -46,6 +48,8 @@ android {
 }
 
 dependencies {
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.0")
+
     implementation(project(Constants.moduleClient))
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.ui)

client/build.gradle.kts

@@ -49,6 +49,7 @@ android {
     }
 
     compileOptions {
+        isCoreLibraryDesugaringEnabled = true
         sourceCompatibility = Constants.sourceCompatibilityVersion
         targetCompatibility = Constants.targetCompatibilityVersion
     }
@@ -85,6 +86,7 @@ android {
 }
 
 dependencies {
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.0")
     // These dependencies are used internally, and not exposed to consumers on their own compile classpath.
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.ui)

client/src/main/java/org/phoenixframework/liveview/foundation/data/mappers/DocumentParser.kt

@@ -26,7 +26,7 @@ class DocumentParser(
         }
     }
 
-    override fun handle(
+    override fun handleDocumentChange(
         changeType: ChangeType,
         nodeRef: NodeRef,
         nodeData: NodeData,

core-jetpack-desktop-libs/jniLibs/darwin-aarch64/libliveview_native_core.dylib

@@ -12,11 +12,12 @@ antlr4 = "4.13.1"
 com-google-android-material = "1.12.0"
 com-google-code-gson = "2.10.1"
 com-strumenta-antlr-kotlin = "1.0.0-RC4"
+desugar_jdk_libs = "2.1.5"
 io-coil-kt = "2.5.0"
 java-phoenix-client = "1.3.0"
 junit = "4.13.2"
-jna = "5.14.0" # remember to update the jniLibs folder with updated *.so files
-koin-bom= "4.0.0-RC1"
+jna = "5.16.0" # remember to update the jniLibs folder with updated *.so files
+koin-bom = "4.0.0-RC1"
 kotlin = "1.9.21"
 kotlin-immutable-collections = "0.3.7"
 kotlinx-serialization-json = "1.6.3"
@@ -48,6 +49,7 @@ com-github-liveview-native-core-jetpack = { group = "com.github.liveview-native"
 com-google-android-material = { group = "com.google.android.material", name = "material", version.ref = "com-google-android-material" }
 com-google-code-gson = { group = "com.google.code.gson", name = "gson", version.ref = "com-google-code-gson" }
 com-strumenta-antlr-kotlin-runtime = { group = "com.strumenta", name = "antlr-kotlin-runtime", version.ref = "com-strumenta-antlr-kotlin" }
+desugar_jdk_libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar_jdk_libs" }
 io-coil-kt = { group = "io.coil-kt", name = "coil", version.ref = "io-coil-kt" }
 io-coil-kt-coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "io-coil-kt" }
 io-coil-kt-coil-svg = { group = "io.coil-kt", name = "coil-svg", version.ref = "io-coil-kt" }
@@ -82,3 +84,4 @@ kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", vers
 roborazzi = { id = "io.github.takahirom.roborazzi", version.ref = "roborazzi" }
 org-jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "org-jetbrains-kotlin-jvm" }
 com-strumenta-antlr-kotlin = { id = "com.strumenta.antlr-kotlin", version.ref = "com-strumenta-antlr-kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

core-jetpack-desktop-libs/jniLibs/darwin-x86-64/libliveview_native_core.dylib

@@ -25,6 +25,7 @@ android {
         }
     }
     compileOptions {
+        isCoreLibraryDesugaringEnabled = true
         sourceCompatibility = Constants.sourceCompatibilityVersion
         targetCompatibility = Constants.targetCompatibilityVersion
     }
@@ -51,4 +52,6 @@ dependencies {
         isChanging = true
         exclude(group = Constants.publishGroupId, module = Constants.publishArtifactClientId)
     }
+
+    coreLibraryDesugaring(libs.desugar.jdk.libs)
 }

core-jetpack-desktop-libs/jniLibs/linux-x86-64/libliveview_native_core.so

@@ -19,7 +19,9 @@ class MainActivity : ComponentActivity() {
         }
         LiveForm.registerComponents()
         setContent {
-            LiveView(url = "http://10.0.2.2:4000/users/log_in")
+            // Points to the thermostat example from the core library tests.
+            // Change this URL to point at your local LVN app.
+            LiveView(url = "http://10.0.2.2:4001/thermostat")
         }
     }
 }