Merge branch 'main' of github.com:android/compose-samples into change…

…-tv-app-module-name
android · May 7, 2024 · a67f624 · a67f624
2 parents 01f0bd0 + 2061095
commit a67f624
Show file tree

Hide file tree

Showing 247 changed files with 2,042 additions and 1,236 deletions.
diff --git a/.github/workflows/Crane.yaml b/.github/workflows/Crane.yaml
@@ -15,13 +15,19 @@ on:
 
 env:
   SAMPLE_PATH: Crane
-
+  compose_store_password: ${{ secrets.compose_store_password }}
+  compose_key_alias: ${{ secrets.compose_key_alias }}
+  compose_key_password: ${{ secrets.compose_key_password }}
 jobs:
   build:
     uses: ./.github/workflows/build-sample.yml
     with:
       name: Crane
       path: Crane
+    secrets:
+      compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
+      compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
+      compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}
 
   test:
     needs: build
@@ -70,7 +76,7 @@ jobs:
           target: google_apis
           arch: x86
           disable-animations: true
-          script: ./gradlew connectedCheck --stacktrace
+          script: ./gradlew app:connectedDebugAndroidTest --stacktrace
           working-directory: ${{ env.SAMPLE_PATH }}
 
       - name: Upload test reports

diff --git a/.github/workflows/JetLagged.yaml b/.github/workflows/JetLagged.yaml
@@ -15,13 +15,19 @@ on:
 
 env:
   SAMPLE_PATH: JetLagged
-
+  compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
+  compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
+  compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}
 jobs:
   build:
     uses: ./.github/workflows/build-sample.yml
     with:
       name: JetLagged
       path: JetLagged
+    secrets:
+      compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
+      compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
+      compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}
 
   test:
     needs: build

diff --git a/.github/workflows/JetNews.yaml b/.github/workflows/JetNews.yaml
@@ -15,13 +15,19 @@ on:
 
 env:
   SAMPLE_PATH: JetNews
-
+  compose_store_password: ${{ secrets.compose_store_password }}
+  compose_key_alias: ${{ secrets.compose_key_alias }}
+  compose_key_password: ${{ secrets.compose_key_password }}
 jobs:
   build:
     uses: ./.github/workflows/build-sample.yml
     with:
       name: JetNews
       path: JetNews
+    secrets:
+      compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
+      compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
+      compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}
 
   androidTest:
     needs: build

diff --git a/.github/workflows/Jetcaster.yaml b/.github/workflows/Jetcaster.yaml
@@ -19,3 +19,8 @@ jobs:
     with:
       name: Jetcaster
       path: Jetcaster
+      module: mobile
+    secrets:
+      compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
+      compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
+      compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}
diff --git a/.github/workflows/Jetchat.yaml b/.github/workflows/Jetchat.yaml
@@ -15,14 +15,19 @@ on:
 
 env:
   SAMPLE_PATH: Jetchat
-
+  compose_store_password: ${{ secrets.compose_store_password }}
+  compose_key_alias: ${{ secrets.compose_key_alias }}
+  compose_key_password: ${{ secrets.compose_key_password }}
 jobs:
   build:
     uses: ./.github/workflows/build-sample.yml
     with:
       name: Jetchat
       path: Jetchat
-
+    secrets:
+      compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
+      compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
+      compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}
   test:
     needs: build
     runs-on: ubuntu-latest

diff --git a/.github/workflows/Jetsnack.yaml b/.github/workflows/Jetsnack.yaml
@@ -19,3 +19,7 @@ jobs:
     with:
       name: Jetsnack
       path: Jetsnack
+    secrets:
+      compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
+      compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
+      compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}
diff --git a/.github/workflows/Jetsurvey.yaml b/.github/workflows/Jetsurvey.yaml
@@ -19,3 +19,7 @@ jobs:
     with:
       name: Jetsurvey
       path: Jetsurvey
