From 4db4836f401716a062d1ffe812631ec06ddd7709 Mon Sep 17 00:00:00 2001
From: Stuart Harris <stuart.harris@red-badger.com>
Date: Thu, 10 Oct 2024 10:52:05 +0100
Subject: [PATCH 1/6] android examples wip

---
 .../bridge_echo/Android/.idea/compiler.xml    |   2 +-
 examples/bridge_echo/Android/.idea/gradle.xml |   1 +
 examples/bridge_echo/Android/.idea/misc.xml   |   3 +-
 examples/bridge_echo/Android/.idea/other.xml  | 318 ------------------
 .../Android/.idea/runConfigurations.xml       |  13 +
 examples/cat_facts/Android/.idea/compiler.xml |   2 +-
 examples/cat_facts/Android/.idea/gradle.xml   |   1 +
 examples/cat_facts/Android/.idea/misc.xml     |   3 +-
 examples/cat_facts/Android/.idea/other.xml    | 318 ------------------
 .../Android/.idea/runConfigurations.xml       |  13 +
 examples/counter/Android/.idea/gradle.xml     |   1 +
 examples/counter/Android/.idea/misc.xml       |   2 +-
 examples/counter/Android/.idea/other.xml      | 318 ------------------
 .../Android/.idea/runConfigurations.xml       |  13 +
 examples/counter/Android/app/build.gradle     |  12 +-
 .../src/main/java/com/example/counter/http.kt |   5 +-
 .../com/example/counter/ui/theme/Theme.kt     |  12 +-
 examples/counter/Android/build.gradle         |   4 +-
 .../gradle/wrapper/gradle-wrapper.properties  |   2 +-
 examples/counter/Android/settings.gradle      |   4 +
 examples/counter/Android/shared/build.gradle  |  12 +-
 .../simple_counter/Android/app/build.gradle   |  24 +-
 examples/simple_counter/Android/build.gradle  |   4 +-
 .../gradle/wrapper/gradle-wrapper.properties  |   2 +-
 .../simple_counter/Android/settings.gradle    |   4 +
 .../Android/shared/build.gradle               |   9 +-
 26 files changed, 111 insertions(+), 991 deletions(-)
 delete mode 100644 examples/bridge_echo/Android/.idea/other.xml
 create mode 100644 examples/bridge_echo/Android/.idea/runConfigurations.xml
 delete mode 100644 examples/cat_facts/Android/.idea/other.xml
 create mode 100644 examples/cat_facts/Android/.idea/runConfigurations.xml
 delete mode 100644 examples/counter/Android/.idea/other.xml
 create mode 100644 examples/counter/Android/.idea/runConfigurations.xml

diff --git a/examples/bridge_echo/Android/.idea/compiler.xml b/examples/bridge_echo/Android/.idea/compiler.xml
index b589d56e9..b86273d94 100644
--- a/examples/bridge_echo/Android/.idea/compiler.xml
+++ b/examples/bridge_echo/Android/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/examples/bridge_echo/Android/.idea/gradle.xml b/examples/bridge_echo/Android/.idea/gradle.xml
index 5f204c12f..8f1a221a0 100644
--- a/examples/bridge_echo/Android/.idea/gradle.xml
+++ b/examples/bridge_echo/Android/.idea/gradle.xml
@@ -4,6 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
diff --git a/examples/bridge_echo/Android/.idea/misc.xml b/examples/bridge_echo/Android/.idea/misc.xml
index adb8ae0fe..2cdc89a70 100644
--- a/examples/bridge_echo/Android/.idea/misc.xml
+++ b/examples/bridge_echo/Android/.idea/misc.xml
@@ -1,4 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/examples/bridge_echo/Android/.idea/other.xml b/examples/bridge_echo/Android/.idea/other.xml
deleted file mode 100644
index 94c96f631..000000000
--- a/examples/bridge_echo/Android/.idea/other.xml
+++ /dev/null
@@ -1,318 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="direct_access_persist.xml">
-    <option name="deviceSelectionList">
-      <list>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="27" />
-          <option name="brand" value="DOCOMO" />
-          <option name="codename" value="F01L" />
-          <option name="id" value="F01L" />
-          <option name="manufacturer" value="FUJITSU" />
-          <option name="name" value="F-01L" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="720" />
-          <option name="screenY" value="1280" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="28" />
-          <option name="brand" value="DOCOMO" />
-          <option name="codename" value="SH-01L" />
-          <option name="id" value="SH-01L" />
-          <option name="manufacturer" value="SHARP" />
-          <option name="name" value="AQUOS sense2 SH-01L" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2160" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="a51" />
-          <option name="id" value="a51" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy A51" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="akita" />
-          <option name="id" value="akita" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="b0q" />
-          <option name="id" value="b0q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S22 Ultra" />
-          <option name="screenDensity" value="600" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3088" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="32" />
-          <option name="brand" value="google" />
-          <option name="codename" value="bluejay" />
-          <option name="id" value="bluejay" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 6a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="caiman" />
-          <option name="id" value="caiman" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9 Pro" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="960" />
-          <option name="screenY" value="2142" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="comet" />
-          <option name="id" value="comet" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9 Pro Fold" />
-          <option name="screenDensity" value="390" />
-          <option name="screenX" value="2076" />
-          <option name="screenY" value="2152" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="29" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="crownqlteue" />
-          <option name="id" value="crownqlteue" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Note9" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2220" />
-          <option name="screenY" value="1080" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="dm3q" />
-          <option name="id" value="dm3q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S23 Ultra" />
-          <option name="screenDensity" value="600" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3088" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="e1q" />
-          <option name="id" value="e1q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S24" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2340" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix" />
-          <option name="id" value="felix" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix" />
-          <option name="id" value="felix" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix_camera" />
-          <option name="id" value="felix_camera" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold (Camera-enabled)" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="gts8uwifi" />
-          <option name="id" value="gts8uwifi" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Tab S8 Ultra" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="1848" />
-          <option name="screenY" value="2960" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="husky" />
-          <option name="id" value="husky" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8 Pro" />
-          <option name="screenDensity" value="390" />
-          <option name="screenX" value="1008" />
-          <option name="screenY" value="2244" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="motorola" />
-          <option name="codename" value="java" />
-          <option name="id" value="java" />
-          <option name="manufacturer" value="Motorola" />
-          <option name="name" value="G20" />
-          <option name="screenDensity" value="280" />
-          <option name="screenX" value="720" />
-          <option name="screenY" value="1600" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="komodo" />
-          <option name="id" value="komodo" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9 Pro XL" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="1008" />
-          <option name="screenY" value="2244" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="lynx" />
-          <option name="id" value="lynx" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 7a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="google" />
-          <option name="codename" value="oriole" />
-          <option name="id" value="oriole" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 6" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="panther" />
-          <option name="id" value="panther" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 7" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="q5q" />
-          <option name="id" value="q5q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Z Fold5" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1812" />
-          <option name="screenY" value="2176" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="google" />
-          <option name="codename" value="r11" />
-          <option name="id" value="r11" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Watch" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="384" />
-          <option name="screenY" value="384" />
-          <option name="type" value="WEAR_OS" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="google" />
-          <option name="codename" value="redfin" />
-          <option name="id" value="redfin" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 5" />
-          <option name="screenDensity" value="440" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2340" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="shiba" />
-          <option name="id" value="shiba" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="tangorpro" />
-          <option name="id" value="tangorpro" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Tablet" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="1600" />
-          <option name="screenY" value="2560" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="tokay" />
-          <option name="id" value="tokay" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2424" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="29" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="x1q" />
-          <option name="id" value="x1q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S20" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3200" />
-        </PersistentDeviceSelectionData>
-      </list>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/examples/bridge_echo/Android/.idea/runConfigurations.xml b/examples/bridge_echo/Android/.idea/runConfigurations.xml
new file mode 100644
index 000000000..931b96c3c
--- /dev/null
+++ b/examples/bridge_echo/Android/.idea/runConfigurations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/examples/cat_facts/Android/.idea/compiler.xml b/examples/cat_facts/Android/.idea/compiler.xml
index b589d56e9..b86273d94 100644
--- a/examples/cat_facts/Android/.idea/compiler.xml
+++ b/examples/cat_facts/Android/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/examples/cat_facts/Android/.idea/gradle.xml b/examples/cat_facts/Android/.idea/gradle.xml
index 5f204c12f..8f1a221a0 100644
--- a/examples/cat_facts/Android/.idea/gradle.xml
+++ b/examples/cat_facts/Android/.idea/gradle.xml
@@ -4,6 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
diff --git a/examples/cat_facts/Android/.idea/misc.xml b/examples/cat_facts/Android/.idea/misc.xml
index 8978d23db..74dd639e4 100644
--- a/examples/cat_facts/Android/.idea/misc.xml
+++ b/examples/cat_facts/Android/.idea/misc.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/examples/cat_facts/Android/.idea/other.xml b/examples/cat_facts/Android/.idea/other.xml
deleted file mode 100644
index 94c96f631..000000000
--- a/examples/cat_facts/Android/.idea/other.xml
+++ /dev/null
@@ -1,318 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="direct_access_persist.xml">
-    <option name="deviceSelectionList">
-      <list>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="27" />
-          <option name="brand" value="DOCOMO" />
-          <option name="codename" value="F01L" />
-          <option name="id" value="F01L" />
-          <option name="manufacturer" value="FUJITSU" />
-          <option name="name" value="F-01L" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="720" />
-          <option name="screenY" value="1280" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="28" />
-          <option name="brand" value="DOCOMO" />
-          <option name="codename" value="SH-01L" />
-          <option name="id" value="SH-01L" />
-          <option name="manufacturer" value="SHARP" />
-          <option name="name" value="AQUOS sense2 SH-01L" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2160" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="a51" />
-          <option name="id" value="a51" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy A51" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="akita" />
-          <option name="id" value="akita" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="b0q" />
-          <option name="id" value="b0q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S22 Ultra" />
-          <option name="screenDensity" value="600" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3088" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="32" />
-          <option name="brand" value="google" />
-          <option name="codename" value="bluejay" />
-          <option name="id" value="bluejay" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 6a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="caiman" />
-          <option name="id" value="caiman" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9 Pro" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="960" />
-          <option name="screenY" value="2142" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="comet" />
-          <option name="id" value="comet" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9 Pro Fold" />
-          <option name="screenDensity" value="390" />
-          <option name="screenX" value="2076" />
-          <option name="screenY" value="2152" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="29" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="crownqlteue" />
-          <option name="id" value="crownqlteue" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Note9" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2220" />
-          <option name="screenY" value="1080" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="dm3q" />
-          <option name="id" value="dm3q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S23 Ultra" />
-          <option name="screenDensity" value="600" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3088" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="e1q" />
-          <option name="id" value="e1q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S24" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2340" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix" />
-          <option name="id" value="felix" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix" />
-          <option name="id" value="felix" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix_camera" />
-          <option name="id" value="felix_camera" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold (Camera-enabled)" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="gts8uwifi" />
-          <option name="id" value="gts8uwifi" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Tab S8 Ultra" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="1848" />
-          <option name="screenY" value="2960" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="husky" />
-          <option name="id" value="husky" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8 Pro" />
-          <option name="screenDensity" value="390" />
-          <option name="screenX" value="1008" />
-          <option name="screenY" value="2244" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="motorola" />
-          <option name="codename" value="java" />
-          <option name="id" value="java" />
-          <option name="manufacturer" value="Motorola" />
-          <option name="name" value="G20" />
-          <option name="screenDensity" value="280" />
-          <option name="screenX" value="720" />
-          <option name="screenY" value="1600" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="komodo" />
-          <option name="id" value="komodo" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9 Pro XL" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="1008" />
-          <option name="screenY" value="2244" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="lynx" />
-          <option name="id" value="lynx" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 7a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="google" />
-          <option name="codename" value="oriole" />
-          <option name="id" value="oriole" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 6" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="panther" />
-          <option name="id" value="panther" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 7" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="q5q" />
-          <option name="id" value="q5q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Z Fold5" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1812" />
-          <option name="screenY" value="2176" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="google" />
-          <option name="codename" value="r11" />
-          <option name="id" value="r11" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Watch" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="384" />
-          <option name="screenY" value="384" />
-          <option name="type" value="WEAR_OS" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="google" />
-          <option name="codename" value="redfin" />
-          <option name="id" value="redfin" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 5" />
-          <option name="screenDensity" value="440" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2340" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="shiba" />
-          <option name="id" value="shiba" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="tangorpro" />
-          <option name="id" value="tangorpro" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Tablet" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="1600" />
-          <option name="screenY" value="2560" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="tokay" />
-          <option name="id" value="tokay" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2424" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="29" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="x1q" />
-          <option name="id" value="x1q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S20" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3200" />
-        </PersistentDeviceSelectionData>
-      </list>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/examples/cat_facts/Android/.idea/runConfigurations.xml b/examples/cat_facts/Android/.idea/runConfigurations.xml
new file mode 100644
index 000000000..931b96c3c
--- /dev/null
+++ b/examples/cat_facts/Android/.idea/runConfigurations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/examples/counter/Android/.idea/gradle.xml b/examples/counter/Android/.idea/gradle.xml
index 5f204c12f..8f1a221a0 100644
--- a/examples/counter/Android/.idea/gradle.xml
+++ b/examples/counter/Android/.idea/gradle.xml
@@ -4,6 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
diff --git a/examples/counter/Android/.idea/misc.xml b/examples/counter/Android/.idea/misc.xml
index 8978d23db..6c5519f9d 100644
--- a/examples/counter/Android/.idea/misc.xml
+++ b/examples/counter/Android/.idea/misc.xml
@@ -1,6 +1,6 @@
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/examples/counter/Android/.idea/other.xml b/examples/counter/Android/.idea/other.xml
deleted file mode 100644
index 94c96f631..000000000
--- a/examples/counter/Android/.idea/other.xml
+++ /dev/null
@@ -1,318 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="direct_access_persist.xml">
-    <option name="deviceSelectionList">
-      <list>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="27" />
-          <option name="brand" value="DOCOMO" />
-          <option name="codename" value="F01L" />
-          <option name="id" value="F01L" />
-          <option name="manufacturer" value="FUJITSU" />
-          <option name="name" value="F-01L" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="720" />
-          <option name="screenY" value="1280" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="28" />
-          <option name="brand" value="DOCOMO" />
-          <option name="codename" value="SH-01L" />
-          <option name="id" value="SH-01L" />
-          <option name="manufacturer" value="SHARP" />
-          <option name="name" value="AQUOS sense2 SH-01L" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2160" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="a51" />
-          <option name="id" value="a51" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy A51" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="akita" />
-          <option name="id" value="akita" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="b0q" />
-          <option name="id" value="b0q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S22 Ultra" />
-          <option name="screenDensity" value="600" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3088" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="32" />
-          <option name="brand" value="google" />
-          <option name="codename" value="bluejay" />
-          <option name="id" value="bluejay" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 6a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="caiman" />
-          <option name="id" value="caiman" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9 Pro" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="960" />
-          <option name="screenY" value="2142" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="comet" />
-          <option name="id" value="comet" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9 Pro Fold" />
-          <option name="screenDensity" value="390" />
-          <option name="screenX" value="2076" />
-          <option name="screenY" value="2152" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="29" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="crownqlteue" />
-          <option name="id" value="crownqlteue" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Note9" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2220" />
-          <option name="screenY" value="1080" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="dm3q" />
-          <option name="id" value="dm3q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S23 Ultra" />
-          <option name="screenDensity" value="600" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3088" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="e1q" />
-          <option name="id" value="e1q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S24" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2340" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix" />
-          <option name="id" value="felix" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix" />
-          <option name="id" value="felix" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix_camera" />
-          <option name="id" value="felix_camera" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold (Camera-enabled)" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="gts8uwifi" />
-          <option name="id" value="gts8uwifi" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Tab S8 Ultra" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="1848" />
-          <option name="screenY" value="2960" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="husky" />
-          <option name="id" value="husky" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8 Pro" />
-          <option name="screenDensity" value="390" />
-          <option name="screenX" value="1008" />
-          <option name="screenY" value="2244" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="motorola" />
-          <option name="codename" value="java" />
-          <option name="id" value="java" />
-          <option name="manufacturer" value="Motorola" />
-          <option name="name" value="G20" />
-          <option name="screenDensity" value="280" />
-          <option name="screenX" value="720" />
-          <option name="screenY" value="1600" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="komodo" />
-          <option name="id" value="komodo" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9 Pro XL" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="1008" />
-          <option name="screenY" value="2244" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="lynx" />
-          <option name="id" value="lynx" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 7a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="google" />
-          <option name="codename" value="oriole" />
-          <option name="id" value="oriole" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 6" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="panther" />
-          <option name="id" value="panther" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 7" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="q5q" />
-          <option name="id" value="q5q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Z Fold5" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1812" />
-          <option name="screenY" value="2176" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="google" />
-          <option name="codename" value="r11" />
-          <option name="id" value="r11" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Watch" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="384" />
-          <option name="screenY" value="384" />
-          <option name="type" value="WEAR_OS" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="google" />
-          <option name="codename" value="redfin" />
-          <option name="id" value="redfin" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 5" />
-          <option name="screenDensity" value="440" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2340" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="shiba" />
-          <option name="id" value="shiba" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="tangorpro" />
-          <option name="id" value="tangorpro" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Tablet" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="1600" />
-          <option name="screenY" value="2560" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="tokay" />
-          <option name="id" value="tokay" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2424" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="29" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="x1q" />
-          <option name="id" value="x1q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S20" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3200" />
-        </PersistentDeviceSelectionData>
-      </list>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/examples/counter/Android/.idea/runConfigurations.xml b/examples/counter/Android/.idea/runConfigurations.xml
new file mode 100644
index 000000000..931b96c3c
--- /dev/null
+++ b/examples/counter/Android/.idea/runConfigurations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/examples/counter/Android/app/build.gradle b/examples/counter/Android/app/build.gradle
index d830d06c0..6e3aee013 100644
--- a/examples/counter/Android/app/build.gradle
+++ b/examples/counter/Android/app/build.gradle
@@ -50,7 +50,7 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2024.09.01')
+    def composeBom = platform('androidx.compose:compose-bom:2024.09.03')
     implementation composeBom
     androidTestImplementation composeBom
 
