Update sgp to v0.9.16

app/src/main/kotlin/io/sweers/catchup/home/HomeScreen.kt

@@ -4,15 +4,13 @@ import android.content.res.Configuration
 import androidx.compose.animation.Animatable
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.gestures.Orientation
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.pager.HorizontalPager
-import androidx.compose.foundation.pager.PagerDefaults
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Settings
@@ -321,9 +319,6 @@ fun Home(state: HomeScreen.State, modifier: Modifier = Modifier) {
         key = { state.serviceMetas[it].id },
         state = pagerState,
         verticalAlignment = Alignment.Top,
-        // Explicitly defined to cover for https://issuetracker.google.com/issues/264729364
-        pageNestedScrollConnection =
-          PagerDefaults.pageNestedScrollConnection(Orientation.Horizontal)
       ) { page ->
         CircuitContent(
           screen = ServiceScreen(state.serviceMetas[page].id),

app/src/main/kotlin/io/sweers/catchup/ui/about/AboutScreen.kt

@@ -1,12 +1,10 @@
 package io.sweers.catchup.ui.about
 
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.gestures.Orientation
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.pager.HorizontalPager
-import androidx.compose.foundation.pager.PagerDefaults
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Scaffold
@@ -85,9 +83,6 @@ fun About(state: AboutScreen.State, modifier: Modifier = Modifier) {
         key = { it },
         state = pagerState,
         verticalAlignment = Alignment.Top,
-        // Explicitly defined to cover for https://issuetracker.google.com/issues/264729364
-        pageNestedScrollConnection =
-          PagerDefaults.pageNestedScrollConnection(Orientation.Horizontal)
       ) { page ->
         CircuitContent(SCREENS[page])
       }

app/src/main/kotlin/io/sweers/catchup/ui/activity/OrderServicesScreen.kt

@@ -271,10 +271,11 @@ fun OrderServices(state: OrderServicesScreen.State, modifier: Modifier = Modifie
         exit = scaleOut(),
       ) {
         val scope = rememberCoroutineScope()
+        val interactionSource = remember { MutableInteractionSource() }
         FloatingActionButton(
           modifier =
             Modifier.indication(
-              MutableInteractionSource(),
+              interactionSource,
               indication = rememberRipple(color = Color.White)
             ),
           // TODO show syllabus on fab

gradle.properties

@@ -69,6 +69,10 @@ slack.allow-ksp=true
 slack.allow-moshi-ir=true
 slack.auto-apply.detekt=false
 slack.log-thermals=true
+
+# Use Zulu for auto-configured JDK downloads.
+sgp.config.jvmVendor=AZUL
+
 # Disable noisy logging about mismatched KSP and Kotlin versions
 ksp.version.check=false
 
@@ -87,4 +91,7 @@ catchup.mavenUrls.snapshots.sonatypes01=https://s01.oss.sonatype.org/content/rep
 catchup.mavenUrls.snapshots.androidx=https://androidx.dev/snapshots/latest/artifacts/repository
 catchup.mavenUrls.kotlinDev=https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/
 
-android.disableResourceValidation=true
+android.disableResourceValidation=true
+
+# SGP: https://github.com/slackhq/slack-gradle-plugin
+#systemProp.slack.include-build.sgp=/path/to/slack-gradle-plugin

gradle/libs.versions.toml

@@ -12,11 +12,11 @@ autodispose = "2.1.1"
 chuck = "1.1.0"
 circuit = "0.10.0"
 coil = "2.4.0"
-compose = "1.5.0-beta03"
+compose = "1.6.0-alpha01"
 # Pre-release versions for testing Kotlin previews can be found here
 # https://androidx.dev/storage/compose-compiler/repository
-compose-compiler = "1.4.7-dev-k1.9.0-Beta-bb7dc8b44eb"
-compose-compiler-kotlinVersion = "1.9.0-Beta"
+compose-compiler = "1.4.8-dev-k1.9.0-RC-5532d15c918"
+compose-compiler-kotlinVersion = "1.9.0-RC"
 corbind = "1.8.0"
 coroutines = "1.7.2"
 crumb = "0.1.0"
@@ -43,7 +43,7 @@ preferences = "1.2.0"
 retrofit = "2.9.0"
 room = "2.6.0-alpha02"
 sortDependencies = "0.3"
-sgp = "0.9.14-1.9.0-RC"
+sgp = "0.9.16-1.9.0-RC"
 spotless = "6.19.0"
 sqldelight = "2.0.0-rc02"
 telephoto = "1.0.0-alpha02"

settings.gradle.kts

@@ -243,6 +243,21 @@ gradleEnterprise {
 
 rootProject.name = "CatchUp"
 
+inline fun configureIncludedBuild(key: String, body: (path: String) -> Unit) {
+  System.getProperty("slack.include-build.$key")?.let(body)
+}
+
+// See comments on systemProp.slack.include-build.sgp property in gradle.properties
+configureIncludedBuild("sgp") { path ->
+  includeBuild(path) {
+    dependencySubstitution {
+      substitute(module("com.slack.gradle:sgp")).using(project(":slack-plugin"))
+      substitute(module("com.slack.gradle:sgp-agp-handler-api"))
+        .using(project(":agp-handlers:agp-handler-api"))
+    }
+  }
+}
+
 include(":platform")
 
 // https://docs.gradle.org/5.6/userguide/groovy_plugin.html#sec:groovy_compilation_avoidance