+    secrets:
+      compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
+      compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
+      compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}
diff --git a/.github/workflows/Owl.yaml b/.github/workflows/Owl.yaml
@@ -15,13 +15,19 @@ on:
 
 env:
   SAMPLE_PATH: Owl
-
+  compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
+  compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
+  compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}
 jobs:
   build:
     uses: ./.github/workflows/build-sample.yml
     with:
       name: Owl
       path: Owl
+    secrets:
+      compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
+      compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
+      compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}
 
   test:
     needs: build

diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -4,7 +4,10 @@ on:
   push:
     tags:
     - 'v*'
-
+env:
+  compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
+  compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
+  compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}
 jobs:
   build:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/Reply.yaml b/.github/workflows/Reply.yaml
@@ -15,17 +15,23 @@ on:
 
 env:
   SAMPLE_PATH: Reply
-
+  compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
+  compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
+  compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}
 jobs:
   build:
     uses: ./.github/workflows/build-sample.yml
     with:
       name: Reply
       path: Reply
+    secrets:
+      compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
+      compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
+      compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}
 
   test:
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest # enables hardware acceleration in the virtual machine
     timeout-minutes: 30
     strategy:
       matrix:

diff --git a/.github/workflows/build-sample.yml b/.github/workflows/build-sample.yml
@@ -9,11 +9,26 @@ on:
       path:
         required: true
         type: string
-
+      module:
+        default: "app"
+        type: string
+    secrets:
+      compose_store_password:
+        description: 'password for the keystore'
+        required: true
+      compose_key_alias:
+        description: 'alias for the keystore'
+        required: true
+      compose_key_password:
+        description: 'password for the key'
+        required: true
 concurrency:
   group: ${{ inputs.name }}-build-${{ github.ref }}
   cancel-in-progress: true
-
+env:
+  compose_store_password: ${{ secrets.compose_store_password }}
+  compose_key_alias: ${{ secrets.compose_key_alias }}
+  compose_key_password: ${{ secrets.compose_key_password }}
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -54,10 +69,6 @@ jobs:
         working-directory: ${{ inputs.path }}
         run: ./gradlew assembleDebug --stacktrace
 
-      - name: Build release
-        working-directory: ${{ inputs.path }}
-        run: ./gradlew assembleRelease --stacktrace
-
       - name: Run local tests
         working-directory: ${{ inputs.path }}
         run: ./gradlew testDebug --stacktrace
@@ -66,11 +77,11 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: build-outputs
-          path: ${{ inputs.path }}/app/build/outputs
+          path: ${{ inputs.path }}/${{ inputs.module }}/build/outputs
 
       - name: Upload build reports
         if: always()
         uses: actions/upload-artifact@v4
         with:
           name: build-reports
-          path: ${{ inputs.path }}/app/build/reports
+          path: ${{ inputs.path }}/${{ inputs.module }}/build/reports
diff --git a/.github/workflows/test-snapshot.yml b/.github/workflows/test-snapshot.yml
@@ -9,7 +9,10 @@ on:
       composeVersion:
         required: true
         type: string
-
+env:
+  compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
+  compose_key_alias: $${{ secrets.COMPOSE_KEY_ALIAS }}
+  compose_key_password: $${{ secrets.COMPOSE_KEY_PASSWORD }}
 concurrency:
   group: ${{ inputs.name }}-build-${{ github.ref }}
   cancel-in-progress: true

diff --git a/.github/workflows/update_deps.yml b/.github/workflows/update_deps.yml
@@ -2,7 +2,10 @@ name: Update Versions / Dependencies
 
 on:
   workflow_dispatch:
-
+env:
+  compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
+  compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
+  compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}
 jobs:
   build:
     runs-on: ubuntu-latest

