Merge branch 'main' into change-tv-app-module-name

android · Apr 30, 2024 · b49e028 · b49e028
2 parents 01f0bd0 + cf40662
commit b49e028
Show file tree

Hide file tree

Showing 111 changed files with 684 additions and 380 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

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

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,18 +45,19 @@ android {
     }
 
     signingConfigs {
-        // We use a bundled debug keystore, to allow debug builds from CI to be upgradable
+        val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
+        val localKeystore = rootProject.file("debug_2.keystore")
+        val hasKeyInfo = userKeystore.exists()
         named("debug") {
-            storeFile = rootProject.file("debug.keystore")
-            storePassword = "android"
-            keyAlias = "androiddebugkey"
-            keyPassword = "android"
+            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") {

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/JetLagged/app/build.gradle.kts b/JetLagged/app/build.gradle.kts
@@ -34,18 +34,21 @@ android {
     }
 
     signingConfigs {
-        // We use a bundled debug keystore, to allow debug builds from CI to be upgradable
+        // Important: change the keystore for a production deployment
+        val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
+        val localKeystore = rootProject.file("debug_2.keystore")
+        val hasKeyInfo = userKeystore.exists()
         named("debug") {
-            storeFile = rootProject.file("debug.keystore")
-            storePassword = "android"
-            keyAlias = "androiddebugkey"
-            keyPassword = "android"
+            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") {

diff --git a/JetLagged/debug.keystore b/JetLagged/debug.keystore
diff --git a/JetLagged/debug_2.keystore b/JetLagged/debug_2.keystore
diff --git a/JetNews/app/build.gradle.kts b/JetNews/app/build.gradle.kts
@@ -34,18 +34,21 @@ android {
     }
 
     signingConfigs {
-        // We use a bundled debug keystore, to allow debug builds from CI to be upgradable
+        // Important: change the keystore for a production deployment
+        val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
+        val localKeystore = rootProject.file("debug_2.keystore")
+        val hasKeyInfo = userKeystore.exists()
         named("debug") {
-            storeFile = rootProject.file("debug.keystore")
-            storePassword = "android"
-            keyAlias = "androiddebugkey"
-            keyPassword = "android"
+            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") {

diff --git a/JetNews/debug.keystore b/JetNews/debug.keystore
diff --git a/JetNews/debug_2.keystore b/JetNews/debug_2.keystore