@@ -61,13 +61,13 @@ dependencies {
     debugImplementation("androidx.compose.ui:ui-tooling")
 
     // UI Tests
-    androidTestImplementation("androidx.compose.ui:ui-test-junit4")
-    debugImplementation("androidx.compose.ui:ui-test-manifest")
+    androidTestImplementation 'androidx.test:runner:1.6.2'
+    androidTestUtil 'androidx.test:orchestrator:1.5.0'
 
     // Optional - Integration with activities
     implementation("androidx.activity:activity-compose:1.9.2")
     // Optional - Integration with ViewModels
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.5")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.6")
     // Optional - Integration with LiveData
     implementation("androidx.compose.runtime:runtime-livedata")
 
@@ -76,6 +76,6 @@ dependencies {
 
     implementation "io.ktor:ktor-client-cio:2.2.2"
 
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0'
 }
\ No newline at end of file
diff --git a/examples/counter/Android/app/src/main/java/com/example/counter/http.kt b/examples/counter/Android/app/src/main/java/com/example/counter/http.kt
index 4eb8b0864..0797f9656 100644
--- a/examples/counter/Android/app/src/main/java/com/example/counter/http.kt
+++ b/examples/counter/Android/app/src/main/java/com/example/counter/http.kt
@@ -3,6 +3,7 @@ package com.example.counter
 import com.example.counter.shared_types.HttpHeader
 import com.example.counter.shared_types.HttpRequest
 import com.example.counter.shared_types.HttpResponse
+import com.novi.serde.Bytes
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
 import io.ktor.client.request.headers
@@ -22,8 +23,8 @@ suspend fun requestHttp(
             }
         }
     }
-    val bytes: ByteArray = response.body()
+    val bytes: Bytes = response.body()
     val headers = response.headers.flattenEntries().map { HttpHeader(it.first, it.second) }
-    return HttpResponse(response.status.value.toShort(), headers, bytes.toList())
+    return HttpResponse(response.status.value.toShort(), headers, bytes)
 }
 
diff --git a/examples/counter/Android/app/src/main/java/com/example/counter/ui/theme/Theme.kt b/examples/counter/Android/app/src/main/java/com/example/counter/ui/theme/Theme.kt
index 8dafb13d3..cc24803e7 100644
--- a/examples/counter/Android/app/src/main/java/com/example/counter/ui/theme/Theme.kt
+++ b/examples/counter/Android/app/src/main/java/com/example/counter/ui/theme/Theme.kt
@@ -14,6 +14,7 @@ import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
 
 private val DarkColorScheme = darkColorScheme(
     primary = Purple80,
@@ -54,9 +55,16 @@ fun CounterTheme(
     }
     val view = LocalView.current
     if (!view.isInEditMode) {
+        /* getting the current window by tapping into the Activity */
+        val currentWindow = (view.context as? Activity)?.window
+            ?: throw Exception("Not in an activity - unable to get Window reference")
+
         SideEffect {
-            (view.context as Activity).window.statusBarColor = colorScheme.primary.toArgb()
-            ViewCompat.getWindowInsetsController(view)?.isAppearanceLightStatusBars = darkTheme
+            /* the default code did the same cast here - might as well use our new variable! */
+            currentWindow.statusBarColor = colorScheme.primary.toArgb()
+            /* accessing the insets controller to change appearance of the status bar, with 100% less deprecation warnings */
+            WindowCompat.getInsetsController(currentWindow, view).isAppearanceLightStatusBars =
+                darkTheme
         }
     }
 
diff --git a/examples/counter/Android/build.gradle b/examples/counter/Android/build.gradle
index 80715d666..d4234e95b 100644
--- a/examples/counter/Android/build.gradle
+++ b/examples/counter/Android/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id 'com.android.application' version '8.5.2' apply false
-    id 'com.android.library' version '8.5.2' apply false
+    id 'com.android.application' version '8.7.0' apply false
+    id 'com.android.library' version '8.7.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.10' apply false
     id "org.mozilla.rust-android-gradle.rust-android" version "0.9.4" apply false
 }
\ No newline at end of file
diff --git a/examples/counter/Android/gradle/wrapper/gradle-wrapper.properties b/examples/counter/Android/gradle/wrapper/gradle-wrapper.properties
index 210af016d..6dc20ef3f 100644
--- a/examples/counter/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/counter/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sat Dec 17 13:36:16 GMT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/examples/counter/Android/settings.gradle b/examples/counter/Android/settings.gradle
index cb0989f01..9fc6fb3c1 100644
--- a/examples/counter/Android/settings.gradle
+++ b/examples/counter/Android/settings.gradle
@@ -5,6 +5,10 @@ pluginManagement {
         mavenCentral()
     }
 }
+
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+}
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
diff --git a/examples/counter/Android/shared/build.gradle b/examples/counter/Android/shared/build.gradle
index 0fc482056..cc353e1a2 100644
--- a/examples/counter/Android/shared/build.gradle
+++ b/examples/counter/Android/shared/build.gradle
@@ -8,7 +8,7 @@ android {
     namespace 'com.example.counter.shared'
     compileSdk 34
 
-    ndkVersion "27.0.12077973"
+    ndkVersion "27.1.12297006"
 
     defaultConfig {
         minSdk 29
@@ -39,8 +39,8 @@ android {
 }
 
 dependencies {
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.5"
-    implementation "net.java.dev.jna:jna:5.13.0@aar"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6"
+    implementation "net.java.dev.jna:jna:5.15.0@aar"
     implementation 'androidx.core:core-ktx:1.13.1'
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'com.google.android.material:material:1.12.0'
@@ -85,6 +85,12 @@ afterEvaluate {
     }
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
+
 tasks.register('bindGen', Exec) {
     def outDir = "${projectDir}/../../shared_types/generated/java"
     workingDir "../../"
diff --git a/examples/simple_counter/Android/app/build.gradle b/examples/simple_counter/Android/app/build.gradle
index 606971749..305460733 100644
--- a/examples/simple_counter/Android/app/build.gradle
+++ b/examples/simple_counter/Android/app/build.gradle
@@ -53,29 +53,29 @@ dependencies {
     // our shared library
     implementation project(path: ':shared')
 
-    def composeBom = platform('androidx.compose:compose-bom:2024.09.01')
-    implementation composeBom
-    androidTestImplementation composeBom
+    def composeBom = platform('androidx.compose:compose-bom:2024.09.03')
+    implementation platform('androidx.compose:compose-bom:2024.09.03')
+    androidTestImplementation platform('androidx.compose:compose-bom:2024.09.03')
 
     implementation 'androidx.compose.material3:material3:1.3.0'
 
     // Optional - Integration with ViewModels
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.5")
+    implementation('androidx.lifecycle:lifecycle-viewmodel-compose:2.8.6')
     // Optional - Integration with LiveData
     implementation("androidx.compose.runtime:runtime-livedata")
 
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0'
 
     implementation 'androidx.core:core-ktx:1.13.1'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.5'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.6'
     implementation 'androidx.activity:activity-compose:1.9.2'
-    implementation "androidx.compose.ui:ui:1.7.1"
-    implementation "androidx.compose.ui:ui-tooling-preview:1.7.1"
+    implementation 'androidx.compose.ui:ui:1.7.3'
+    implementation 'androidx.compose.ui:ui-tooling-preview:1.7.3'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.2.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.7.1"
-    debugImplementation "androidx.compose.ui:ui-tooling:1.7.1"
-    debugImplementation "androidx.compose.ui:ui-test-manifest:1.7.1"
+    androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.7.3'
+    debugImplementation 'androidx.compose.ui:ui-tooling:1.7.3'
+    debugImplementation 'androidx.compose.ui:ui-test-manifest:1.7.3'
 }
diff --git a/examples/simple_counter/Android/build.gradle b/examples/simple_counter/Android/build.gradle
index 80715d666..d4234e95b 100644
--- a/examples/simple_counter/Android/build.gradle
+++ b/examples/simple_counter/Android/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id 'com.android.application' version '8.5.2' apply false
-    id 'com.android.library' version '8.5.2' apply false
+    id 'com.android.application' version '8.7.0' apply false
+    id 'com.android.library' version '8.7.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.10' apply false
     id "org.mozilla.rust-android-gradle.rust-android" version "0.9.4" apply false
 }
\ No newline at end of file
diff --git a/examples/simple_counter/Android/gradle/wrapper/gradle-wrapper.properties b/examples/simple_counter/Android/gradle/wrapper/gradle-wrapper.properties
index 37fb935ed..8da3e1a53 100644
--- a/examples/simple_counter/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/simple_counter/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed May 24 10:42:32 BST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/examples/simple_counter/Android/settings.gradle b/examples/simple_counter/Android/settings.gradle
index cb0989f01..9fc6fb3c1 100644
--- a/examples/simple_counter/Android/settings.gradle
+++ b/examples/simple_counter/Android/settings.gradle
@@ -5,6 +5,10 @@ pluginManagement {
         mavenCentral()
     }
 }
+
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+}
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
diff --git a/examples/simple_counter/Android/shared/build.gradle b/examples/simple_counter/Android/shared/build.gradle
index 260de7f4c..4a652ea2c 100644
--- a/examples/simple_counter/Android/shared/build.gradle
+++ b/examples/simple_counter/Android/shared/build.gradle
@@ -41,7 +41,7 @@ android {
 }
 
 dependencies {
-    implementation "net.java.dev.jna:jna:5.13.0@aar"
+    implementation 'net.java.dev.jna:jna:5.15.0@aar'
 
     implementation 'androidx.core:core-ktx:1.13.1'
     implementation 'androidx.appcompat:appcompat:1.7.0'
@@ -61,6 +61,7 @@ cargo {
     // `rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android`
     targets = ["arm", "arm64", "x86", "x86_64"]
     extraCargoBuildArguments = ['--package', 'shared']
+    pythonCommand = "python3"
 }
 
 afterEvaluate {
@@ -82,6 +83,12 @@ afterEvaluate {
     }
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
+
 tasks.register('bindGen', Exec) {
     def outDir = "${projectDir}/../../shared_types/generated/java"
     workingDir "../../"

From 77374ce0bab6659d70c1e7f75537134eaf0cf45c Mon Sep 17 00:00:00 2001
From: Stuart Harris <stuart.harris@red-badger.com>
Date: Thu, 10 Oct 2024 11:55:50 +0100
Subject: [PATCH 2/6] working counter android example

---
 examples/counter/Android/.idea/.gitignore     |   3 -
 .../Android/.idea/codeStyles/Project.xml      | 124 ------------------
 .../.idea/codeStyles/codeStyleConfig.xml      |   5 -
 examples/counter/Android/.idea/compiler.xml   |   2 +-
 .../.idea/deploymentTargetDropDown.xml        |  10 --
 .../.idea/deploymentTargetSelector.xml        |   8 ++
 .../inspectionProfiles/Project_Default.xml    |  45 -------
 examples/counter/Android/.idea/kotlinc.xml    |   2 +-
 examples/counter/Android/.idea/misc.xml       |   3 +-
 examples/counter/Android/app/build.gradle     |  78 +++++------
 .../Android/app/src/main/AndroidManifest.xml  |  11 +-
 .../java/com/example/counter/MainActivity.kt  |  17 +--
 .../src/main/java/com/example/counter/http.kt |   2 +-
 .../com/example/counter/ui/theme/Theme.kt     |  22 +---
 .../ic_launcher_foreground.xml                |   0
 .../ic_launcher.xml                           |   1 +
 .../ic_launcher_round.xml                     |   1 +
 examples/counter/Android/build.gradle         |  10 +-
 examples/counter/Android/gradle.properties    |   7 +-
 .../counter/Android/gradle/libs.versions.toml |  48 +++++++
 .../gradle/wrapper/gradle-wrapper.properties  |   6 +-
 examples/counter/Android/settings.gradle      |  15 ++-
 examples/counter/Android/shared/build.gradle  |  64 ++++-----
 .../shared/ExampleInstrumentedTest.kt         |   4 +-
 .../shared/src/main/AndroidManifest.xml       |   4 +
 .../{ => counter}/shared/ExampleUnitTest.kt   |   2 +-
 26 files changed, 160 insertions(+), 334 deletions(-)
 delete mode 100644 examples/counter/Android/.idea/.gitignore
 delete mode 100644 examples/counter/Android/.idea/codeStyles/Project.xml
 delete mode 100644 examples/counter/Android/.idea/codeStyles/codeStyleConfig.xml
 delete mode 100644 examples/counter/Android/.idea/deploymentTargetDropDown.xml
 delete mode 100644 examples/counter/Android/.idea/inspectionProfiles/Project_Default.xml
 rename examples/counter/Android/app/src/main/res/{drawable-v24 => drawable}/ic_launcher_foreground.xml (100%)
 rename examples/counter/Android/app/src/main/res/{mipmap-anydpi-v26 => mipmap-anydpi}/ic_launcher.xml (79%)
 rename examples/counter/Android/app/src/main/res/{mipmap-anydpi-v26 => mipmap-anydpi}/ic_launcher_round.xml (79%)
 create mode 100644 examples/counter/Android/gradle/libs.versions.toml
 rename examples/counter/Android/shared/src/androidTest/java/com/example/{ => counter}/shared/ExampleInstrumentedTest.kt (83%)
 create mode 100644 examples/counter/Android/shared/src/main/AndroidManifest.xml
 rename examples/counter/Android/shared/src/test/java/com/example/{ => counter}/shared/ExampleUnitTest.kt (90%)

diff --git a/examples/counter/Android/.idea/.gitignore b/examples/counter/Android/.idea/.gitignore
deleted file mode 100644
index 26d33521a..000000000
--- a/examples/counter/Android/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/examples/counter/Android/.idea/codeStyles/Project.xml b/examples/counter/Android/.idea/codeStyles/Project.xml
deleted file mode 100644
index a88fc36d7..000000000
--- a/examples/counter/Android/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <option name="ENABLE_SECOND_REFORMAT" value="true" />
-    <JetCodeStyleSettings>
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </JetCodeStyleSettings>
-    <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-    <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </codeStyleSettings>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/examples/counter/Android/.idea/codeStyles/codeStyleConfig.xml b/examples/counter/Android/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index 79ee123c2..000000000
--- a/examples/counter/Android/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/examples/counter/Android/.idea/compiler.xml b/examples/counter/Android/.idea/compiler.xml
index b589d56e9..b86273d94 100644
--- a/examples/counter/Android/.idea/compiler.xml
+++ b/examples/counter/Android/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/examples/counter/Android/.idea/deploymentTargetDropDown.xml b/examples/counter/Android/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 0c0c33838..000000000
--- a/examples/counter/Android/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <value>
-      <entry key="app">
-        <State />
-      </entry>
-    </value>
-  </component>
-</project>
\ No newline at end of file
diff --git a/examples/counter/Android/.idea/deploymentTargetSelector.xml b/examples/counter/Android/.idea/deploymentTargetSelector.xml
index b268ef36c..44e12956a 100644
--- a/examples/counter/Android/.idea/deploymentTargetSelector.xml
+++ b/examples/counter/Android/.idea/deploymentTargetSelector.xml
@@ -4,6 +4,14 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2024-10-10T12:31:04.421769Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="LocalEmulator" identifier="path=/Users/stuartharris/.android/avd/Pixel_6_API_33.avd" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
       </SelectionState>
     </selectionStates>
   </component>
diff --git a/examples/counter/Android/.idea/inspectionProfiles/Project_Default.xml b/examples/counter/Android/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 6b74e05cc..000000000
--- a/examples/counter/Android/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="InconsistentLineSeparators" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="LongLine" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="ProblematicWhitespace" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="TodoComment" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/examples/counter/Android/.idea/kotlinc.xml b/examples/counter/Android/.idea/kotlinc.xml
index f8467b458..6d0ee1c2a 100644
--- a/examples/counter/Android/.idea/kotlinc.xml
+++ b/examples/counter/Android/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.10" />
+    <option name="version" value="2.0.0" />
   </component>
 </project>
\ No newline at end of file
diff --git a/examples/counter/Android/.idea/misc.xml b/examples/counter/Android/.idea/misc.xml
index 6c5519f9d..74dd639e4 100644
--- a/examples/counter/Android/.idea/misc.xml
+++ b/examples/counter/Android/.idea/misc.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/examples/counter/Android/app/build.gradle b/examples/counter/Android/app/build.gradle
index 6e3aee013..bdcf15ef3 100644
--- a/examples/counter/Android/app/build.gradle
+++ b/examples/counter/Android/app/build.gradle
@@ -1,6 +1,7 @@
 plugins {
-    id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.compose)
 }
 
 android {
@@ -9,73 +10,54 @@ android {
 
     defaultConfig {
         applicationId "com.example.counter"
-        minSdk 33
+        minSdk 34
         targetSdk 34
         versionCode 1
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary true
-        }
     }
 
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles {
-                getDefaultProguardFile('proguard-android-optimize.txt')
-                'proguard-rules.pro'
-            }
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_20
+        targetCompatibility JavaVersion.VERSION_20
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '20'
     }
     buildFeatures {
         compose true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.5.3'
-    }
-    packagingOptions {
-        resources {
-            excludes += '/META-INF/*'
-        }
-    }
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2024.09.03')
-    implementation composeBom
-    androidTestImplementation composeBom
-
-    implementation("androidx.compose.material3:material3")
-
-    // Android Studio Preview support
-    implementation("androidx.compose.ui:ui-tooling-preview")
-    debugImplementation("androidx.compose.ui:ui-tooling")
-
-    // UI Tests
-    androidTestImplementation 'androidx.test:runner:1.6.2'
-    androidTestUtil 'androidx.test:orchestrator:1.5.0'
-
-    // Optional - Integration with activities
-    implementation("androidx.activity:activity-compose:1.9.2")
-    // Optional - Integration with ViewModels
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.6")
-    // Optional - Integration with LiveData
-    implementation("androidx.compose.runtime:runtime-livedata")
-
-
+    // our shared library
     implementation project(path: ':shared')
-
-    implementation "io.ktor:ktor-client-cio:2.2.2"
-
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0'
+    
+    // added dependencies
+    implementation libs.lifecycle.viewmodel.compose
+    implementation libs.ktor.client
+
+    // original dependencies
+    implementation libs.androidx.core.ktx
+    implementation libs.androidx.lifecycle.runtime.ktx
+    implementation libs.androidx.activity.compose
+    implementation platform(libs.androidx.compose.bom)
+    implementation libs.androidx.ui
+    implementation libs.androidx.ui.graphics
+    implementation libs.androidx.ui.tooling.preview
+    implementation libs.androidx.material3
+    testImplementation libs.junit
+    androidTestImplementation libs.androidx.junit
+    androidTestImplementation libs.androidx.espresso.core
+    androidTestImplementation platform(libs.androidx.compose.bom)
+    androidTestImplementation libs.androidx.ui.test.junit4
+    debugImplementation libs.androidx.ui.tooling
+    debugImplementation libs.androidx.ui.test.manifest
 }
\ No newline at end of file
diff --git a/examples/counter/Android/app/src/main/AndroidManifest.xml b/examples/counter/Android/app/src/main/AndroidManifest.xml
index 4c52f4c84..472898d28 100644
--- a/examples/counter/Android/app/src/main/AndroidManifest.xml
+++ b/examples/counter/Android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
@@ -11,8 +11,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Counter"
-        tools:targetApi="31">
+        android:theme="@style/Theme.Counter">
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -22,10 +21,6 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-
-            <meta-data
-                android:name="android.app.lib_name"
-                android:value="" />
         </activity>
     </application>
 
diff --git a/examples/counter/Android/app/src/main/java/com/example/counter/MainActivity.kt b/examples/counter/Android/app/src/main/java/com/example/counter/MainActivity.kt
index 831ba7121..0281fb90a 100644
--- a/examples/counter/Android/app/src/main/java/com/example/counter/MainActivity.kt
+++ b/examples/counter/Android/app/src/main/java/com/example/counter/MainActivity.kt
@@ -1,10 +1,9 @@
-@file:OptIn(ExperimentalUnsignedTypes::class)
-
 package com.example.counter
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -31,11 +30,15 @@ import kotlinx.coroutines.launch
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
         setContent {
             CounterTheme {
                 Surface(
-                    modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background
-                ) { View() }
+                    modifier = Modifier.fillMaxSize(),
+                    color = MaterialTheme.colorScheme.background
+                ) {
+                    View()
+                }
             }
         }
     }
@@ -47,9 +50,7 @@ fun View(core: Core = viewModel()) {
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Center,
-        modifier = Modifier
-            .fillMaxSize()
-            .padding(10.dp),
+        modifier = Modifier.padding(10.dp),
     ) {
         Text(text = "Crux Counter Example", fontSize = 30.sp, modifier = Modifier.padding(10.dp))
         Text(text = "Rust Core, Kotlin Shell (Jetpack Compose)", modifier = Modifier.padding(10.dp))
@@ -83,4 +84,4 @@ fun View(core: Core = viewModel()) {
 @Composable
 fun DefaultPreview() {
     CounterTheme { View() }
-}
+}
\ No newline at end of file
diff --git a/examples/counter/Android/app/src/main/java/com/example/counter/http.kt b/examples/counter/Android/app/src/main/java/com/example/counter/http.kt
index 0797f9656..eebe51830 100644
--- a/examples/counter/Android/app/src/main/java/com/example/counter/http.kt
+++ b/examples/counter/Android/app/src/main/java/com/example/counter/http.kt
@@ -23,7 +23,7 @@ suspend fun requestHttp(
             }
         }
     }
-    val bytes: Bytes = response.body()
+    val bytes = Bytes.valueOf(response.body())
     val headers = response.headers.flattenEntries().map { HttpHeader(it.first, it.second) }
     return HttpResponse(response.status.value.toShort(), headers, bytes)
 }
diff --git a/examples/counter/Android/app/src/main/java/com/example/counter/ui/theme/Theme.kt b/examples/counter/Android/app/src/main/java/com/example/counter/ui/theme/Theme.kt
index cc24803e7..8b3b187bb 100644
--- a/examples/counter/Android/app/src/main/java/com/example/counter/ui/theme/Theme.kt
+++ b/examples/counter/Android/app/src/main/java/com/example/counter/ui/theme/Theme.kt
@@ -1,7 +1,5 @@
 package com.example.counter.ui.theme
 
-import android.app.Activity
-import android.os.Build
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.darkColorScheme
@@ -9,12 +7,7 @@ import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.SideEffect
-import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalView
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowCompat
 
 private val DarkColorScheme = darkColorScheme(
     primary = Purple80,
@@ -50,23 +43,10 @@ fun CounterTheme(
             val context = LocalContext.current
             if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
         }
+
         darkTheme -> DarkColorScheme
         else -> LightColorScheme
     }
-    val view = LocalView.current
-    if (!view.isInEditMode) {
-        /* getting the current window by tapping into the Activity */
-        val currentWindow = (view.context as? Activity)?.window
-            ?: throw Exception("Not in an activity - unable to get Window reference")
-
-        SideEffect {
-            /* the default code did the same cast here - might as well use our new variable! */
-            currentWindow.statusBarColor = colorScheme.primary.toArgb()
-            /* accessing the insets controller to change appearance of the status bar, with 100% less deprecation warnings */
-            WindowCompat.getInsetsController(currentWindow, view).isAppearanceLightStatusBars =
-                darkTheme
-        }
-    }
 
     MaterialTheme(
         colorScheme = colorScheme,
diff --git a/examples/counter/Android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/examples/counter/Android/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from examples/counter/Android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to examples/counter/Android/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/examples/counter/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/examples/counter/Android/app/src/main/res/mipmap-anydpi/ic_launcher.xml
similarity index 79%
rename from examples/counter/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to examples/counter/Android/app/src/main/res/mipmap-anydpi/ic_launcher.xml
index eca70cfe5..6f3b755bf 100644
--- a/examples/counter/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/examples/counter/Android/app/src/main/res/mipmap-anydpi/ic_launcher.xml
@@ -2,4 +2,5 @@
 <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>
\ No newline at end of file
diff --git a/examples/counter/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/examples/counter/Android/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
similarity index 79%
rename from examples/counter/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to examples/counter/Android/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
index eca70cfe5..6f3b755bf 100644
--- a/examples/counter/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/examples/counter/Android/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
@@ -2,4 +2,5 @@
 <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>
\ No newline at end of file
diff --git a/examples/counter/Android/build.gradle b/examples/counter/Android/build.gradle
index d4234e95b..8908c5a20 100644
--- a/examples/counter/Android/build.gradle
+++ b/examples/counter/Android/build.gradle
@@ -1,6 +1,8 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.7.0' apply false
-    id 'com.android.library' version '8.7.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.10' apply false
-    id "org.mozilla.rust-android-gradle.rust-android" version "0.9.4" apply false
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.kotlin.compose) apply false
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.rust.android) apply false
 }
\ No newline at end of file
diff --git a/examples/counter/Android/gradle.properties b/examples/counter/Android/gradle.properties
index f19c7b9b2..20e2a0152 100644
--- a/examples/counter/Android/gradle.properties
+++ b/examples/counter/Android/gradle.properties
@@ -8,8 +8,8 @@
 # The setting is particularly useful for tweaking memory settings.
 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
+# This option should only be used with decoupled projects. For more details, visit
+# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
 # org.gradle.parallel=true
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app's APK
@@ -20,5 +20,4 @@ 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
-android.nonFinalResIds=false
\ No newline at end of file
+android.nonTransitiveRClass=true
\ No newline at end of file
diff --git a/examples/counter/Android/gradle/libs.versions.toml b/examples/counter/Android/gradle/libs.versions.toml
new file mode 100644
index 000000000..142bbb8ac
--- /dev/null
+++ b/examples/counter/Android/gradle/libs.versions.toml
@@ -0,0 +1,48 @@
+[versions]
+agp = "8.7.0"
+kotlin = "2.0.0"
+coreKtx = "1.13.1"
+junit = "4.13.2"
+junitVersion = "1.2.1"
+espressoCore = "3.6.1"
+lifecycleRuntimeKtx = "2.8.6"
+activityCompose = "1.9.2"
+composeBom = "2024.09.03"
+appcompat = "1.7.0"
+material = "1.12.0"
+
+# added
+jna = "5.15.0"
+lifecycle = "2.8.6"
+rustAndroid = "0.9.4"
+ktorClient = "2.2.2"
+
+[libraries]
+androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+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-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
+androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
+androidx-ui = { group = "androidx.compose.ui", name = "ui" }
+androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
+androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
+androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
+androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
+androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
+androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+material = { group = "com.google.android.material", name = "material", version.ref = "material" }
+
+# added
+jna = { module = "net.java.dev.jna:jna", version.ref = "jna" }
+lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }
+ktor-client = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktorClient" }
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "agp" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+android-library = { id = "com.android.library", version.ref = "agp" }
+rust-android = { id = "org.mozilla.rust-android-gradle.rust-android", version.ref = "rustAndroid" }
diff --git a/examples/counter/Android/gradle/wrapper/gradle-wrapper.properties b/examples/counter/Android/gradle/wrapper/gradle-wrapper.properties
index 6dc20ef3f..025c03344 100644
--- a/examples/counter/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/counter/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Dec 17 13:36:16 GMT 2022
+#Thu Oct 10 11:31:20 BST 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/examples/counter/Android/settings.gradle b/examples/counter/Android/settings.gradle
index 9fc6fb3c1..b9523ad11 100644
--- a/examples/counter/Android/settings.gradle
+++ b/examples/counter/Android/settings.gradle
@@ -1,14 +1,16 @@
 pluginManagement {
     repositories {
-        gradlePluginPortal()
-        google()
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
         mavenCentral()
+        gradlePluginPortal()
     }
 }
-
-plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
-}
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
@@ -16,6 +18,7 @@ dependencyResolutionManagement {
         mavenCentral()
     }
 }
+
 rootProject.name = "Counter"
 include ':app'
 include ':shared'
diff --git a/examples/counter/Android/shared/build.gradle b/examples/counter/Android/shared/build.gradle
index cc353e1a2..de5c1f6f0 100644
--- a/examples/counter/Android/shared/build.gradle
+++ b/examples/counter/Android/shared/build.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id 'com.android.library'
-    id 'org.jetbrains.kotlin.android'
-    id 'org.mozilla.rust-android-gradle.rust-android'
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.rust.android)
 }
 
 android {
@@ -11,8 +11,7 @@ android {
     ndkVersion "27.1.12297006"
 
     defaultConfig {
-        minSdk 29
-        targetSdk 34
+        minSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -21,32 +20,34 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'),
-                    'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_20
+        targetCompatibility JavaVersion.VERSION_20
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '20'
     }
-
     sourceSets {
         main.java.srcDirs += "${projectDir}/../../shared_types/generated/java"
     }
 }
 
 dependencies {
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6"
-    implementation "net.java.dev.jna:jna:5.15.0@aar"
-    implementation 'androidx.core:core-ktx:1.13.1'
-    implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'com.google.android.material:material:1.12.0'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+    implementation(libs.jna) {
+        artifact {
+            type = "aar"
+        }
+    }
+
+    implementation libs.androidx.core.ktx
+    implementation libs.androidx.appcompat
+    implementation libs.material
+    testImplementation libs.junit
+    androidTestImplementation libs.androidx.junit
+    androidTestImplementation libs.androidx.espresso.core
 }
 
 apply plugin: 'org.mozilla.rust-android-gradle.rust-android'
@@ -54,16 +55,13 @@ apply plugin: 'org.mozilla.rust-android-gradle.rust-android'
 cargo {
     module = "../.."
     libname = "shared"
-    // these are the four recommended targets for Android that will ensure your library works on all
-    // mainline android devices make sure you have included the rust toolchain for each of these
-    // targets:
-    // `rustup target add \
-    //      aarch64-linux-android \
-    //      armv7-linux-androideabi \
-    //      i686-linux-android \
-    //      x86_64-linux-android`
+    // these are the four recommended targets for Android that will ensure your library works on all mainline android devices
+    // make sure you have included the rust toolchain for each of these targets: \
+    // `rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android`
     targets = ["arm", "arm64", "x86", "x86_64"]
     extraCargoBuildArguments = ['--package', 'shared']
+    cargoCommand = System.getProperty("user.home") + "/.cargo/bin/cargo"
+    rustcCommand = System.getProperty("user.home") + "/.cargo/bin/rustc"
 }
 
 afterEvaluate {
@@ -85,22 +83,12 @@ afterEvaluate {
     }
 }
 
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
-    }
-}
-
 tasks.register('bindGen', Exec) {
     def outDir = "${projectDir}/../../shared_types/generated/java"
     workingDir "../../"
     if (System.getProperty('os.name').toLowerCase().contains('windows')) {
         commandLine("cmd", "/c",
-                "cargo build -p shared && " +
-                        "target\\debug\\uniffi-bindgen generate shared\\src\\shared.udl " +
-                        "--language kotlin " +
-                        "--out-dir "
-                        + outDir.replace('/', '\\'))
+                "cargo build -p shared && " + "target\\debug\\uniffi-bindgen generate shared\\src\\shared.udl " + "--language kotlin " + "--out-dir " + outDir.replace('/', '\\'))
     } else {
         commandLine("sh", "-c",
                 """\
diff --git a/examples/counter/Android/shared/src/androidTest/java/com/example/shared/ExampleInstrumentedTest.kt b/examples/counter/Android/shared/src/androidTest/java/com/example/counter/shared/ExampleInstrumentedTest.kt
similarity index 83%
rename from examples/counter/Android/shared/src/androidTest/java/com/example/shared/ExampleInstrumentedTest.kt
rename to examples/counter/Android/shared/src/androidTest/java/com/example/counter/shared/ExampleInstrumentedTest.kt
index 1e409b35a..8068444f8 100644
--- a/examples/counter/Android/shared/src/androidTest/java/com/example/shared/ExampleInstrumentedTest.kt
+++ b/examples/counter/Android/shared/src/androidTest/java/com/example/counter/shared/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.example.shared
+package com.example.counter.shared
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.example.shared.test", appContext.packageName)
+        assertEquals("com.example.counter.shared.test", appContext.packageName)
     }
 }
\ No newline at end of file
diff --git a/examples/counter/Android/shared/src/main/AndroidManifest.xml b/examples/counter/Android/shared/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..a5918e68a
--- /dev/null
+++ b/examples/counter/Android/shared/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
\ No newline at end of file
diff --git a/examples/counter/Android/shared/src/test/java/com/example/shared/ExampleUnitTest.kt b/examples/counter/Android/shared/src/test/java/com/example/counter/shared/ExampleUnitTest.kt
similarity index 90%
rename from examples/counter/Android/shared/src/test/java/com/example/shared/ExampleUnitTest.kt
rename to examples/counter/Android/shared/src/test/java/com/example/counter/shared/ExampleUnitTest.kt
index ac37c8e2e..5d1a9b3f8 100644
--- a/examples/counter/Android/shared/src/test/java/com/example/shared/ExampleUnitTest.kt
+++ b/examples/counter/Android/shared/src/test/java/com/example/counter/shared/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package com.example.shared
+package com.example.counter.shared
 
 import org.junit.Test
 

From c3e9436825c1df5bd6d5ba9778b7ee04eb68c7af Mon Sep 17 00:00:00 2001
From: Stuart Harris <stuart.harris@red-badger.com>
Date: Thu, 10 Oct 2024 15:14:32 +0100
Subject: [PATCH 3/6] working simple_counter android example

---
 examples/counter/Android/shared/build.gradle  |  1 +
 examples/simple_counter/Android/.gitignore    | 46 ++++--------
 .../simple_counter/Android/.idea/.gitignore   |  3 +
 examples/simple_counter/Android/.idea/.name   |  1 +
 .../simple_counter/Android/.idea/compiler.xml |  6 ++
 .../.idea/deploymentTargetSelector.xml        | 10 +++
 .../simple_counter/Android/.idea/gradle.xml   | 21 ++++++
 .../simple_counter/Android/.idea/kotlinc.xml  |  6 ++
 .../Android/.idea/migrations.xml              | 10 +++
 .../simple_counter/Android/.idea/misc.xml     | 10 +++
 .../Android/.idea/runConfigurations.xml       | 13 ++++
 examples/simple_counter/Android/.idea/vcs.xml |  6 ++
 .../simple_counter/Android/app/build.gradle   | 75 +++++++------------
 .../simple_counter/ExampleInstrumentedTest.kt | 24 ++++++
 .../Android/app/src/main/AndroidManifest.xml  | 12 ++-
 .../java/com/example/simple_counter/Core.kt   |  2 +-
 .../example/simple_counter/MainActivity.kt    |  8 +-
 .../example/simple_counter/ui/theme/Theme.kt  | 17 +----
 .../ic_launcher_foreground.xml                |  0
 .../ic_launcher.xml                           |  1 +
 .../ic_launcher_round.xml                     |  1 +
 .../app/src/main/res/values/colors.xml        | 10 +--
 .../app/src/main/res/values/strings.xml       |  2 +-
 .../app/src/main/res/values/themes.xml        |  2 +-
 .../example/simple_counter/ExampleUnitTest.kt | 17 +++++
 examples/simple_counter/Android/build.gradle  | 10 ++-
 .../simple_counter/Android/gradle.properties  |  7 +-
 .../Android/gradle/libs.versions.toml         | 48 ++++++++++++
 .../gradle/wrapper/gradle-wrapper.properties  |  6 +-
 .../simple_counter/Android/settings.gradle    | 17 +++--
 .../Android/shared/build.gradle               | 53 +++++++------
 .../shared/ExampleInstrumentedTest.kt         | 24 ++++++
 .../shared/src/main/AndroidManifest.xml       |  4 +
 .../simple_counter/shared/ExampleUnitTest.kt  | 17 +++++
 34 files changed, 327 insertions(+), 163 deletions(-)
 create mode 100644 examples/simple_counter/Android/.idea/.gitignore
 create mode 100644 examples/simple_counter/Android/.idea/.name
 create mode 100644 examples/simple_counter/Android/.idea/compiler.xml
 create mode 100644 examples/simple_counter/Android/.idea/deploymentTargetSelector.xml
 create mode 100644 examples/simple_counter/Android/.idea/gradle.xml
 create mode 100644 examples/simple_counter/Android/.idea/kotlinc.xml
 create mode 100644 examples/simple_counter/Android/.idea/migrations.xml
 create mode 100644 examples/simple_counter/Android/.idea/misc.xml
 create mode 100644 examples/simple_counter/Android/.idea/runConfigurations.xml
 create mode 100644 examples/simple_counter/Android/.idea/vcs.xml
 create mode 100644 examples/simple_counter/Android/app/src/androidTest/java/com/example/simple_counter/ExampleInstrumentedTest.kt
 rename examples/simple_counter/Android/app/src/main/res/{drawable-v24 => drawable}/ic_launcher_foreground.xml (100%)
 rename examples/simple_counter/Android/app/src/main/res/{mipmap-anydpi-v26 => mipmap-anydpi}/ic_launcher.xml (79%)
 rename examples/simple_counter/Android/app/src/main/res/{mipmap-anydpi-v26 => mipmap-anydpi}/ic_launcher_round.xml (79%)
 create mode 100644 examples/simple_counter/Android/app/src/test/java/com/example/simple_counter/ExampleUnitTest.kt
 create mode 100644 examples/simple_counter/Android/gradle/libs.versions.toml
 create mode 100644 examples/simple_counter/Android/shared/src/androidTest/java/com/example/simple_counter/shared/ExampleInstrumentedTest.kt
 create mode 100644 examples/simple_counter/Android/shared/src/main/AndroidManifest.xml
 create mode 100644 examples/simple_counter/Android/shared/src/test/java/com/example/simple_counter/shared/ExampleUnitTest.kt

diff --git a/examples/counter/Android/shared/build.gradle b/examples/counter/Android/shared/build.gradle
index de5c1f6f0..343690134 100644
--- a/examples/counter/Android/shared/build.gradle
+++ b/examples/counter/Android/shared/build.gradle
@@ -62,6 +62,7 @@ cargo {
     extraCargoBuildArguments = ['--package', 'shared']
     cargoCommand = System.getProperty("user.home") + "/.cargo/bin/cargo"
     rustcCommand = System.getProperty("user.home") + "/.cargo/bin/rustc"
+    pythonCommand = "python3"
 }
 
 afterEvaluate {
diff --git a/examples/simple_counter/Android/.gitignore b/examples/simple_counter/Android/.gitignore
index 347e252ef..aa724b770 100644
--- a/examples/simple_counter/Android/.gitignore
+++ b/examples/simple_counter/Android/.gitignore
@@ -1,33 +1,15 @@
-# Gradle files
-.gradle/
-build/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Log/OS Files
-*.log
-
-# Android Studio generated files and folders
-captures/
-.externalNativeBuild/
-.cxx/
-*.apk
-output.json
-
-# IntelliJ
 *.iml
-.idea/
-misc.xml
-deploymentTargetDropDown.xml
-render.experimental.xml
-
-# Keystore files
-*.jks
-*.keystore
-
-# Google Services (e.g. APIs or Firebase)
-google-services.json
-
-# Android Profiling
-*.hprof
+.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/examples/simple_counter/Android/.idea/.gitignore b/examples/simple_counter/Android/.idea/.gitignore
new file mode 100644
index 000000000..26d33521a
--- /dev/null
+++ b/examples/simple_counter/Android/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/examples/simple_counter/Android/.idea/.name b/examples/simple_counter/Android/.idea/.name
new file mode 100644
index 000000000..8501c630e
--- /dev/null
+++ b/examples/simple_counter/Android/.idea/.name
@@ -0,0 +1 @@
+SimpleCounter
\ No newline at end of file
diff --git a/examples/simple_counter/Android/.idea/compiler.xml b/examples/simple_counter/Android/.idea/compiler.xml
new file mode 100644
index 000000000..b86273d94
--- /dev/null
+++ b/examples/simple_counter/Android/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="21" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/examples/simple_counter/Android/.idea/deploymentTargetSelector.xml b/examples/simple_counter/Android/.idea/deploymentTargetSelector.xml
new file mode 100644
index 000000000..b268ef36c
--- /dev/null
+++ b/examples/simple_counter/Android/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>
\ No newline at end of file
diff --git a/examples/simple_counter/Android/.idea/gradle.xml b/examples/simple_counter/Android/.idea/gradle.xml
new file mode 100644
index 000000000..8f1a221a0
--- /dev/null
+++ b/examples/simple_counter/Android/.idea/gradle.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/shared" />
+          </set>
+        </option>
+        <option name="resolveExternalAnnotations" value="false" />
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/examples/simple_counter/Android/.idea/kotlinc.xml b/examples/simple_counter/Android/.idea/kotlinc.xml
new file mode 100644
index 000000000..6d0ee1c2a
--- /dev/null
+++ b/examples/simple_counter/Android/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="2.0.0" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/examples/simple_counter/Android/.idea/migrations.xml b/examples/simple_counter/Android/.idea/migrations.xml
new file mode 100644
index 000000000..f8051a6f9
--- /dev/null
+++ b/examples/simple_counter/Android/.idea/migrations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/examples/simple_counter/Android/.idea/misc.xml b/examples/simple_counter/Android/.idea/misc.xml
new file mode 100644
index 000000000..74dd639e4
--- /dev/null
+++ b/examples/simple_counter/Android/.idea/misc.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/examples/simple_counter/Android/.idea/runConfigurations.xml b/examples/simple_counter/Android/.idea/runConfigurations.xml
new file mode 100644
index 000000000..931b96c3c
--- /dev/null
+++ b/examples/simple_counter/Android/.idea/runConfigurations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/examples/simple_counter/Android/.idea/vcs.xml b/examples/simple_counter/Android/.idea/vcs.xml
new file mode 100644
index 000000000..c2365ab11
--- /dev/null
+++ b/examples/simple_counter/Android/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/examples/simple_counter/Android/app/build.gradle b/examples/simple_counter/Android/app/build.gradle
index 305460733..5b445aa80 100644
--- a/examples/simple_counter/Android/app/build.gradle
+++ b/examples/simple_counter/Android/app/build.gradle
@@ -1,6 +1,7 @@
 plugins {
-    id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.compose)
 }
 
 android {
@@ -9,73 +10,53 @@ android {
 
     defaultConfig {
         applicationId "com.example.simple_counter"
-        minSdk 33
+        minSdk 34
         targetSdk 34
         versionCode 1
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary true
-        }
     }
 
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles {
-                getDefaultProguardFile('proguard-android-optimize.txt')
-                'proguard-rules.pro'
-            }
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_20
+        targetCompatibility JavaVersion.VERSION_20
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '20'
     }
     buildFeatures {
         compose true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.5.3'
-    }
-    packagingOptions {
-        resources {
-            excludes += '/META-INF/*'
-        }
-    }
 }
 
 dependencies {
     // our shared library
     implementation project(path: ':shared')
 
-    def composeBom = platform('androidx.compose:compose-bom:2024.09.03')
-    implementation platform('androidx.compose:compose-bom:2024.09.03')
-    androidTestImplementation platform('androidx.compose:compose-bom:2024.09.03')
-
-    implementation 'androidx.compose.material3:material3:1.3.0'
-
-    // Optional - Integration with ViewModels
-    implementation('androidx.lifecycle:lifecycle-viewmodel-compose:2.8.6')
-    // Optional - Integration with LiveData
-    implementation("androidx.compose.runtime:runtime-livedata")
-
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0'
-
-    implementation 'androidx.core:core-ktx:1.13.1'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.6'
-    implementation 'androidx.activity:activity-compose:1.9.2'
-    implementation 'androidx.compose.ui:ui:1.7.3'
-    implementation 'androidx.compose.ui:ui-tooling-preview:1.7.3'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
-    androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.7.3'
-    debugImplementation 'androidx.compose.ui:ui-tooling:1.7.3'
-    debugImplementation 'androidx.compose.ui:ui-test-manifest:1.7.3'
-}
+    // added dependencies
+    implementation libs.lifecycle.viewmodel.compose
+
+    // original dependencies
+    implementation libs.androidx.core.ktx
+    implementation libs.androidx.lifecycle.runtime.ktx
+    implementation libs.androidx.activity.compose
+    implementation platform(libs.androidx.compose.bom)
+    implementation libs.androidx.ui
+    implementation libs.androidx.ui.graphics
+    implementation libs.androidx.ui.tooling.preview
+    implementation libs.androidx.material3
+    testImplementation libs.junit
+    androidTestImplementation libs.androidx.junit
+    androidTestImplementation libs.androidx.espresso.core
+    androidTestImplementation platform(libs.androidx.compose.bom)
+    androidTestImplementation libs.androidx.ui.test.junit4
+    debugImplementation libs.androidx.ui.tooling
+    debugImplementation libs.androidx.ui.test.manifest
+}
\ No newline at end of file
diff --git a/examples/simple_counter/Android/app/src/androidTest/java/com/example/simple_counter/ExampleInstrumentedTest.kt b/examples/simple_counter/Android/app/src/androidTest/java/com/example/simple_counter/ExampleInstrumentedTest.kt
new file mode 100644
index 000000000..77180093f
--- /dev/null
+++ b/examples/simple_counter/Android/app/src/androidTest/java/com/example/simple_counter/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.example.simple_counter
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.example.simple_counter", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/examples/simple_counter/Android/app/src/main/AndroidManifest.xml b/examples/simple_counter/Android/app/src/main/AndroidManifest.xml
index 212a41bc4..5507bfb18 100644
--- a/examples/simple_counter/Android/app/src/main/AndroidManifest.xml
+++ b/examples/simple_counter/Android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:allowBackup="true"
@@ -7,21 +8,18 @@
         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.Counter">
+        android:theme="@style/Theme.SimpleCounter">
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:theme="@style/Theme.Counter">
+            android:theme="@style/Theme.SimpleCounter">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-
-            <meta-data
-                android:name="android.app.lib_name"
-                android:value="" />
         </activity>
     </application>
 
diff --git a/examples/simple_counter/Android/app/src/main/java/com/example/simple_counter/Core.kt b/examples/simple_counter/Android/app/src/main/java/com/example/simple_counter/Core.kt
index 3c15cd15b..d5e97ac40 100644
--- a/examples/simple_counter/Android/app/src/main/java/com/example/simple_counter/Core.kt
+++ b/examples/simple_counter/Android/app/src/main/java/com/example/simple_counter/Core.kt
@@ -1,8 +1,8 @@
 package com.example.simple_counter
 
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.setValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
 import com.example.simple_counter.shared.processEvent
 import com.example.simple_counter.shared.view
 import com.example.simple_counter.shared_types.Effect
diff --git a/examples/simple_counter/Android/app/src/main/java/com/example/simple_counter/MainActivity.kt b/examples/simple_counter/Android/app/src/main/java/com/example/simple_counter/MainActivity.kt
index bfb375921..ed0f13981 100644
--- a/examples/simple_counter/Android/app/src/main/java/com/example/simple_counter/MainActivity.kt
+++ b/examples/simple_counter/Android/app/src/main/java/com/example/simple_counter/MainActivity.kt
@@ -1,5 +1,3 @@
-@file:OptIn(ExperimentalUnsignedTypes::class)
-
 package com.example.simple_counter
 
 import android.os.Bundle
@@ -23,13 +21,13 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.example.simple_counter.shared_types.Event
-import com.example.simple_counter.ui.theme.CounterTheme
+import com.example.simple_counter.ui.theme.SimpleCounterTheme
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
-            CounterTheme {
+            SimpleCounterTheme {
                 Surface(
                     modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background
                 ) {
@@ -73,7 +71,7 @@ fun View(core: Core = viewModel()) {
 @Preview(showBackground = true)
 @Composable
 fun DefaultPreview() {
-    CounterTheme {
+    SimpleCounterTheme {
         View()
     }
 }
diff --git a/examples/simple_counter/Android/app/src/main/java/com/example/simple_counter/ui/theme/Theme.kt b/examples/simple_counter/Android/app/src/main/java/com/example/simple_counter/ui/theme/Theme.kt
index 768a24a48..0aae05ab0 100644
--- a/examples/simple_counter/Android/app/src/main/java/com/example/simple_counter/ui/theme/Theme.kt
+++ b/examples/simple_counter/Android/app/src/main/java/com/example/simple_counter/ui/theme/Theme.kt
@@ -1,6 +1,5 @@
 package com.example.simple_counter.ui.theme
 
-import android.app.Activity
 import android.os.Build
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme
@@ -9,11 +8,7 @@ import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.SideEffect
-import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalView
-import androidx.core.view.ViewCompat
 
 private val DarkColorScheme = darkColorScheme(
     primary = Purple80,
@@ -38,27 +33,21 @@ private val LightColorScheme = lightColorScheme(
 )
 
 @Composable
-fun CounterTheme(
+fun SimpleCounterTheme(
     darkTheme: Boolean = isSystemInDarkTheme(),
     // Dynamic color is available on Android 12+
     dynamicColor: Boolean = true,
     content: @Composable () -> Unit
 ) {
     val colorScheme = when {
-        dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
+        dynamicColor -> {
             val context = LocalContext.current
             if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
         }
+
         darkTheme -> DarkColorScheme
         else -> LightColorScheme
     }
-    val view = LocalView.current
-    if (!view.isInEditMode) {
-        SideEffect {
-            (view.context as Activity).window.statusBarColor = colorScheme.primary.toArgb()
-            ViewCompat.getWindowInsetsController(view)?.isAppearanceLightStatusBars = darkTheme
-        }
-    }
 
     MaterialTheme(
         colorScheme = colorScheme,
diff --git a/examples/simple_counter/Android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/examples/simple_counter/Android/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from examples/simple_counter/Android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to examples/simple_counter/Android/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/examples/simple_counter/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/examples/simple_counter/Android/app/src/main/res/mipmap-anydpi/ic_launcher.xml
similarity index 79%
rename from examples/simple_counter/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to examples/simple_counter/Android/app/src/main/res/mipmap-anydpi/ic_launcher.xml
index eca70cfe5..6f3b755bf 100644
--- a/examples/simple_counter/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/examples/simple_counter/Android/app/src/main/res/mipmap-anydpi/ic_launcher.xml
@@ -2,4 +2,5 @@
 <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>
\ No newline at end of file
diff --git a/examples/simple_counter/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/examples/simple_counter/Android/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
similarity index 79%
rename from examples/simple_counter/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to examples/simple_counter/Android/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
index eca70cfe5..6f3b755bf 100644
--- a/examples/simple_counter/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/examples/simple_counter/Android/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
@@ -2,4 +2,5 @@
 <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>
\ No newline at end of file
diff --git a/examples/simple_counter/Android/app/src/main/res/values/colors.xml b/examples/simple_counter/Android/app/src/main/res/values/colors.xml
index f8c6127d3..a6b3daec9 100644
--- a/examples/simple_counter/Android/app/src/main/res/values/colors.xml
+++ b/examples/simple_counter/Android/app/src/main/res/values/colors.xml
@@ -1,10 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<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>
\ No newline at end of file
+<resources></resources>
\ No newline at end of file
diff --git a/examples/simple_counter/Android/app/src/main/res/values/strings.xml b/examples/simple_counter/Android/app/src/main/res/values/strings.xml
index 72ea9c316..832f22fc6 100644
--- a/examples/simple_counter/Android/app/src/main/res/values/strings.xml
+++ b/examples/simple_counter/Android/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">Counter</string>
+    <string name="app_name">SimpleCounter</string>
 </resources>
\ No newline at end of file
diff --git a/examples/simple_counter/Android/app/src/main/res/values/themes.xml b/examples/simple_counter/Android/app/src/main/res/values/themes.xml
index 363df0b58..52eb032b2 100644
--- a/examples/simple_counter/Android/app/src/main/res/values/themes.xml
+++ b/examples/simple_counter/Android/app/src/main/res/values/themes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.Counter" parent="android:Theme.Material.Light.NoActionBar" />
+    <style name="Theme.SimpleCounter" parent="android:Theme.Material.Light.NoActionBar" />
 </resources>
\ No newline at end of file
diff --git a/examples/simple_counter/Android/app/src/test/java/com/example/simple_counter/ExampleUnitTest.kt b/examples/simple_counter/Android/app/src/test/java/com/example/simple_counter/ExampleUnitTest.kt
new file mode 100644
index 000000000..f51b79d35
--- /dev/null
+++ b/examples/simple_counter/Android/app/src/test/java/com/example/simple_counter/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package com.example.simple_counter
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
\ No newline at end of file
diff --git a/examples/simple_counter/Android/build.gradle b/examples/simple_counter/Android/build.gradle
index d4234e95b..8908c5a20 100644
--- a/examples/simple_counter/Android/build.gradle
+++ b/examples/simple_counter/Android/build.gradle
@@ -1,6 +1,8 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.7.0' apply false
-    id 'com.android.library' version '8.7.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.10' apply false
-    id "org.mozilla.rust-android-gradle.rust-android" version "0.9.4" apply false
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.kotlin.compose) apply false
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.rust.android) apply false
 }
\ No newline at end of file
diff --git a/examples/simple_counter/Android/gradle.properties b/examples/simple_counter/Android/gradle.properties
index f19c7b9b2..20e2a0152 100644
--- a/examples/simple_counter/Android/gradle.properties
+++ b/examples/simple_counter/Android/gradle.properties
@@ -8,8 +8,8 @@
 # The setting is particularly useful for tweaking memory settings.
 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
+# This option should only be used with decoupled projects. For more details, visit
+# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
 # org.gradle.parallel=true
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app's APK
@@ -20,5 +20,4 @@ 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
-android.nonFinalResIds=false
\ No newline at end of file
+android.nonTransitiveRClass=true
\ No newline at end of file
diff --git a/examples/simple_counter/Android/gradle/libs.versions.toml b/examples/simple_counter/Android/gradle/libs.versions.toml
new file mode 100644
index 000000000..c43a02326
--- /dev/null
+++ b/examples/simple_counter/Android/gradle/libs.versions.toml
@@ -0,0 +1,48 @@
+[versions]
+agp = "8.7.0"
+kotlin = "2.0.0"
+coreKtx = "1.13.1"
+junit = "4.13.2"
+junitVersion = "1.2.1"
+espressoCore = "3.6.1"
+lifecycleRuntimeKtx = "2.8.6"
+activityCompose = "1.9.2"
+composeBom = "2024.09.03"
+
+# added
+jna = "5.15.0"
+lifecycle = "2.8.6"
+rustAndroid = "0.9.4"
+appcompat = "1.7.0"
+material = "1.12.0"
+
+[libraries]
+androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+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-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
+androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
+androidx-ui = { group = "androidx.compose.ui", name = "ui" }
+androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
+androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
+androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
+androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
+androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
+androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
+
+# added
+jna = { module = "net.java.dev.jna:jna", version.ref = "jna" }
+lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+material = { group = "com.google.android.material", name = "material", version.ref = "material" }
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "agp" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+
+# added
+rust-android = { id = "org.mozilla.rust-android-gradle.rust-android", version.ref = "rustAndroid" }
+android-library = { id = "com.android.library", version.ref = "agp" }
\ No newline at end of file
diff --git a/examples/simple_counter/Android/gradle/wrapper/gradle-wrapper.properties b/examples/simple_counter/Android/gradle/wrapper/gradle-wrapper.properties
index 8da3e1a53..7213b8473 100644
--- a/examples/simple_counter/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/simple_counter/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed May 24 10:42:32 BST 2023
+#Thu Oct 10 15:00:34 BST 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/examples/simple_counter/Android/settings.gradle b/examples/simple_counter/Android/settings.gradle
index 9fc6fb3c1..9329e38de 100644
--- a/examples/simple_counter/Android/settings.gradle
+++ b/examples/simple_counter/Android/settings.gradle
@@ -1,14 +1,16 @@
 pluginManagement {
     repositories {
-        gradlePluginPortal()
-        google()
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
         mavenCentral()
+        gradlePluginPortal()
     }
 }
-
-plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
-}
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
@@ -16,6 +18,7 @@ dependencyResolutionManagement {
         mavenCentral()
     }
 }
-rootProject.name = "Counter"
+
+rootProject.name = "SimpleCounter"
 include ':app'
 include ':shared'
diff --git a/examples/simple_counter/Android/shared/build.gradle b/examples/simple_counter/Android/shared/build.gradle
index 4a652ea2c..2a95d9564 100644
--- a/examples/simple_counter/Android/shared/build.gradle
+++ b/examples/simple_counter/Android/shared/build.gradle
@@ -1,18 +1,16 @@
 plugins {
-    id 'com.android.library'
-    id 'org.jetbrains.kotlin.android'
-    id 'org.mozilla.rust-android-gradle.rust-android'
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
 }
 
 android {
     namespace 'com.example.simple_counter.shared'
     compileSdk 34
 
-    ndkVersion "27.0.12077973"
+    ndkVersion "27.1.12297006"
 
     defaultConfig {
-        minSdk 33
-        targetSdk 34
+        minSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -21,36 +19,39 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles {
-                getDefaultProguardFile('proguard-android-optimize.txt')
-                'proguard-rules.pro'
-            }
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_20
+        targetCompatibility JavaVersion.VERSION_20
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '20'
     }
-
     sourceSets {
         main.java.srcDirs += "${projectDir}/../../shared_types/generated/java"
     }
 }
 
 dependencies {
-    implementation 'net.java.dev.jna:jna:5.15.0@aar'
+    // added
+    implementation(libs.jna) {
+        artifact {
+            type = "aar"
+        }
+    }
 
-    implementation 'androidx.core:core-ktx:1.13.1'
-    implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'com.google.android.material:material:1.12.0'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+    // original
+    implementation libs.androidx.core.ktx
+    implementation libs.androidx.appcompat
+    implementation libs.material
+    testImplementation libs.junit
+    androidTestImplementation libs.androidx.junit
+    androidTestImplementation libs.androidx.espresso.core
 }
 
+
 apply plugin: 'org.mozilla.rust-android-gradle.rust-android'
 
 cargo {
@@ -61,6 +62,8 @@ cargo {
     // `rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android`
     targets = ["arm", "arm64", "x86", "x86_64"]
     extraCargoBuildArguments = ['--package', 'shared']
+    cargoCommand = System.getProperty("user.home") + "/.cargo/bin/cargo"
+    rustcCommand = System.getProperty("user.home") + "/.cargo/bin/rustc"
     pythonCommand = "python3"
 }
 
@@ -83,12 +86,6 @@ afterEvaluate {
     }
 }
 
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
-    }
-}
-
 tasks.register('bindGen', Exec) {
     def outDir = "${projectDir}/../../shared_types/generated/java"
     workingDir "../../"
@@ -113,4 +110,4 @@ tasks.register('typesGen', Exec) {
     } else {
         commandLine("sh", "-c", "cargo build -p shared_types")
     }
-}
+}
\ No newline at end of file
diff --git a/examples/simple_counter/Android/shared/src/androidTest/java/com/example/simple_counter/shared/ExampleInstrumentedTest.kt b/examples/simple_counter/Android/shared/src/androidTest/java/com/example/simple_counter/shared/ExampleInstrumentedTest.kt
new file mode 100644
index 000000000..00821061f
--- /dev/null
+++ b/examples/simple_counter/Android/shared/src/androidTest/java/com/example/simple_counter/shared/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.example.simple_counter.shared
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.example.simple_counter.shared.test", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/examples/simple_counter/Android/shared/src/main/AndroidManifest.xml b/examples/simple_counter/Android/shared/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..a5918e68a
--- /dev/null
+++ b/examples/simple_counter/Android/shared/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
\ No newline at end of file
diff --git a/examples/simple_counter/Android/shared/src/test/java/com/example/simple_counter/shared/ExampleUnitTest.kt b/examples/simple_counter/Android/shared/src/test/java/com/example/simple_counter/shared/ExampleUnitTest.kt
new file mode 100644
index 000000000..d96412065
--- /dev/null
+++ b/examples/simple_counter/Android/shared/src/test/java/com/example/simple_counter/shared/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package com.example.simple_counter.shared
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
\ No newline at end of file

From fc4df7136b1f543307dfe4851594857548f62d14 Mon Sep 17 00:00:00 2001
From: Stuart Harris <stuart.harris@red-badger.com>
Date: Thu, 10 Oct 2024 15:42:50 +0100
Subject: [PATCH 4/6] working cat_facts android example

---
 examples/cat_facts/Android/.idea/.name        |   1 +
 .../Android/.idea/codeStyles/Project.xml      | 123 ------------------
 .../.idea/codeStyles/codeStyleConfig.xml      |   5 -
 .../.idea/deploymentTargetDropDown.xml        |  10 --
 .../inspectionProfiles/Project_Default.xml    |  32 +++--
 examples/cat_facts/Android/.idea/kotlinc.xml  |   2 +-
 examples/cat_facts/Android/app/build.gradle   |  80 +++++-------
 .../catfacts}/ExampleInstrumentedTest.kt      |   4 +-
 .../Android/app/src/main/AndroidManifest.xml  |  13 +-
 .../android => redbadger/catfacts}/Core.kt    |   3 +-
 .../catfacts}/MainActivity.kt                 |  23 ++--
 .../android => redbadger/catfacts}/http.kt    |   7 +-
 .../catfacts}/ui/theme/Color.kt               |   2 +-
 .../catfacts}/ui/theme/Theme.kt               |  18 +--
 .../catfacts}/ui/theme/Type.kt                |   2 +-
 .../ic_launcher_foreground.xml                |   0
 .../ic_launcher.xml                           |   1 +
 .../ic_launcher_round.xml                     |   1 +
 .../app/src/main/res/values/colors.xml        |   7 -
 .../app/src/main/res/values/strings.xml       |   2 +-
 .../app/src/main/res/values/themes.xml        |   2 +-
 .../catfacts}/ExampleUnitTest.kt              |   2 +-
 examples/cat_facts/Android/build.gradle       |  10 +-
 examples/cat_facts/Android/gradle.properties  |   7 +-
 .../Android/gradle/libs.versions.toml         |  52 ++++++++
 .../gradle/wrapper/gradle-wrapper.properties  |   6 +-
 examples/cat_facts/Android/settings.gradle    |  13 +-
 .../cat_facts/Android/shared/build.gradle     |  60 +++++----
 .../shared/ExampleInstrumentedTest.kt         |  24 ++++
 .../shared/src/main/AndroidManifest.xml       |   4 +
 .../catfacts/shared/ExampleUnitTest.kt        |  17 +++
 31 files changed, 239 insertions(+), 294 deletions(-)
 create mode 100644 examples/cat_facts/Android/.idea/.name
 delete mode 100644 examples/cat_facts/Android/.idea/codeStyles/Project.xml
 delete mode 100644 examples/cat_facts/Android/.idea/codeStyles/codeStyleConfig.xml
 delete mode 100644 examples/cat_facts/Android/.idea/deploymentTargetDropDown.xml
 rename examples/cat_facts/Android/app/src/androidTest/java/com/{example/android => redbadger/catfacts}/ExampleInstrumentedTest.kt (84%)
 rename examples/cat_facts/Android/app/src/main/java/com/{example/android => redbadger/catfacts}/Core.kt (97%)
 rename examples/cat_facts/Android/app/src/main/java/com/{example/android => redbadger/catfacts}/MainActivity.kt (91%)
 rename examples/cat_facts/Android/app/src/main/java/com/{example/android => redbadger/catfacts}/http.kt (88%)
 rename examples/cat_facts/Android/app/src/main/java/com/{example/android => redbadger/catfacts}/ui/theme/Color.kt (86%)
 rename examples/cat_facts/Android/app/src/main/java/com/{example/android => redbadger/catfacts}/ui/theme/Theme.kt (72%)
 rename examples/cat_facts/Android/app/src/main/java/com/{example/android => redbadger/catfacts}/ui/theme/Type.kt (95%)
 rename examples/cat_facts/Android/app/src/main/res/{drawable-v24 => drawable}/ic_launcher_foreground.xml (100%)
 rename examples/cat_facts/Android/app/src/main/res/{mipmap-anydpi-v26 => mipmap-anydpi}/ic_launcher.xml (79%)
 rename examples/cat_facts/Android/app/src/main/res/{mipmap-anydpi-v26 => mipmap-anydpi}/ic_launcher_round.xml (79%)
 rename examples/cat_facts/Android/app/src/test/java/com/{example/android => redbadger/catfacts}/ExampleUnitTest.kt (91%)
 create mode 100644 examples/cat_facts/Android/gradle/libs.versions.toml
 create mode 100644 examples/cat_facts/Android/shared/src/androidTest/java/com/redbadger/catfacts/shared/ExampleInstrumentedTest.kt
 create mode 100644 examples/cat_facts/Android/shared/src/main/AndroidManifest.xml
 create mode 100644 examples/cat_facts/Android/shared/src/test/java/com/redbadger/catfacts/shared/ExampleUnitTest.kt

diff --git a/examples/cat_facts/Android/.idea/.name b/examples/cat_facts/Android/.idea/.name
new file mode 100644
index 000000000..e83a03e3b
--- /dev/null
+++ b/examples/cat_facts/Android/.idea/.name
@@ -0,0 +1 @@
+catfacts
\ No newline at end of file
diff --git a/examples/cat_facts/Android/.idea/codeStyles/Project.xml b/examples/cat_facts/Android/.idea/codeStyles/Project.xml
deleted file mode 100644
index 7643783a8..000000000
--- a/examples/cat_facts/Android/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <JetCodeStyleSettings>
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </JetCodeStyleSettings>
-    <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-    <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </codeStyleSettings>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/examples/cat_facts/Android/.idea/codeStyles/codeStyleConfig.xml b/examples/cat_facts/Android/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index 79ee123c2..000000000
--- a/examples/cat_facts/Android/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/examples/cat_facts/Android/.idea/deploymentTargetDropDown.xml b/examples/cat_facts/Android/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 0c0c33838..000000000
--- a/examples/cat_facts/Android/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <value>
-      <entry key="app">
-        <State />
-      </entry>
-    </value>
-  </component>
-</project>
\ No newline at end of file
diff --git a/examples/cat_facts/Android/.idea/inspectionProfiles/Project_Default.xml b/examples/cat_facts/Android/.idea/inspectionProfiles/Project_Default.xml
index 44ca2d9b0..cde3e1999 100644
--- a/examples/cat_facts/Android/.idea/inspectionProfiles/Project_Default.xml
+++ b/examples/cat_facts/Android/.idea/inspectionProfiles/Project_Default.xml
@@ -1,35 +1,51 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
-    <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
+    <inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
     </inspection_tool>
-    <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
+    <inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
     </inspection_tool>
-    <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+    <inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
     </inspection_tool>
-    <inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
+    <inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
     </inspection_tool>
-    <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
+    <inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
     </inspection_tool>
-    <inspection_tool class="PreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+    <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
     </inspection_tool>
-    <inspection_tool class="PreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+    <inspection_tool class="PreviewDeviceShouldUseNewSpec" enabled="true" level="WEAK WARNING" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
     </inspection_tool>
-    <inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+    <inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
     </inspection_tool>
diff --git a/examples/cat_facts/Android/.idea/kotlinc.xml b/examples/cat_facts/Android/.idea/kotlinc.xml
index f8467b458..6d0ee1c2a 100644
--- a/examples/cat_facts/Android/.idea/kotlinc.xml
+++ b/examples/cat_facts/Android/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.10" />
+    <option name="version" value="2.0.0" />
   </component>
 </project>
\ No newline at end of file
diff --git a/examples/cat_facts/Android/app/build.gradle b/examples/cat_facts/Android/app/build.gradle
index d6db77498..164c265a8 100644
--- a/examples/cat_facts/Android/app/build.gradle
+++ b/examples/cat_facts/Android/app/build.gradle
@@ -1,32 +1,27 @@
 plugins {
-    id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.compose)
 }
 
 android {
-    namespace 'com.example.android'
+    namespace 'com.redbadger.catfacts'
     compileSdk 34
 
     defaultConfig {
-        applicationId "com.example.android"
-        minSdk 33
+        applicationId "com.redbadger.catfacts"
+        minSdk 34
         targetSdk 34
         versionCode 1
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary true
-        }
     }
 
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles {
-                getDefaultProguardFile('proguard-android-optimize.txt')
-                'proguard-rules.pro'
-            }
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     compileOptions {
@@ -37,47 +32,34 @@ android {
         jvmTarget = '1.8'
     }
     buildFeatures {
-        compose = true
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.5.3'
-    }
-    packagingOptions {
-        resources {
-            excludes += '/META-INF/*'
-        }
+        compose true
     }
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2024.09.01')
-    implementation composeBom
-    androidTestImplementation composeBom
-
-    implementation("androidx.compose.material3:material3")
-    implementation("io.coil-kt:coil-compose:2.0.0-rc01")
-
-    // Android Studio Preview support
-    implementation("androidx.compose.ui:ui-tooling-preview")
-    debugImplementation("androidx.compose.ui:ui-tooling")
-
-    // UI Tests
-    androidTestImplementation("androidx.compose.ui:ui-test-junit4")
-    debugImplementation("androidx.compose.ui:ui-test-manifest")
-
-    // Optional - Integration with activities
-    implementation("androidx.activity:activity-compose:1.9.2")
-    // Optional - Integration with ViewModels
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.5")
-    // Optional - Integration with LiveData
-    implementation("androidx.compose.runtime:runtime-livedata")
-
-
+    // our shared library
     implementation project(path: ':shared')
-    implementation "androidx.compose.material:material-icons-extended:1.7.1"
 
-    implementation "io.ktor:ktor-client-cio:2.2.2"
+    // added dependencies
+    implementation libs.lifecycle.viewmodel.compose
+    implementation libs.ktor.client
+    implementation libs.material.icons.extended
+    implementation libs.coil.compose
 
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
-}
+    // original dependencies
+    implementation libs.androidx.core.ktx
+    implementation libs.androidx.lifecycle.runtime.ktx
+    implementation libs.androidx.activity.compose
+    implementation platform(libs.androidx.compose.bom)
+    implementation libs.androidx.ui
+    implementation libs.androidx.ui.graphics
+    implementation libs.androidx.ui.tooling.preview
+    implementation libs.androidx.material3
+    testImplementation libs.junit
+    androidTestImplementation libs.androidx.junit
+    androidTestImplementation libs.androidx.espresso.core
+    androidTestImplementation platform(libs.androidx.compose.bom)
+    androidTestImplementation libs.androidx.ui.test.junit4
+    debugImplementation libs.androidx.ui.tooling
+    debugImplementation libs.androidx.ui.test.manifest
+}
\ No newline at end of file
diff --git a/examples/cat_facts/Android/app/src/androidTest/java/com/example/android/ExampleInstrumentedTest.kt b/examples/cat_facts/Android/app/src/androidTest/java/com/redbadger/catfacts/ExampleInstrumentedTest.kt
similarity index 84%
rename from examples/cat_facts/Android/app/src/androidTest/java/com/example/android/ExampleInstrumentedTest.kt
rename to examples/cat_facts/Android/app/src/androidTest/java/com/redbadger/catfacts/ExampleInstrumentedTest.kt
index 79c1acd83..67da1b845 100644
--- a/examples/cat_facts/Android/app/src/androidTest/java/com/example/android/ExampleInstrumentedTest.kt
+++ b/examples/cat_facts/Android/app/src/androidTest/java/com/redbadger/catfacts/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.example.android
+package com.redbadger.catfacts
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.example.android", appContext.packageName)
+        assertEquals("com.redbadger.catfacts", appContext.packageName)
     }
 }
\ No newline at end of file
diff --git a/examples/cat_facts/Android/app/src/main/AndroidManifest.xml b/examples/cat_facts/Android/app/src/main/AndroidManifest.xml
index 7a43148fb..87135e04d 100644
--- a/examples/cat_facts/Android/app/src/main/AndroidManifest.xml
+++ b/examples/cat_facts/Android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<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"
@@ -10,20 +10,17 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Android">
+        android:theme="@style/Theme.Cat_facts"
+        >
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:theme="@style/Theme.Android">
+            android:theme="@style/Theme.Cat_facts">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-
-            <meta-data
-                android:name="android.app.lib_name"
-                android:value="" />
         </activity>
     </application>
 
diff --git a/examples/cat_facts/Android/app/src/main/java/com/example/android/Core.kt b/examples/cat_facts/Android/app/src/main/java/com/redbadger/catfacts/Core.kt
similarity index 97%
rename from examples/cat_facts/Android/app/src/main/java/com/example/android/Core.kt
rename to examples/cat_facts/Android/app/src/main/java/com/redbadger/catfacts/Core.kt
index c4db0664e..ec3bf716f 100644
--- a/examples/cat_facts/Android/app/src/main/java/com/example/android/Core.kt
+++ b/examples/cat_facts/Android/app/src/main/java/com/redbadger/catfacts/Core.kt
@@ -1,12 +1,11 @@
 @file:Suppress("NAME_SHADOWING")
 
-package com.example.android
+package com.redbadger.catfacts
 
 import android.os.Build
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-import com.example.counter.requestHttp
 import com.redbadger.catfacts.shared.handleResponse
 import com.redbadger.catfacts.shared.processEvent
 import com.redbadger.catfacts.shared.view
diff --git a/examples/cat_facts/Android/app/src/main/java/com/example/android/MainActivity.kt b/examples/cat_facts/Android/app/src/main/java/com/redbadger/catfacts/MainActivity.kt
similarity index 91%
rename from examples/cat_facts/Android/app/src/main/java/com/example/android/MainActivity.kt
rename to examples/cat_facts/Android/app/src/main/java/com/redbadger/catfacts/MainActivity.kt
index c914d1f80..d8ca6639d 100644
--- a/examples/cat_facts/Android/app/src/main/java/com/example/android/MainActivity.kt
+++ b/examples/cat_facts/Android/app/src/main/java/com/redbadger/catfacts/MainActivity.kt
@@ -1,8 +1,9 @@
-package com.example.android
+package com.redbadger.catfacts
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -29,19 +30,17 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewModelScope
 import androidx.lifecycle.viewmodel.compose.viewModel
 import coil.compose.rememberAsyncImagePainter
-import com.example.android.ui.theme.AndroidTheme
 import com.redbadger.catfacts.shared_types.Event
-import com.redbadger.catfacts.shared_types.Event.Clear
-import com.redbadger.catfacts.shared_types.Event.Fetch
-import com.redbadger.catfacts.shared_types.Event.Get
+import com.redbadger.catfacts.ui.theme.CatfactsTheme
 import kotlinx.coroutines.launch
 import kotlin.jvm.optionals.getOrNull
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
         setContent {
-            AndroidTheme {
+            CatfactsTheme {
                 Surface(
                     modifier = Modifier.fillMaxSize(),
                     color = MaterialTheme.colorScheme.background
@@ -54,7 +53,7 @@ class MainActivity : ComponentActivity() {
 class MyCore : Core() {
     init {
         viewModelScope.launch {
-            update(Get())
+            update(Event.Get())
             update(Event.GetPlatform())
         }
     }
@@ -92,21 +91,21 @@ fun CatFacts(core: MyCore = viewModel()) {
         Text(text = core.view?.fact ?: "", modifier = Modifier.padding(10.dp))
         Row(horizontalArrangement = Arrangement.spacedBy(10.dp)) {
             Button(
-                onClick = { coroutineScope.launch { core.update(Clear()) } },
+                onClick = { coroutineScope.launch { core.update(Event.Clear()) } },
                 colors =
                 ButtonDefaults.buttonColors(
                     containerColor = MaterialTheme.colorScheme.error
                 )
             ) { Text(text = "Clear", color = Color.White) }
             Button(
-                onClick = { coroutineScope.launch { core.update(Get()) } },
+                onClick = { coroutineScope.launch { core.update(Event.Get()) } },
                 colors =
                 ButtonDefaults.buttonColors(
                     containerColor = MaterialTheme.colorScheme.primary
                 )
             ) { Text(text = "Get", color = Color.White) }
             Button(
-                onClick = { coroutineScope.launch { core.update(Fetch()) } },
+                onClick = { coroutineScope.launch { core.update(Event.Fetch()) } },
                 colors =
                 ButtonDefaults.buttonColors(
                     containerColor = MaterialTheme.colorScheme.secondary
@@ -119,5 +118,5 @@ fun CatFacts(core: MyCore = viewModel()) {
 @Preview(showBackground = true)
 @Composable
 fun DefaultPreview() {
-    AndroidTheme { CatFacts() }
-}
+    CatfactsTheme { CatFacts() }
+}
\ No newline at end of file
diff --git a/examples/cat_facts/Android/app/src/main/java/com/example/android/http.kt b/examples/cat_facts/Android/app/src/main/java/com/redbadger/catfacts/http.kt
similarity index 88%
rename from examples/cat_facts/Android/app/src/main/java/com/example/android/http.kt
rename to examples/cat_facts/Android/app/src/main/java/com/redbadger/catfacts/http.kt
index b639d76ab..54a4fd402 100644
--- a/examples/cat_facts/Android/app/src/main/java/com/example/android/http.kt
+++ b/examples/cat_facts/Android/app/src/main/java/com/redbadger/catfacts/http.kt
@@ -1,5 +1,6 @@
-package com.example.counter
+package com.redbadger.catfacts
 
+import com.novi.serde.Bytes
 import com.redbadger.catfacts.shared_types.HttpHeader
 import com.redbadger.catfacts.shared_types.HttpRequest
 import com.redbadger.catfacts.shared_types.HttpResponse
@@ -22,8 +23,8 @@ suspend fun requestHttp(
             }
         }
     }
-    val bytes: ByteArray = response.body()
+    val bytes = Bytes.valueOf(response.body())
     val headers = response.headers.flattenEntries().map { HttpHeader(it.first, it.second) }
-    return HttpResponse(response.status.value.toShort(), headers, bytes.toList())
+    return HttpResponse(response.status.value.toShort(), headers, bytes)
 }
 
diff --git a/examples/cat_facts/Android/app/src/main/java/com/example/android/ui/theme/Color.kt b/examples/cat_facts/Android/app/src/main/java/com/redbadger/catfacts/ui/theme/Color.kt
similarity index 86%
rename from examples/cat_facts/Android/app/src/main/java/com/example/android/ui/theme/Color.kt
rename to examples/cat_facts/Android/app/src/main/java/com/redbadger/catfacts/ui/theme/Color.kt
index 9597aba20..856d55ee8 100644
--- a/examples/cat_facts/Android/app/src/main/java/com/example/android/ui/theme/Color.kt
+++ b/examples/cat_facts/Android/app/src/main/java/com/redbadger/catfacts/ui/theme/Color.kt
@@ -1,4 +1,4 @@
-package com.example.android.ui.theme
+package com.redbadger.catfacts.ui.theme
 
 import androidx.compose.ui.graphics.Color
 
diff --git a/examples/cat_facts/Android/app/src/main/java/com/example/android/ui/theme/Theme.kt b/examples/cat_facts/Android/app/src/main/java/com/redbadger/catfacts/ui/theme/Theme.kt
similarity index 72%
rename from examples/cat_facts/Android/app/src/main/java/com/example/android/ui/theme/Theme.kt
rename to examples/cat_facts/Android/app/src/main/java/com/redbadger/catfacts/ui/theme/Theme.kt
index cd5dcf22c..19c9256eb 100644
--- a/examples/cat_facts/Android/app/src/main/java/com/example/android/ui/theme/Theme.kt
+++ b/examples/cat_facts/Android/app/src/main/java/com/redbadger/catfacts/ui/theme/Theme.kt
@@ -1,6 +1,6 @@
-package com.example.android.ui.theme
+package com.redbadger.catfacts.ui.theme
 
-import android.app.Activity
+import android.os.Build
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.darkColorScheme
@@ -8,11 +8,7 @@ import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.SideEffect
-import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalView
-import androidx.core.view.WindowCompat
 
 private val DarkColorScheme = darkColorScheme(
     primary = Purple80,
@@ -37,7 +33,7 @@ private val LightColorScheme = lightColorScheme(
 )
 
 @Composable
-fun AndroidTheme(
+fun CatfactsTheme(
     darkTheme: Boolean = isSystemInDarkTheme(),
     // Dynamic color is available on Android 12+
     dynamicColor: Boolean = true,
@@ -48,16 +44,10 @@ fun AndroidTheme(
             val context = LocalContext.current
             if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
         }
+
         darkTheme -> DarkColorScheme
         else -> LightColorScheme
     }
-    val view = LocalView.current
-    if (!view.isInEditMode) {
-        SideEffect {
-            (view.context as Activity).window.statusBarColor = colorScheme.primary.toArgb()
-            WindowCompat.getInsetsController((view.context as Activity).window, view).isAppearanceLightStatusBars = darkTheme
-        }
-    }
 
     MaterialTheme(
         colorScheme = colorScheme,
diff --git a/examples/cat_facts/Android/app/src/main/java/com/example/android/ui/theme/Type.kt b/examples/cat_facts/Android/app/src/main/java/com/redbadger/catfacts/ui/theme/Type.kt
similarity index 95%
rename from examples/cat_facts/Android/app/src/main/java/com/example/android/ui/theme/Type.kt
rename to examples/cat_facts/Android/app/src/main/java/com/redbadger/catfacts/ui/theme/Type.kt
index b0f064e4c..0be021ae4 100644
--- a/examples/cat_facts/Android/app/src/main/java/com/example/android/ui/theme/Type.kt
+++ b/examples/cat_facts/Android/app/src/main/java/com/redbadger/catfacts/ui/theme/Type.kt
@@ -1,4 +1,4 @@
-package com.example.android.ui.theme
+package com.redbadger.catfacts.ui.theme
 
 import androidx.compose.material3.Typography
 import androidx.compose.ui.text.TextStyle
diff --git a/examples/cat_facts/Android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/examples/cat_facts/Android/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from examples/cat_facts/Android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to examples/cat_facts/Android/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/examples/cat_facts/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/examples/cat_facts/Android/app/src/main/res/mipmap-anydpi/ic_launcher.xml
similarity index 79%
rename from examples/cat_facts/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to examples/cat_facts/Android/app/src/main/res/mipmap-anydpi/ic_launcher.xml
index eca70cfe5..6f3b755bf 100644
--- a/examples/cat_facts/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/examples/cat_facts/Android/app/src/main/res/mipmap-anydpi/ic_launcher.xml
@@ -2,4 +2,5 @@
 <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>
\ No newline at end of file
diff --git a/examples/cat_facts/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/examples/cat_facts/Android/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
similarity index 79%
rename from examples/cat_facts/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to examples/cat_facts/Android/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
index eca70cfe5..6f3b755bf 100644
--- a/examples/cat_facts/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/examples/cat_facts/Android/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
@@ -2,4 +2,5 @@
 <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>
\ No newline at end of file
diff --git a/examples/cat_facts/Android/app/src/main/res/values/colors.xml b/examples/cat_facts/Android/app/src/main/res/values/colors.xml
index f8c6127d3..55344e519 100644
--- a/examples/cat_facts/Android/app/src/main/res/values/colors.xml
+++ b/examples/cat_facts/Android/app/src/main/res/values/colors.xml
@@ -1,10 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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>
\ No newline at end of file
diff --git a/examples/cat_facts/Android/app/src/main/res/values/strings.xml b/examples/cat_facts/Android/app/src/main/res/values/strings.xml
index 0b9d2c859..ad2c9256c 100644
--- a/examples/cat_facts/Android/app/src/main/res/values/strings.xml
+++ b/examples/cat_facts/Android/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">Android</string>
+    <string name="app_name">catfacts</string>
 </resources>
\ No newline at end of file
diff --git a/examples/cat_facts/Android/app/src/main/res/values/themes.xml b/examples/cat_facts/Android/app/src/main/res/values/themes.xml
index bc6743f3a..0e674a11a 100644
--- a/examples/cat_facts/Android/app/src/main/res/values/themes.xml
+++ b/examples/cat_facts/Android/app/src/main/res/values/themes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.Android" parent="android:Theme.Material.Light.NoActionBar" />
+    <style name="Theme.Cat_facts" parent="android:Theme.Material.Light.NoActionBar" />
 </resources>
\ No newline at end of file
diff --git a/examples/cat_facts/Android/app/src/test/java/com/example/android/ExampleUnitTest.kt b/examples/cat_facts/Android/app/src/test/java/com/redbadger/catfacts/ExampleUnitTest.kt
similarity index 91%
rename from examples/cat_facts/Android/app/src/test/java/com/example/android/ExampleUnitTest.kt
rename to examples/cat_facts/Android/app/src/test/java/com/redbadger/catfacts/ExampleUnitTest.kt
index 51c19b5bc..716f64a3b 100644
--- a/examples/cat_facts/Android/app/src/test/java/com/example/android/ExampleUnitTest.kt
+++ b/examples/cat_facts/Android/app/src/test/java/com/redbadger/catfacts/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package com.example.android
+package com.redbadger.catfacts
 
 import org.junit.Test
 
diff --git a/examples/cat_facts/Android/build.gradle b/examples/cat_facts/Android/build.gradle
index 80715d666..8908c5a20 100644
--- a/examples/cat_facts/Android/build.gradle
+++ b/examples/cat_facts/Android/build.gradle
@@ -1,6 +1,8 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.5.2' apply false
-    id 'com.android.library' version '8.5.2' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.10' apply false
-    id "org.mozilla.rust-android-gradle.rust-android" version "0.9.4" apply false
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.kotlin.compose) apply false
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.rust.android) apply false
 }
\ No newline at end of file
diff --git a/examples/cat_facts/Android/gradle.properties b/examples/cat_facts/Android/gradle.properties
index f19c7b9b2..20e2a0152 100644
--- a/examples/cat_facts/Android/gradle.properties
+++ b/examples/cat_facts/Android/gradle.properties
@@ -8,8 +8,8 @@
 # The setting is particularly useful for tweaking memory settings.
 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
+# This option should only be used with decoupled projects. For more details, visit
+# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
 # org.gradle.parallel=true
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app's APK
@@ -20,5 +20,4 @@ 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
-android.nonFinalResIds=false
\ No newline at end of file
+android.nonTransitiveRClass=true
\ No newline at end of file
diff --git a/examples/cat_facts/Android/gradle/libs.versions.toml b/examples/cat_facts/Android/gradle/libs.versions.toml
new file mode 100644
index 000000000..780468426
--- /dev/null
+++ b/examples/cat_facts/Android/gradle/libs.versions.toml
@@ -0,0 +1,52 @@
+[versions]
+agp = "8.7.0"
+kotlin = "2.0.0"
+coreKtx = "1.13.1"
+junit = "4.13.2"
+junitVersion = "1.2.1"
+espressoCore = "3.6.1"
+lifecycleRuntimeKtx = "2.8.6"
+activityCompose = "1.9.2"
+composeBom = "2024.09.03"
+appcompat = "1.7.0"
+material = "1.12.0"
+
+# added
+jna = "5.15.0"
+lifecycle = "2.8.6"
+rustAndroid = "0.9.4"
+ktorClient = "2.2.2"
+materialIconsExtended = "1.7.3"
+coilCompose = "2.0.0-rc01"
+
+[libraries]
+androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+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-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
+androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
+androidx-ui = { group = "androidx.compose.ui", name = "ui" }
+androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
+androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
+androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
+androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
+androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
+androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+material = { group = "com.google.android.material", name = "material", version.ref = "material" }
+
+# added
+jna = { module = "net.java.dev.jna:jna", version.ref = "jna" }
+lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }
+ktor-client = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktorClient" }
+material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "materialIconsExtended" }
+coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coilCompose" }
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "agp" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+android-library = { id = "com.android.library", version.ref = "agp" }
+rust-android = { id = "org.mozilla.rust-android-gradle.rust-android", version.ref = "rustAndroid" }
diff --git a/examples/cat_facts/Android/gradle/wrapper/gradle-wrapper.properties b/examples/cat_facts/Android/gradle/wrapper/gradle-wrapper.properties
index d1cd15122..6b0c0171c 100644
--- a/examples/cat_facts/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/cat_facts/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Oct 27 10:30:44 BST 2022
+#Thu Oct 10 15:42:00 BST 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/examples/cat_facts/Android/settings.gradle b/examples/cat_facts/Android/settings.gradle
index b12157f2f..4dfdb945e 100644
--- a/examples/cat_facts/Android/settings.gradle
+++ b/examples/cat_facts/Android/settings.gradle
@@ -1,8 +1,14 @@
 pluginManagement {
     repositories {
-        gradlePluginPortal()
-        google()
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
         mavenCentral()
+        gradlePluginPortal()
     }
 }
 dependencyResolutionManagement {
@@ -12,6 +18,7 @@ dependencyResolutionManagement {
         mavenCentral()
     }
 }
-rootProject.name = "Android"
+
+rootProject.name = "catfacts"
 include ':app'
 include ':shared'
diff --git a/examples/cat_facts/Android/shared/build.gradle b/examples/cat_facts/Android/shared/build.gradle
index 4986bc730..ff42a4609 100644
--- a/examples/cat_facts/Android/shared/build.gradle
+++ b/examples/cat_facts/Android/shared/build.gradle
@@ -1,17 +1,16 @@
 plugins {
-    id 'com.android.library'
-    id 'org.jetbrains.kotlin.android'
-    id 'org.mozilla.rust-android-gradle.rust-android'
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
 }
 
 android {
     namespace 'com.redbadger.catfacts.shared'
     compileSdk 34
-    ndkVersion "27.0.12077973"
+
+    ndkVersion "27.1.12297006"
 
     defaultConfig {
-        minSdk 29
-        targetSdk 34
+        minSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -24,39 +23,45 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_20
+        targetCompatibility JavaVersion.VERSION_20
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '20'
     }
-
     sourceSets {
         main.java.srcDirs += "${projectDir}/../../shared_types/generated/java"
     }
 }
 
 dependencies {
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.5"
-    implementation "net.java.dev.jna:jna:5.13.0@aar"
-    implementation 'androidx.core:core-ktx:1.13.1'
-    implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'com.google.android.material:material:1.12.0'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+    implementation(libs.jna) {
+        artifact {
+            type = "aar"
+        }
+    }
+
+    implementation libs.androidx.core.ktx
+    implementation libs.androidx.appcompat
+    implementation libs.material
+    testImplementation libs.junit
+    androidTestImplementation libs.androidx.junit
+    androidTestImplementation libs.androidx.espresso.core
 }
 
 apply plugin: 'org.mozilla.rust-android-gradle.rust-android'
 
 cargo {
-    module  = "../.."
+    module = "../.."
     libname = "shared"
     // these are the four recommended targets for Android that will ensure your library works on all mainline android devices
     // make sure you have included the rust toolchain for each of these targets: \
     // `rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android`
     targets = ["arm", "arm64", "x86", "x86_64"]
     extraCargoBuildArguments = ['--package', 'shared']
+    cargoCommand = System.getProperty("user.home") + "/.cargo/bin/cargo"
+    rustcCommand = System.getProperty("user.home") + "/.cargo/bin/rustc"
+    pythonCommand = "python3"
 }
 
 afterEvaluate {
@@ -82,23 +87,16 @@ tasks.register('bindGen', Exec) {
     def outDir = "${projectDir}/../../shared_types/generated/java"
     workingDir "../../"
     if (System.getProperty('os.name').toLowerCase().contains('windows')) {
-        commandLine(
-                "cmd", "/c",
-                "cargo build -p shared && " +
-                        "target\\debug\\uniffi-bindgen generate shared\\src\\shared.udl " +
-                        "--language kotlin " +
-                        "--out-dir " + outDir.replace('/', '\\')
-        )
+        commandLine("cmd", "/c",
+                "cargo build -p shared && " + "target\\debug\\uniffi-bindgen generate shared\\src\\shared.udl " + "--language kotlin " + "--out-dir " + outDir.replace('/', '\\'))
     } else {
-        commandLine(
-                "sh", "-c",
+        commandLine("sh", "-c",
                 """\
                 cargo build -p shared && \
                 target/debug/uniffi-bindgen generate shared/src/shared.udl \
                 --language kotlin \
                 --out-dir $outDir
-                """
-        )
+                """)
     }
 }
 
@@ -109,4 +107,4 @@ tasks.register('typesGen', Exec) {
     } else {
         commandLine("sh", "-c", "cargo build -p shared_types")
     }
-}
+}
\ No newline at end of file
diff --git a/examples/cat_facts/Android/shared/src/androidTest/java/com/redbadger/catfacts/shared/ExampleInstrumentedTest.kt b/examples/cat_facts/Android/shared/src/androidTest/java/com/redbadger/catfacts/shared/ExampleInstrumentedTest.kt
new file mode 100644
index 000000000..638210d67
--- /dev/null
+++ b/examples/cat_facts/Android/shared/src/androidTest/java/com/redbadger/catfacts/shared/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.redbadger.catfacts.shared
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.redbadger.catfacts.shared.test", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/examples/cat_facts/Android/shared/src/main/AndroidManifest.xml b/examples/cat_facts/Android/shared/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..a5918e68a
--- /dev/null
+++ b/examples/cat_facts/Android/shared/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
\ No newline at end of file
diff --git a/examples/cat_facts/Android/shared/src/test/java/com/redbadger/catfacts/shared/ExampleUnitTest.kt b/examples/cat_facts/Android/shared/src/test/java/com/redbadger/catfacts/shared/ExampleUnitTest.kt
new file mode 100644
index 000000000..c7e345ce7
--- /dev/null
+++ b/examples/cat_facts/Android/shared/src/test/java/com/redbadger/catfacts/shared/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package com.redbadger.catfacts.shared
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
\ No newline at end of file

From bc585ac730ca17430fe7c436b543edfb6debecab Mon Sep 17 00:00:00 2001
From: Stuart Harris <stuart.harris@red-badger.com>
Date: Thu, 10 Oct 2024 16:48:56 +0100
Subject: [PATCH 5/6] working bridge_echo android example

---
 examples/bridge_echo/Android/.idea/.name      |  2 +-
 .../.idea/deploymentTargetDropDown.xml        | 10 ---
 examples/bridge_echo/Android/.idea/gradle.xml |  1 -
 .../inspectionProfiles/Project_Default.xml    | 41 ----------
 .../bridge_echo/Android/.idea/kotlinc.xml     |  2 +-
 examples/bridge_echo/Android/.idea/misc.xml   |  7 +-
 examples/bridge_echo/Android/app/build.gradle | 76 +++++++------------
 .../bridge_echo/ExampleInstrumentedTest.kt    |  4 +-
 .../Android/app/src/main/AndroidManifest.xml  | 11 +--
 .../com/example/bridge_echo/MainActivity.kt   | 66 ++++++++--------
 .../com/example/bridge_echo/ui/theme/Theme.kt | 31 +++-----
 .../ic_launcher_foreground.xml                |  0
 .../ic_launcher.xml                           |  1 +
 .../ic_launcher_round.xml                     |  1 +
 .../app/src/main/res/values/colors.xml        |  7 --
 .../app/src/main/res/values/strings.xml       |  2 +-
 .../app/src/main/res/values/themes.xml        |  3 +-
 .../example/bridge_echo/ExampleUnitTest.kt    |  2 +-
 examples/bridge_echo/Android/build.gradle     | 10 ++-
 .../bridge_echo/Android/gradle.properties     |  7 +-
 .../Android/gradle/libs.versions.toml         | 49 ++++++++++++
 .../gradle/wrapper/gradle-wrapper.properties  |  6 +-
 examples/bridge_echo/Android/settings.gradle  | 13 +++-
 .../bridge_echo/Android/shared/build.gradle   | 55 +++++++-------
 .../shared/ExampleInstrumentedTest.kt         | 24 ++++++
 .../shared/src/main/AndroidManifest.xml       |  4 +
 .../bridge_echo/shared/ExampleUnitTest.kt     | 17 +++++
 .../Android/gradle/libs.versions.toml         | 12 +--
 .../counter/Android/gradle/libs.versions.toml | 12 +--
 .../Android/gradle/libs.versions.toml         |  2 +-
 30 files changed, 250 insertions(+), 228 deletions(-)
 delete mode 100644 examples/bridge_echo/Android/.idea/deploymentTargetDropDown.xml
 delete mode 100644 examples/bridge_echo/Android/.idea/inspectionProfiles/Project_Default.xml
 rename examples/bridge_echo/Android/app/src/main/res/{drawable-v24 => drawable}/ic_launcher_foreground.xml (100%)
 rename examples/bridge_echo/Android/app/src/main/res/{mipmap-anydpi-v26 => mipmap-anydpi}/ic_launcher.xml (79%)
 rename examples/bridge_echo/Android/app/src/main/res/{mipmap-anydpi-v26 => mipmap-anydpi}/ic_launcher_round.xml (79%)
 create mode 100644 examples/bridge_echo/Android/gradle/libs.versions.toml
 create mode 100644 examples/bridge_echo/Android/shared/src/androidTest/java/com/example/bridge_echo/shared/ExampleInstrumentedTest.kt
 create mode 100644 examples/bridge_echo/Android/shared/src/main/AndroidManifest.xml
 create mode 100644 examples/bridge_echo/Android/shared/src/test/java/com/example/bridge_echo/shared/ExampleUnitTest.kt

diff --git a/examples/bridge_echo/Android/.idea/.name b/examples/bridge_echo/Android/.idea/.name
index af7985d9d..933bdcd34 100644
--- a/examples/bridge_echo/Android/.idea/.name
+++ b/examples/bridge_echo/Android/.idea/.name
@@ -1 +1 @@
-BridgePerf
\ No newline at end of file
+BridgeEcho
\ No newline at end of file
diff --git a/examples/bridge_echo/Android/.idea/deploymentTargetDropDown.xml b/examples/bridge_echo/Android/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 0c0c33838..000000000
--- a/examples/bridge_echo/Android/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <value>
-      <entry key="app">
-        <State />
-      </entry>
-    </value>
-  </component>
-</project>
\ No newline at end of file
diff --git a/examples/bridge_echo/Android/.idea/gradle.xml b/examples/bridge_echo/Android/.idea/gradle.xml
index 8f1a221a0..e0af111c5 100644
--- a/examples/bridge_echo/Android/.idea/gradle.xml
+++ b/examples/bridge_echo/Android/.idea/gradle.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/examples/bridge_echo/Android/.idea/inspectionProfiles/Project_Default.xml b/examples/bridge_echo/Android/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 44ca2d9b0..000000000
--- a/examples/bridge_echo/Android/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-  </profile>
-</component>
\ No newline at end of file
diff --git a/examples/bridge_echo/Android/.idea/kotlinc.xml b/examples/bridge_echo/Android/.idea/kotlinc.xml
index f8467b458..6d0ee1c2a 100644
--- a/examples/bridge_echo/Android/.idea/kotlinc.xml
+++ b/examples/bridge_echo/Android/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.10" />
+    <option name="version" value="2.0.0" />
   </component>
 </project>
\ No newline at end of file
diff --git a/examples/bridge_echo/Android/.idea/misc.xml b/examples/bridge_echo/Android/.idea/misc.xml
index 2cdc89a70..74dd639e4 100644
--- a/examples/bridge_echo/Android/.idea/misc.xml
+++ b/examples/bridge_echo/Android/.idea/misc.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/examples/bridge_echo/Android/app/build.gradle b/examples/bridge_echo/Android/app/build.gradle
index c0a131c1a..30dc73ee9 100644
--- a/examples/bridge_echo/Android/app/build.gradle
+++ b/examples/bridge_echo/Android/app/build.gradle
@@ -1,6 +1,7 @@
 plugins {
-    id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.compose)
 }
 
 android {
@@ -9,73 +10,52 @@ android {
 
     defaultConfig {
         applicationId "com.example.bridge_echo"
-        minSdk 33
+        minSdk 34
         targetSdk 34
         versionCode 1
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary true
-        }
     }
 
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles {
-                getDefaultProguardFile('proguard-android-optimize.txt')
-                'proguard-rules.pro'
-            }
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_20
+        targetCompatibility JavaVersion.VERSION_20
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '20'
     }
     buildFeatures {
         compose true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.3"
-    }
-    packagingOptions {
-        resources {
-            excludes += '/META-INF/*'
-        }
-    }
 }
 
 dependencies {
-    // our com.example.bridge_perf.shared library
+    // our shared library
     implementation project(path: ':shared')
 
-    implementation platform('androidx.compose:compose-bom:2024.09.01')
-    androidTestImplementation platform('androidx.compose:compose-bom:2024.09.01')
-
-    implementation 'androidx.compose.material3:material3:1.3.0'
-
-    // Optional - Integration with ViewModels
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.5")
-    // Optional - Integration with LiveData
-    implementation("androidx.compose.runtime:runtime-livedata")
-
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
-
-    implementation 'androidx.core:core-ktx:1.13.1'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.5'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.5'
-    implementation 'androidx.activity:activity-compose:1.9.2'
-    implementation "androidx.compose.ui:ui:1.7.1"
-    implementation "androidx.compose.ui:ui-tooling-preview:1.7.1"
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.7.1"
-    debugImplementation "androidx.compose.ui:ui-tooling:1.7.1"
-    debugImplementation "androidx.compose.ui:ui-test-manifest:1.7.1"
-}
+    // added dependencies
+    implementation libs.lifecycle.viewmodel.compose
+
+    implementation libs.androidx.core.ktx
+    implementation libs.androidx.lifecycle.runtime.ktx
+    implementation libs.androidx.activity.compose
+    implementation platform(libs.androidx.compose.bom)
+    implementation libs.androidx.ui
+    implementation libs.androidx.ui.graphics
+    implementation libs.androidx.ui.tooling.preview
+    implementation libs.androidx.material3
+    testImplementation libs.junit
+    androidTestImplementation libs.androidx.junit
+    androidTestImplementation libs.androidx.espresso.core
+    androidTestImplementation platform(libs.androidx.compose.bom)
+    androidTestImplementation libs.androidx.ui.test.junit4
+    debugImplementation libs.androidx.ui.tooling
+    debugImplementation libs.androidx.ui.test.manifest
+}
\ No newline at end of file
diff --git a/examples/bridge_echo/Android/app/src/androidTest/java/com/example/bridge_echo/ExampleInstrumentedTest.kt b/examples/bridge_echo/Android/app/src/androidTest/java/com/example/bridge_echo/ExampleInstrumentedTest.kt
index 423aee0c0..2d5e17183 100644
--- a/examples/bridge_echo/Android/app/src/androidTest/java/com/example/bridge_echo/ExampleInstrumentedTest.kt
+++ b/examples/bridge_echo/Android/app/src/androidTest/java/com/example/bridge_echo/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.example.bridge_perf
+package com.example.bridge_echo
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.example.counter", appContext.packageName)
+        assertEquals("com.example.bridge_echo", appContext.packageName)
     }
 }
\ No newline at end of file
diff --git a/examples/bridge_echo/Android/app/src/main/AndroidManifest.xml b/examples/bridge_echo/Android/app/src/main/AndroidManifest.xml
index d5c9016a7..b50625d91 100644
--- a/examples/bridge_echo/Android/app/src/main/AndroidManifest.xml
+++ b/examples/bridge_echo/Android/app/src/main/AndroidManifest.xml
@@ -7,21 +7,18 @@
         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.Counter">
+        android:theme="@style/Theme.BridgeEcho">
         <activity
-            android:name="com.example.bridge_echo.MainActivity"
+            android:name=".MainActivity"
             android:exported="true"
-            android:theme="@style/Theme.Counter">
+            android:theme="@style/Theme.BridgeEcho" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-
-            <meta-data
-                android:name="android.app.lib_name"
-                android:value="" />
         </activity>
     </application>
 
diff --git a/examples/bridge_echo/Android/app/src/main/java/com/example/bridge_echo/MainActivity.kt b/examples/bridge_echo/Android/app/src/main/java/com/example/bridge_echo/MainActivity.kt
index b321fce6c..0a774ed27 100644
--- a/examples/bridge_echo/Android/app/src/main/java/com/example/bridge_echo/MainActivity.kt
+++ b/examples/bridge_echo/Android/app/src/main/java/com/example/bridge_echo/MainActivity.kt
@@ -3,6 +3,7 @@ package com.example.bridge_echo
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
@@ -19,45 +20,18 @@ import androidx.compose.ui.unit.sp
 import androidx.lifecycle.viewModelScope
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.example.bridge_echo.shared_types.Event
-import com.example.bridge_echo.ui.theme.CounterTheme
+import com.example.bridge_echo.ui.theme.BridgeEchoTheme
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-class MyCore : Core() {
-    init {
-        viewModelScope.launch {
-            clock()
-        }
-        viewModelScope.launch {
-            ticker()
-        }
-    }
-
-    private suspend fun ticker() {
-        withContext(Dispatchers.Default) {
-            while (true) {
-                update(Event.Tick())
-            }
-        }
-    }
-
-    private suspend fun clock() {
-        withContext(Dispatchers.Default) {
-            while (true) {
-                update(Event.NewPeriod())
-                delay(1000)
-            }
-        }
-    }
-}
-
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
         setContent {
-            CounterTheme {
+            BridgeEchoTheme {
                 Surface(
                     modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background
                 ) {
@@ -85,8 +59,36 @@ fun View(model: MyCore = viewModel()) {
 
 @Preview(showBackground = true)
 @Composable
-fun DefaultPreview() {
-    CounterTheme {
+fun GreetingPreview() {
+    BridgeEchoTheme {
         View()
     }
 }
+
+class MyCore : Core() {
+    init {
+        viewModelScope.launch {
+            clock()
+        }
+        viewModelScope.launch {
+            ticker()
+        }
+    }
+
+    private suspend fun ticker() {
+        withContext(Dispatchers.Default) {
+            while (true) {
+                update(Event.Tick())
+            }
+        }
+    }
+
+    private suspend fun clock() {
+        withContext(Dispatchers.Default) {
+            while (true) {
+                update(Event.NewPeriod())
+                delay(1000)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/bridge_echo/Android/app/src/main/java/com/example/bridge_echo/ui/theme/Theme.kt b/examples/bridge_echo/Android/app/src/main/java/com/example/bridge_echo/ui/theme/Theme.kt
index 8aa2811bc..64bb76ccf 100644
--- a/examples/bridge_echo/Android/app/src/main/java/com/example/bridge_echo/ui/theme/Theme.kt
+++ b/examples/bridge_echo/Android/app/src/main/java/com/example/bridge_echo/ui/theme/Theme.kt
@@ -9,11 +9,7 @@ import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.SideEffect
-import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalView
-import androidx.core.view.ViewCompat
 
 private val DarkColorScheme = darkColorScheme(
     primary = Purple80,
@@ -38,31 +34,24 @@ private val LightColorScheme = lightColorScheme(
 )
 
 @Composable
-fun CounterTheme(
+fun BridgeEchoTheme(
     darkTheme: Boolean = isSystemInDarkTheme(),
     // Dynamic color is available on Android 12+
     dynamicColor: Boolean = true,
     content: @Composable () -> Unit
 ) {
     val colorScheme = when {
-        dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
-            val context = LocalContext.current
-            if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
-        }
-        darkTheme -> DarkColorScheme
-        else -> LightColorScheme
-    }
-    val view = LocalView.current
-    if (!view.isInEditMode) {
-        SideEffect {
-            (view.context as Activity).window.statusBarColor = colorScheme.primary.toArgb()
-            ViewCompat.getWindowInsetsController(view)?.isAppearanceLightStatusBars = darkTheme
-        }
+      dynamicColor -> {
+        val context = LocalContext.current
+        if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
+      }
+      darkTheme -> DarkColorScheme
+      else -> LightColorScheme
     }
 
     MaterialTheme(
-        colorScheme = colorScheme,
-        typography = Typography,
-        content = content
+      colorScheme = colorScheme,
+      typography = Typography,
+      content = content
     )
 }
\ No newline at end of file
diff --git a/examples/bridge_echo/Android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/examples/bridge_echo/Android/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from examples/bridge_echo/Android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to examples/bridge_echo/Android/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/examples/bridge_echo/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/examples/bridge_echo/Android/app/src/main/res/mipmap-anydpi/ic_launcher.xml
similarity index 79%
rename from examples/bridge_echo/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to examples/bridge_echo/Android/app/src/main/res/mipmap-anydpi/ic_launcher.xml
index eca70cfe5..6f3b755bf 100644
--- a/examples/bridge_echo/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/examples/bridge_echo/Android/app/src/main/res/mipmap-anydpi/ic_launcher.xml
@@ -2,4 +2,5 @@
 <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>
\ No newline at end of file
diff --git a/examples/bridge_echo/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/examples/bridge_echo/Android/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
similarity index 79%
rename from examples/bridge_echo/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to examples/bridge_echo/Android/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
index eca70cfe5..6f3b755bf 100644
--- a/examples/bridge_echo/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/examples/bridge_echo/Android/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
@@ -2,4 +2,5 @@
 <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>
\ No newline at end of file
diff --git a/examples/bridge_echo/Android/app/src/main/res/values/colors.xml b/examples/bridge_echo/Android/app/src/main/res/values/colors.xml
index f8c6127d3..55344e519 100644
--- a/examples/bridge_echo/Android/app/src/main/res/values/colors.xml
+++ b/examples/bridge_echo/Android/app/src/main/res/values/colors.xml
@@ -1,10 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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>
\ No newline at end of file
diff --git a/examples/bridge_echo/Android/app/src/main/res/values/strings.xml b/examples/bridge_echo/Android/app/src/main/res/values/strings.xml
index 72ea9c316..29d50842d 100644
--- a/examples/bridge_echo/Android/app/src/main/res/values/strings.xml
+++ b/examples/bridge_echo/Android/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">Counter</string>
+    <string name="app_name">BridgeEcho</string>
 </resources>
\ No newline at end of file
diff --git a/examples/bridge_echo/Android/app/src/main/res/values/themes.xml b/examples/bridge_echo/Android/app/src/main/res/values/themes.xml
index 363df0b58..f21236218 100644
--- a/examples/bridge_echo/Android/app/src/main/res/values/themes.xml
+++ b/examples/bridge_echo/Android/app/src/main/res/values/themes.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <style name="Theme.Counter" parent="android:Theme.Material.Light.NoActionBar" />
+    <style name="Theme.BridgeEcho" parent="android:Theme.Material.Light.NoActionBar" />
 </resources>
\ No newline at end of file
diff --git a/examples/bridge_echo/Android/app/src/test/java/com/example/bridge_echo/ExampleUnitTest.kt b/examples/bridge_echo/Android/app/src/test/java/com/example/bridge_echo/ExampleUnitTest.kt
index ee398166f..a91b88a61 100644
--- a/examples/bridge_echo/Android/app/src/test/java/com/example/bridge_echo/ExampleUnitTest.kt
+++ b/examples/bridge_echo/Android/app/src/test/java/com/example/bridge_echo/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package com.example.bridge_perf
+package com.example.bridge_echo
 
 import org.junit.Test
 
diff --git a/examples/bridge_echo/Android/build.gradle b/examples/bridge_echo/Android/build.gradle
index 80715d666..4c16a274b 100644
--- a/examples/bridge_echo/Android/build.gradle
+++ b/examples/bridge_echo/Android/build.gradle
@@ -1,6 +1,8 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.5.2' apply false
-    id 'com.android.library' version '8.5.2' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.10' apply false
-    id "org.mozilla.rust-android-gradle.rust-android" version "0.9.4" apply false
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.kotlin.compose) apply false
+    alias(libs.plugins.rust.android) apply false
+    alias(libs.plugins.android.library) apply false
 }
\ No newline at end of file
diff --git a/examples/bridge_echo/Android/gradle.properties b/examples/bridge_echo/Android/gradle.properties
index f19c7b9b2..20e2a0152 100644
--- a/examples/bridge_echo/Android/gradle.properties
+++ b/examples/bridge_echo/Android/gradle.properties
@@ -8,8 +8,8 @@
 # The setting is particularly useful for tweaking memory settings.
 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
+# This option should only be used with decoupled projects. For more details, visit
+# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
 # org.gradle.parallel=true
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app's APK
@@ -20,5 +20,4 @@ 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
-android.nonFinalResIds=false
\ No newline at end of file
+android.nonTransitiveRClass=true
\ No newline at end of file
diff --git a/examples/bridge_echo/Android/gradle/libs.versions.toml b/examples/bridge_echo/Android/gradle/libs.versions.toml
new file mode 100644
index 000000000..d490dbd82
--- /dev/null
+++ b/examples/bridge_echo/Android/gradle/libs.versions.toml
@@ -0,0 +1,49 @@
+[versions]
+agp = "8.7.0"
+kotlin = "2.0.0"
+coreKtx = "1.13.1"
+junit = "4.13.2"
+junitVersion = "1.2.1"
+espressoCore = "3.6.1"
+lifecycleRuntimeKtx = "2.8.6"
+activityCompose = "1.9.2"
+composeBom = "2024.09.03"
+
+# added
+jna = "5.15.0"
+lifecycle = "2.8.6"
+appcompat = "1.7.0"
+material = "1.12.0"
+rustAndroid = "0.9.4"
+
+[libraries]
+androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+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-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
+androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
+androidx-ui = { group = "androidx.compose.ui", name = "ui" }
+androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
+androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
+androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
+androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
+androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
+androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
+
+# added
+jna = { module = "net.java.dev.jna:jna", version.ref = "jna" }
+lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+material = { group = "com.google.android.material", name = "material", version.ref = "material" }
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "agp" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+
+# added
+rust-android = { id = "org.mozilla.rust-android-gradle.rust-android", version.ref = "rustAndroid" }
+android-library = { id = "com.android.library", version.ref = "agp" }
+
diff --git a/examples/bridge_echo/Android/gradle/wrapper/gradle-wrapper.properties b/examples/bridge_echo/Android/gradle/wrapper/gradle-wrapper.properties
index 37fb935ed..69c97f8d7 100644
--- a/examples/bridge_echo/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/bridge_echo/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed May 24 10:42:32 BST 2023
+#Thu Oct 10 16:49:53 BST 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/examples/bridge_echo/Android/settings.gradle b/examples/bridge_echo/Android/settings.gradle
index 5515a7adf..3f80787f1 100644
--- a/examples/bridge_echo/Android/settings.gradle
+++ b/examples/bridge_echo/Android/settings.gradle
@@ -1,8 +1,14 @@
 pluginManagement {
     repositories {
-        gradlePluginPortal()
-        google()
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
         mavenCentral()
+        gradlePluginPortal()
     }
 }
 dependencyResolutionManagement {
@@ -12,6 +18,7 @@ dependencyResolutionManagement {
         mavenCentral()
     }
 }
-rootProject.name = "BridgePerf"
+
+rootProject.name = "BridgeEcho"
 include ':app'
 include ':shared'
diff --git a/examples/bridge_echo/Android/shared/build.gradle b/examples/bridge_echo/Android/shared/build.gradle
index 6a0d207dc..dbddc5c2a 100644
--- a/examples/bridge_echo/Android/shared/build.gradle
+++ b/examples/bridge_echo/Android/shared/build.gradle
@@ -1,19 +1,16 @@
 plugins {
-    id 'com.android.library'
-    id 'org.jetbrains.kotlin.android'
-    id 'org.mozilla.rust-android-gradle.rust-android'
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
 }
 
 android {
     namespace 'com.example.bridge_echo.shared'
     compileSdk 34
 
-    ndkVersion "27.0.12077973"
-
+    ndkVersion "27.1.12297006"
 
     defaultConfig {
-        minSdk 33
-        targetSdk 34
+        minSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -22,34 +19,36 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles {
-                getDefaultProguardFile('proguard-android-optimize.txt')
-                'proguard-rules.pro'
-            }
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_20
+        targetCompatibility JavaVersion.VERSION_20
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '20'
     }
-
     sourceSets {
         main.java.srcDirs += "${projectDir}/../../shared_types/generated/java"
     }
 }
 
 dependencies {
-    implementation 'net.java.dev.jna:jna:5.13.0@aar'
+    // added
+    implementation(libs.jna) {
+        artifact {
+            type = "aar"
+        }
+    }
 
-    implementation 'androidx.core:core-ktx:1.13.1'
-    implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'com.google.android.material:material:1.12.0'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+    // original
+    implementation libs.androidx.core.ktx
+    implementation libs.androidx.appcompat
+    implementation libs.material
+    testImplementation libs.junit
+    androidTestImplementation libs.androidx.junit
+    androidTestImplementation libs.androidx.espresso.core
 }
 
 apply plugin: 'org.mozilla.rust-android-gradle.rust-android'
@@ -57,8 +56,14 @@ apply plugin: 'org.mozilla.rust-android-gradle.rust-android'
 cargo {
     module = "../.."
     libname = "shared"
-    targets = ["arm64"]
+    // these are the four recommended targets for Android that will ensure your library works on all mainline android devices
+    // make sure you have included the rust toolchain for each of these targets: \
+    // `rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android`
+    targets = ["arm", "arm64", "x86", "x86_64"]
     extraCargoBuildArguments = ['--package', 'shared']
+    cargoCommand = System.getProperty("user.home") + "/.cargo/bin/cargo"
+    rustcCommand = System.getProperty("user.home") + "/.cargo/bin/rustc"
+    pythonCommand = "python3"
 }
 
 afterEvaluate {
@@ -69,17 +74,14 @@ afterEvaluate {
             productFlavor += "${it.name.capitalize()}"
         }
         def buildType = "${variant.buildType.name.capitalize()}"
-
         tasks.named("compileDebugKotlin") {
             it.dependsOn(tasks.named("typesGen"), tasks.named("bindGen"))
         }
-
         tasks.named("generate${productFlavor}${buildType}Assets") {
             it.dependsOn(tasks.named("cargoBuild"))
         }
     }
 }
-
 tasks.register('bindGen', Exec) {
     def outDir = "${projectDir}/../../shared_types/generated/java"
     workingDir "../../"
@@ -96,7 +98,6 @@ tasks.register('bindGen', Exec) {
                 """)
     }
 }
-
 tasks.register('typesGen', Exec) {
     workingDir "../../"
     if (System.getProperty('os.name').toLowerCase().contains('windows')) {
diff --git a/examples/bridge_echo/Android/shared/src/androidTest/java/com/example/bridge_echo/shared/ExampleInstrumentedTest.kt b/examples/bridge_echo/Android/shared/src/androidTest/java/com/example/bridge_echo/shared/ExampleInstrumentedTest.kt
new file mode 100644
index 000000000..2df570a8e
--- /dev/null
+++ b/examples/bridge_echo/Android/shared/src/androidTest/java/com/example/bridge_echo/shared/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.example.bridge_echo.shared
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.example.bridge_echo.shared.test", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/examples/bridge_echo/Android/shared/src/main/AndroidManifest.xml b/examples/bridge_echo/Android/shared/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..a5918e68a
--- /dev/null
+++ b/examples/bridge_echo/Android/shared/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
\ No newline at end of file
diff --git a/examples/bridge_echo/Android/shared/src/test/java/com/example/bridge_echo/shared/ExampleUnitTest.kt b/examples/bridge_echo/Android/shared/src/test/java/com/example/bridge_echo/shared/ExampleUnitTest.kt
new file mode 100644
index 000000000..dbcad59d0
--- /dev/null
+++ b/examples/bridge_echo/Android/shared/src/test/java/com/example/bridge_echo/shared/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package com.example.bridge_echo.shared
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
\ No newline at end of file
diff --git a/examples/cat_facts/Android/gradle/libs.versions.toml b/examples/cat_facts/Android/gradle/libs.versions.toml
index 780468426..841a87f21 100644
--- a/examples/cat_facts/Android/gradle/libs.versions.toml
+++ b/examples/cat_facts/Android/gradle/libs.versions.toml
@@ -8,14 +8,14 @@ espressoCore = "3.6.1"
 lifecycleRuntimeKtx = "2.8.6"
 activityCompose = "1.9.2"
 composeBom = "2024.09.03"
-appcompat = "1.7.0"
-material = "1.12.0"
 
 # added
 jna = "5.15.0"
 lifecycle = "2.8.6"
 rustAndroid = "0.9.4"
 ktorClient = "2.2.2"
+appcompat = "1.7.0"
+material = "1.12.0"
 materialIconsExtended = "1.7.3"
 coilCompose = "2.0.0-rc01"
 
@@ -34,13 +34,13 @@ androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-toolin
 androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
 androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
 androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
-androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
-material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 
 # added
 jna = { module = "net.java.dev.jna:jna", version.ref = "jna" }
 lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }
 ktor-client = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktorClient" }
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "materialIconsExtended" }
 coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coilCompose" }
 
@@ -48,5 +48,7 @@ coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coi
 android-application = { id = "com.android.application", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
-android-library = { id = "com.android.library", version.ref = "agp" }
+
+# added
 rust-android = { id = "org.mozilla.rust-android-gradle.rust-android", version.ref = "rustAndroid" }
+android-library = { id = "com.android.library", version.ref = "agp" }
diff --git a/examples/counter/Android/gradle/libs.versions.toml b/examples/counter/Android/gradle/libs.versions.toml
index 142bbb8ac..8c1521d50 100644
--- a/examples/counter/Android/gradle/libs.versions.toml
+++ b/examples/counter/Android/gradle/libs.versions.toml
@@ -8,13 +8,13 @@ espressoCore = "3.6.1"
 lifecycleRuntimeKtx = "2.8.6"
 activityCompose = "1.9.2"
 composeBom = "2024.09.03"
-appcompat = "1.7.0"
-material = "1.12.0"
 
 # added
 jna = "5.15.0"
 lifecycle = "2.8.6"
 rustAndroid = "0.9.4"
+appcompat = "1.7.0"
+material = "1.12.0"
 ktorClient = "2.2.2"
 
 [libraries]
@@ -32,11 +32,11 @@ androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-toolin
 androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
 androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
 androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
-androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
-material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 
 # added
 jna = { module = "net.java.dev.jna:jna", version.ref = "jna" }
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }
 ktor-client = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktorClient" }
 
@@ -44,5 +44,7 @@ ktor-client = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktor
 android-application = { id = "com.android.application", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
-android-library = { id = "com.android.library", version.ref = "agp" }
+
+# added
 rust-android = { id = "org.mozilla.rust-android-gradle.rust-android", version.ref = "rustAndroid" }
+android-library = { id = "com.android.library", version.ref = "agp" }
diff --git a/examples/simple_counter/Android/gradle/libs.versions.toml b/examples/simple_counter/Android/gradle/libs.versions.toml
index c43a02326..00ea9907c 100644
--- a/examples/simple_counter/Android/gradle/libs.versions.toml
+++ b/examples/simple_counter/Android/gradle/libs.versions.toml
@@ -12,9 +12,9 @@ composeBom = "2024.09.03"
 # added
 jna = "5.15.0"
 lifecycle = "2.8.6"
-rustAndroid = "0.9.4"
 appcompat = "1.7.0"
 material = "1.12.0"
+rustAndroid = "0.9.4"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }

From f342b4e8d5ade72079af94f6e2ae4d2acda97acb Mon Sep 17 00:00:00 2001
From: Stuart Harris <stuart.harris@red-badger.com>
Date: Fri, 11 Oct 2024 12:46:35 +0100
Subject: [PATCH 6/6] docs

---
 docs/src/getting_started/Android/android.md | 25 ++++++++++++---------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/docs/src/getting_started/Android/android.md b/docs/src/getting_started/Android/android.md
index 9b7a7b454..06d6696c4 100644
--- a/docs/src/getting_started/Android/android.md
+++ b/docs/src/getting_started/Android/android.md
@@ -16,9 +16,9 @@ We want to make setting up Android Studio to work with Crux really easy. As time
 The first thing we need to do is create a new Android app in Android Studio.
 
 Open Android Studio and create a new project, for "Phone and Tablet", of type
-"Empty Activity". In this walk-through, we'll call it "Counter"
+"Empty Activity". In this walk-through, we'll call it "SimpleCounter"
 
-- "Name": `Counter`
+- "Name": `SimpleCounter`
 - "Package name": `com.example.simple_counter`
 - "Save Location": a directory called `Android` at the root of our monorepo
 - "Minimum SDK" `API 34`
@@ -71,7 +71,7 @@ Under `File -> New -> New Module`, choose "Android Library" and give it the "Mod
 `shared`. Set the "Package name" to match the one from your
 `/shared/uniffi.toml`, which in this example is `com.example.simple_counter.shared`.
 
-Again set the "Build configuration language" to `Groovy DSL (build.gradle)`.
+Again, set the "Build configuration language" to `Groovy DSL (build.gradle)`.
 
 For more information on how to add an Android library see
 <https://developer.android.com/studio/projects/android-library>.
@@ -85,6 +85,17 @@ this:
 {{#include ../../../../examples/simple_counter/Android/app/build.gradle}}
 ```
 
+````admonish
+In our gradle files, we are referencing a "Version Catalog" to manage our dependency versions, so you
+will need to ensure this is kept up to date.
+
+Our catalog (`Android/gradle/libs.versions.toml`) will end up looking like this:
+
+```toml
+{{#include ../../../../examples/simple_counter/Android/gradle/libs.versions.toml}}
+```
+````
+
 ## The Rust shared library
 
 We'll use the following tools to incorporate our Rust shared library into the
@@ -115,12 +126,6 @@ this:
 {{#include ../../../../examples/simple_counter/Android/build.gradle}}
 ```
 
-```admonish
-The code fence above uses AGP version `8.3.2`.
-
-Currently there is an incompatibiliity between the latest version (`8.4.0`) of the Android Gradle Plugin (AGP) and the Rust Gradle Plugin, which fails with a `duplicate resources` issue when building your shared library for multiple targets. For now, either just target one architecture or stick with AGP version `8.3.2` until this is resolved.
-```
-
 Edit the **library**'s `build.gradle` (`/Android/shared/build.gradle`) to look
 like this:
 
@@ -163,7 +168,7 @@ $ ls --tree shared_types/generated/java
 shared_types/generated/java
 └── com
    ├── example
-   │  └── counter
+   │  └── simple_counter
    │     ├── shared
    │     │  └── shared.kt
    │     └── shared_types