From 2310299365a52ae1786971e2d6601a0197731ec2 Mon Sep 17 00:00:00 2001
From: Yuri Schimke <yuri@schimke.ee>
Date: Fri, 6 Oct 2023 17:48:08 +0100
Subject: [PATCH 1/4] Bump to Kotlin 1.9.0

---
 gradle/libs.versions.toml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d48ac86de9..cdd195a7d9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -30,8 +30,8 @@ app-cash-turbine = "1.0.0"
 benManes = "0.48.0"
 com-squareup-okhttp3 = "4.11.0"
 com-squareup-retrofit2 = "2.9.0"
-compose = "1.5.3"
-compose-compiler = "1.4.8"
+compose = "1.6.0-alpha07"
+compose-compiler = "1.5.3"
 composesnapshot = "-"
 dependencyAnalysis = "1.20.0"
 dokka = "1.9.0"
@@ -41,9 +41,9 @@ gradlePlugin = "8.1.2"
 gradlePublishPlugin = "0.25.3"
 io-coil-kt = "2.4.0"
 junit = "4.13.2"
-kotlin = "1.8.22"
+kotlin = "1.9.10"
 kotlinxCoroutine = "1.7.3"
-ksp = "1.8.22-1.0.11"
+ksp = "1.9.10-1.0.13"
 ktlint = "0.50.0"
 metalava = "0.3.3"
 moshi = "1.15.0"
@@ -55,8 +55,6 @@ room = "2.5.2"
 runtimeTracing = "1.0.0-alpha04"
 snapshot-android = "1.0.4"
 spotless = "6.22.0"
-tracingPerfetto = "1.0"
-tracingPerfettoBinary = "1.0"
 truth = "1.1.5"
 versionCatalogUpdate = "0.8.1"
 wearcompose = "1.3.0-alpha07"

From fed4d2d93e00fc8ec86ffe3f88923b0bea1b33e1 Mon Sep 17 00:00:00 2001
From: Yuri Schimke <yuri@schimke.ee>
Date: Fri, 6 Oct 2023 17:49:04 +0100
Subject: [PATCH 2/4] Bump to Kotlin 1.9.0

---
 .idea/kotlinc.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 5892dfeff5..9c5cf782bc 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -4,6 +4,6 @@
     <option name="jvmTarget" value="1.8" />
   </component>
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.8.22" />
+    <option name="version" value="1.9.10" />
   </component>
 </project>
\ No newline at end of file

From daed5f5d3760b45e85fb81a514bdd3362a6a3746 Mon Sep 17 00:00:00 2001
From: Yuri Schimke <yuri@schimke.ee>
Date: Mon, 9 Oct 2023 09:21:04 +0100
Subject: [PATCH 3/4] Fixes

---
 auth/sample/wear/build.gradle.kts             |  9 -------
 build.gradle.kts                              | 17 ------------
 datalayer/core/build.gradle.kts               |  2 +-
 .../data/apphelper/DataLayerAppHelper.kt      | 27 +++++++++----------
 gradle/libs.versions.toml                     |  4 ---
 media/sample/build.gradle.kts                 |  9 -------
 sample/build.gradle.kts                       |  9 -------
 7 files changed, 14 insertions(+), 63 deletions(-)

diff --git a/auth/sample/wear/build.gradle.kts b/auth/sample/wear/build.gradle.kts
index 73d529f3b0..9d9fa6ab92 100644
--- a/auth/sample/wear/build.gradle.kts
+++ b/auth/sample/wear/build.gradle.kts
@@ -137,15 +137,6 @@ dependencies {
     testImplementation(libs.junit)
     testImplementation(libs.truth)
     testImplementation(libs.robolectric)
-
-    constraints {
-        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10") {
-            because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
-        }
-        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10") {
-            because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
-        }
-    }
 }
 
 secrets {
diff --git a/build.gradle.kts b/build.gradle.kts
index 9e765b48de..101781d310 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -45,8 +45,6 @@ buildscript {
 plugins {
     alias(libs.plugins.spotless)
     alias(libs.plugins.kotlinGradle) apply false
-    alias(libs.plugins.benManes)
-    alias(libs.plugins.versionCatalogUpdate)
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.protobuf) apply false
     alias(libs.plugins.gradleMavenPublishPlugin)
@@ -295,19 +293,4 @@ subprojects {
             }
         }
     }