diff --git a/Crane/app/build.gradle.kts b/Crane/app/build.gradle.kts
@@ -45,30 +45,32 @@ android {
     }
 
     signingConfigs {
-        // We use a bundled debug keystore, to allow debug builds from CI to be upgradable
-        named("debug") {
-            storeFile = rootProject.file("debug.keystore")
-            storePassword = "android"
-            keyAlias = "androiddebugkey"
-            keyPassword = "android"
+        val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
+        val localKeystore = rootProject.file("debug_2.keystore")
+        val hasKeyInfo = userKeystore.exists()
+        create("release") {
+            storeFile = if (hasKeyInfo) userKeystore else localKeystore
+            storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
+            keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
+            keyPassword = if (hasKeyInfo) "android" else System.getenv("compose_key_password")
         }
     }
 
     buildTypes {
         getByName("debug") {
-            signingConfig = signingConfigs.getByName("debug")
+
         }
 
         getByName("release") {
             isMinifyEnabled = true
-            signingConfig = signingConfigs.getByName("debug")
+            signingConfig = signingConfigs.getByName("release")
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
                     "proguard-rules.pro")
         }
 
         create("benchmark") {
             initWith(getByName("release"))
-            signingConfig = signingConfigs.getByName("debug")
+            signingConfig = signingConfigs.getByName("release")
             matchingFallbacks.add("release")
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
                     "proguard-benchmark-rules.pro")

diff --git a/Crane/debug.keystore b/Crane/debug.keystore
diff --git a/Crane/debug_2.keystore b/Crane/debug_2.keystore
diff --git a/Crane/gradle/libs.versions.toml b/Crane/gradle/libs.versions.toml
@@ -4,14 +4,14 @@
 #####
 [versions]
 accompanist = "0.34.0"
-androidGradlePlugin = "8.3.2"
+androidGradlePlugin = "8.4.0"
 androidx-activity-compose = "1.9.0"
 androidx-appcompat = "1.6.1"
 androidx-benchmark = "1.2.0"
 androidx-benchmark-junit4 = "1.2.1"
-androidx-compose-bom = "2024.04.01"
+androidx-compose-bom = "2024.05.00"
 androidx-constraintlayout = "1.0.1"
-androidx-corektx = "1.13.0"
+androidx-corektx = "1.13.1"
 androidx-glance = "1.0.0"
 androidx-lifecycle-compose = "2.7.0"
 androidx-lifecycle-runtime-compose = "2.7.0"
@@ -21,13 +21,13 @@ androidx-test = "1.5.0"
 androidx-test-espresso = "3.5.1"
 androidx-test-ext-junit = "1.1.5"
 androidx-test-ext-truth = "1.5.0"
-androidx-window = "1.3.0-beta01"
+androidx-window = "1.3.0-beta02"
 androidxHiltNavigationCompose = "1.1.0"
 androix-test-uiautomator = "2.2.0"
 coil = "2.4.0"
 # @keep
 compileSdk = "34"
-compose-compiler = "1.5.4"
+compose-compiler = "1.5.13"
 coroutines = "1.8.0"
 google-maps = "18.2.0"
 gradle-versions = "0.51.0"
@@ -37,7 +37,7 @@ hiltExt = "1.1.0"
 jdkDesugar = "1.2.2"
 junit = "4.13.2"
 # @pin Update in conjuction with Compose Compiler
-kotlin = "1.9.20"
+kotlin = "1.9.23"
 kotlinx_immutable = "0.3.5"
 ksp = "1.9.20-1.0.14"
 maps-compose = "3.1.1"
@@ -118,7 +118,7 @@ googlemaps-compose = { module = "com.google.maps.android:maps-compose", version.
 googlemaps-maps = { module = "com.google.android.gms:play-services-maps", version.ref = "google-maps" }
 hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }
 hilt-android-testing = { module = "com.google.dagger:hilt-android-testing", version.ref = "hilt" }
-hilt-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt" }
+hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" }
 hilt-ext-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "hiltExt" }
 junit = { module = "junit:junit", version.ref = "junit" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }

diff --git a/Crane/gradle/wrapper/gradle-wrapper.properties b/Crane/gradle/wrapper/gradle-wrapper.properties
@@ -14,6 +14,6 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists