Merge branch 'main' into unused-code-cleanup

Author: asolovay

.github/workflows/build-ios.yml

@@ -0,0 +1,51 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+name: Build snippets
+
+on:
+  push:
+    branches: [ '*' ]
+    paths:
+      - 'kmp/**'
+      - '.github/workflows/build-ios.yml'
+  pull_request:
+    branches: [ '*' ]
+    paths:
+      - 'kmp/**'
+      - '.github/workflows/build-ios.yml'
+  workflow_dispatch:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-build-ios
+  cancel-in-progress: true
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  build_ios:
+    name: Build iOS app
+    runs-on: macos-latest
+    steps:
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: latest-stable
+
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - name: Build iOS app
+        uses: mxcl/xcodebuild@v3
+        with:
+          xcode: ^16
+          scheme: iosApp
+          platform: iOS
+          action: build
+          working-directory: kmp/iosApp

.gitignore

@@ -11,3 +11,17 @@ build
 .externalNativeBuild
 .idea/*
 /.idea/*
+.kotlin
+
+### Xcode ###
+## User settings
+xcuserdata/
+
+### Xcode Patch ###
+*.xcodeproj/*
+!*.xcodeproj/project.pbxproj
+!*.xcodeproj/xcshareddata/
+!*.xcodeproj/project.xcworkspace/
+!*.xcworkspace/contents.xcworkspacedata
+/*.gcno
+**/xcshareddata/WorkspaceSettings.xcsettings

build.gradle.kts

@@ -10,6 +10,9 @@ plugins {
     alias(libs.plugins.kotlin.parcelize) apply false
     alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.kotlin.serialization) apply false
+    alias(libs.plugins.kotlin.multiplatform) apply false
+    alias(libs.plugins.android.kotlin.multiplatform.library) apply false
+    alias(libs.plugins.android.lint) apply false
 }
 
 apply("${project.rootDir}/buildscripts/toml-updater-config.gradle")

compose/snippets/src/main/java/com/example/compose/snippets/interop/InteroperabilityAPIsSnippets.kt

@@ -32,6 +32,7 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material3.Button
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -191,6 +192,28 @@ class ExampleFragmentMultipleComposeView : Fragment() {
 }
 // [END android_compose_interop_apis_compose_in_fragment_multiple]
 