-}
-
-tasks.withType<com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask> {
-    rejectVersionIf {
-        (candidate.version.matches(".*-alpha.*".toRegex()) && !(currentVersion.matches(".*-alpha.*".toRegex()))) ||
-            (candidate.version.matches(".*-beta.*".toRegex()) && !(currentVersion.matches(".*-(beta|alpha).*".toRegex())))
-    }
-}
-
-apply(plugin = "nl.littlerobots.version-catalog-update")
-
-versionCatalogUpdate {
-    keep {
-        keepUnusedVersions.set(true)
-    }
 }
\ No newline at end of file
diff --git a/datalayer/core/build.gradle.kts b/datalayer/core/build.gradle.kts
index 00d11f676d..be7f652cad 100644
--- a/datalayer/core/build.gradle.kts
+++ b/datalayer/core/build.gradle.kts
@@ -116,7 +116,7 @@ dependencies {
     api(libs.androidx.datastore)
     api(libs.protobuf.kotlin.lite)
     implementation(libs.androidx.lifecycle.runtime)
-    implementation(libs.androidx.wear.remote.interactions)
+    api(libs.androidx.wear.remote.interactions)
     implementation(libs.androidx.lifecycle.service)
 
     testImplementation(libs.junit)
diff --git a/datalayer/core/src/main/java/com/google/android/horologist/data/apphelper/DataLayerAppHelper.kt b/datalayer/core/src/main/java/com/google/android/horologist/data/apphelper/DataLayerAppHelper.kt
index ff9a1a0318..01aecca46c 100644
--- a/datalayer/core/src/main/java/com/google/android/horologist/data/apphelper/DataLayerAppHelper.kt
+++ b/datalayer/core/src/main/java/com/google/android/horologist/data/apphelper/DataLayerAppHelper.kt
@@ -55,11 +55,12 @@ abstract class DataLayerAppHelper(
     protected val context: Context,
     protected val registry: WearDataLayerRegistry,
 ) {
-    private val installedDeviceCapabilityUri = "wear://*/$CAPABILITY_DEVICE_PREFIX"
-    private val activityManager by lazy { context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager }
+    private val installedDeviceCapabilityUri: String = "wear://*/$CAPABILITY_DEVICE_PREFIX"
 
-    protected val playStoreUri = "market://details?id=${context.packageName}"
-    protected val remoteActivityHelper by lazy { RemoteActivityHelper(context) }
+    private val activityManager: ActivityManager by lazy { context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager }
+
+    protected val playStoreUri: String = "market://details?id=${context.packageName}"
+    protected val remoteActivityHelper: RemoteActivityHelper by lazy { RemoteActivityHelper(context) }
 
     /**
      * Provides a list of connected nodes and the installation status of the app on these nodes.
@@ -102,20 +103,18 @@ abstract class DataLayerAppHelper(
     public val connectedAndInstalledNodes = callbackFlow<Set<Node>> {
         val listener: CapabilityClient.OnCapabilityChangedListener =
             CapabilityClient.OnCapabilityChangedListener { capability ->
-                @Suppress("UNUSED_VARIABLE")
-                val unused =
+                @Suppress("UNUSED_VARIABLE") val unused =
                     trySend(capability.nodes.filter { it.isNearby }.toSet())
             }
 
-        val allCaps =
-            registry.capabilityClient.getAllCapabilities(
-                CapabilityClient.FILTER_REACHABLE,
-            ).await()
-        val installedCaps = allCaps.filter { it.key.startsWith(CAPABILITY_DEVICE_PREFIX) }
-            .values.flatMap { it.nodes }.filter { it.isNearby }.toSet()
+        val allCaps = registry.capabilityClient.getAllCapabilities(
+            CapabilityClient.FILTER_REACHABLE,
+        ).await()
+        val installedCaps =
+            allCaps.filter { it.key.startsWith(CAPABILITY_DEVICE_PREFIX) }.values.flatMap { it.nodes }
+                .filter { it.isNearby }.toSet()
 
-        @Suppress("UNUSED_VARIABLE")
-        val unused = trySend(installedCaps)
+        @Suppress("UNUSED_VARIABLE") val unused = trySend(installedCaps)
         registry.capabilityClient.addListener(
             listener,
             Uri.parse(installedDeviceCapabilityUri),
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index cdd195a7d9..2c96aa4a28 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -27,7 +27,6 @@ androidxprotolayout = "1.0.0"
 androidxtiles = "1.2.0"
 annotation = "1.0.1"
 app-cash-turbine = "1.0.0"
-benManes = "0.48.0"
 com-squareup-okhttp3 = "4.11.0"
 com-squareup-retrofit2 = "2.9.0"
 compose = "1.6.0-alpha07"
@@ -56,7 +55,6 @@ runtimeTracing = "1.0.0-alpha04"
 snapshot-android = "1.0.4"
 spotless = "6.22.0"
 truth = "1.1.5"
-versionCatalogUpdate = "0.8.1"
 wearcompose = "1.3.0-alpha07"
 wearToolingPreview = "1.0.0-alpha01"
 
@@ -200,7 +198,6 @@ wearcompose-navigation = { module = "androidx.wear.compose:compose-navigation",
 wearcompose-tooling = { module = "androidx.wear.compose:compose-ui-tooling", version.ref = "wearcompose" }
 
 [plugins]
-benManes = { id = "com.github.ben-manes.versions", version.ref = "benManes" }
 dependencyAnalysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyAnalysis" }
 gradleMavenPublishPlugin = { id = "com.vanniktech.maven.publish", version.ref = "gradlePublishPlugin" }
 kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
@@ -208,4 +205,3 @@ kotlinGradle = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 protobuf = "com.google.protobuf:0.9.4"
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
-versionCatalogUpdate = { id = "nl.littlerobots.version-catalog-update", version.ref = "versionCatalogUpdate" }
diff --git a/media/sample/build.gradle.kts b/media/sample/build.gradle.kts
index 31037e6987..029ceddbae 100644
--- a/media/sample/build.gradle.kts
+++ b/media/sample/build.gradle.kts
@@ -272,15 +272,6 @@ dependencies {
     androidTestImplementation(libs.androidx.complications.rendering)
     androidTestImplementation(libs.dagger.hiltandroidtesting)
     kspAndroidTest(libs.dagger.hiltandroidcompiler)
-
-    constraints {
-        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10") {
-            because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
-        }
-        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10") {
-            because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
-        }
-    }
 }
 
 val device: String? = localProperties.getProperty("DEVICE")
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
index f572a919bf..00db32b75d 100644
--- a/sample/build.gradle.kts
+++ b/sample/build.gradle.kts
@@ -199,15 +199,6 @@ dependencies {
     androidTestImplementation(libs.junit)
     androidTestImplementation(libs.androidx.test.ext)
     androidTestImplementation(libs.androidx.test.ext.ktx)
-
-    constraints {
-        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") {
-            because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
-        }
-        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") {
-            because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
-        }
-    }
 }
 
 tasks.maybeCreate("prepareKotlinIdeaImport")

From 9a3bf1cd968e0d7dd04bb87f91719a15302380c5 Mon Sep 17 00:00:00 2001
From: Yuri Schimke <yuri@schimke.ee>
Date: Mon, 9 Oct 2023 11:16:28 +0100
Subject: [PATCH 4/4] Fixes

---
 .../android/horologist/data/apphelper/DataLayerAppHelper.kt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/datalayer/core/src/main/java/com/google/android/horologist/data/apphelper/DataLayerAppHelper.kt b/datalayer/core/src/main/java/com/google/android/horologist/data/apphelper/DataLayerAppHelper.kt
index 01aecca46c..119639682f 100644
--- a/datalayer/core/src/main/java/com/google/android/horologist/data/apphelper/DataLayerAppHelper.kt
+++ b/datalayer/core/src/main/java/com/google/android/horologist/data/apphelper/DataLayerAppHelper.kt
@@ -103,7 +103,8 @@ abstract class DataLayerAppHelper(
     public val connectedAndInstalledNodes = callbackFlow<Set<Node>> {
         val listener: CapabilityClient.OnCapabilityChangedListener =
             CapabilityClient.OnCapabilityChangedListener { capability ->
-                @Suppress("UNUSED_VARIABLE") val unused =
+                @Suppress("UNUSED_VARIABLE")
+                val unused =
                     trySend(capability.nodes.filter { it.isNearby }.toSet())
             }
 
@@ -114,7 +115,8 @@ abstract class DataLayerAppHelper(
             allCaps.filter { it.key.startsWith(CAPABILITY_DEVICE_PREFIX) }.values.flatMap { it.nodes }
                 .filter { it.isNearby }.toSet()
 
-        @Suppress("UNUSED_VARIABLE") val unused = trySend(installedCaps)
+        @Suppress("UNUSED_VARIABLE")
+        val unused = trySend(installedCaps)
         registry.capabilityClient.addListener(
             listener,
             Uri.parse(installedDeviceCapabilityUri),