+// [START android_compose_interop_apis_android_view_reuse]
+@Composable
+fun AndroidViewInLazyList() {
+    LazyColumn {
+        items(100) { index ->
+            AndroidView(
+                modifier = Modifier.fillMaxSize(), // Occupy the max size in the Compose UI tree
+                factory = { context ->
+                    MyView(context)
+                },
+                update = { view ->
+                    view.selectedItem = index
+                },
+                onReset = { view ->
+                    view.clear()
+                }
+            )
+        }
+    }
+}
+// [END android_compose_interop_apis_android_view_reuse]
+
 // [START android_compose_interop_apis_views_in_compose]
 @Composable
 fun CustomView() {
@@ -231,6 +254,8 @@ fun ContentExample() {
 // [START_EXCLUDE silent]
 class MyView(context: Context) : View(context) {
     var selectedItem: Int = 0
+
+    fun clear() { }
 }
 // [END_EXCLUDE silent]
 // [END android_compose_interop_apis_views_in_compose]

compose/snippets/src/main/java/com/example/compose/snippets/modifiers/CustomModifierSnippets.kt

@@ -142,6 +142,7 @@ private class CircleNode(var color: Color) : DrawModifierNode, Modifier.Node() {
 }
 // [END android_compose_custom_modifiers_7]
 
+// TODO: Create a new snippet that overrides InspectorInfo.inspectableProperties.
 // [START android_compose_custom_modifiers_8]
 // ModifierNodeElement
 private data class CircleElement(val color: Color) : ModifierNodeElement<CircleNode>() {
@@ -159,6 +160,7 @@ fun Modifier.circle(color: Color) = this then CircleElement(color)
 // [END android_compose_custom_modifiers_9]
 
 private object CustomModifierSnippets10 {
+    // TODO: Create a new snippet that overrides InspectorInfo.inspectableProperties.
     // [START android_compose_custom_modifiers_10]
     // Modifier factory
     fun Modifier.circle(color: Color) = this then CircleElement(color)
@@ -181,6 +183,7 @@ private object CustomModifierSnippets10 {
     // [END android_compose_custom_modifiers_10]
 }
 
+// TODO: Create a new snippet that overrides InspectorInfo.inspectableProperties.
 // [START android_compose_custom_modifiers_11]
 fun Modifier.fixedPadding() = this then FixedPaddingElement
 

compose/snippets/src/main/java/com/example/compose/snippets/pictureinpicture/PictureInPictureSnippets.kt

@@ -356,7 +356,7 @@ fun PipListenerPreAPI12(shouldEnterPipMode: Boolean) {
     ) {
         val context = LocalContext.current
         DisposableEffect(context) {
-            val onUserLeaveBehavior: () -> Unit = {
+            val onUserLeaveBehavior = Runnable {
                 context.findActivity()
                     .enterPictureInPictureMode(PictureInPictureParams.Builder().build())
             }
@@ -384,7 +384,7 @@ fun EnterPiPPre12(shouldEnterPipMode: Boolean) {
     ) {
         val context = LocalContext.current
         DisposableEffect(context) {
-            val onUserLeaveBehavior: () -> Unit = {
+            val onUserLeaveBehavior = Runnable {
                 if (currentShouldEnterPipMode) {
                     context.findActivity()
                         .enterPictureInPictureMode(PictureInPictureParams.Builder().build())

gradle/libs.versions.toml

@@ -130,6 +130,7 @@ androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-kt
 androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle-runtime-compose" }
 androidx-lifecycle-service = { module = "androidx.lifecycle:lifecycle-service", version.ref = "lifecycleService" }
 androidx-lifecycle-viewModelCompose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle-compose" }
+androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref = "androidx-lifecycle-compose" }
 androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-compose" }
 androidx-material-icons-core = { module = "androidx.compose.material:material-icons-core" }
 androidx-media3-common = { module = "androidx.media3:media3-common", version.ref = "media3" }
@@ -179,7 +180,7 @@ horologist-compose-layout = { module = "com.google.android.horologist:horologist
 horologist-compose-material = { module = "com.google.android.horologist:horologist-compose-material", version.ref = "horologist" }
 junit = { module = "junit:junit", version.ref = "junit" }
 kotlin-coroutines-okhttp = { module = "ru.gildor.coroutines:kotlin-coroutines-okhttp", version.ref = "kotlinCoroutinesOkhttp" }
-kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
+kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
 kotlinx-coroutines-guava = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-guava", version.ref = "kotlinxCoroutinesGuava" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
@@ -189,6 +190,8 @@ play-services-wearable = { module = "com.google.android.gms:play-services-wearab
 validator-push = { module = "com.google.android.wearable.watchface.validator:validator-push", version.ref = "validatorPush" }
 wear-compose-material = { module = "androidx.wear.compose:compose-material", version.ref = "wearComposeMaterial" }
 wear-compose-material3 = { module = "androidx.wear.compose:compose-material3", version.ref = "wearComposeMaterial3" }
+jetbrains-kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
+kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlin" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
@@ -197,7 +200,10 @@ compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "
 gradle-versions = { id = "com.github.ben-manes.versions", version.ref = "gradle-versions" }
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 kotlin-android = "org.jetbrains.kotlin.android:2.2.10"
+kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+android-kotlin-multiplatform-library = { id = "com.android.kotlin.multiplatform.library", version.ref = "androidGradlePlugin" }
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 version-catalog-update = { id = "nl.littlerobots.version-catalog-update", version.ref = "version-catalog-update" }
+android-lint = { id = "com.android.lint", version.ref = "androidGradlePlugin" }

kmp/iosApp/Configuration/Config.xcconfig

@@ -0,0 +1,7 @@
+TEAM_ID=
+
+PRODUCT_NAME=KotlinProject
+PRODUCT_BUNDLE_IDENTIFIER=org.example.project.KotlinProject$(TEAM_ID)
+
+CURRENT_PROJECT_VERSION=1
+MARKETING_VERSION=1.0