From fd706a459346526b1522c42c1365efb975f62b70 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Tue, 30 Apr 2024 13:25:16 +0100 Subject: [PATCH 1/7] Remove building release and set signingConfig to null --- .github/workflows/build-sample.yml | 4 ---- Crane/app/build.gradle.kts | 7 ++++--- JetLagged/app/build.gradle.kts | 8 ++++---- JetNews/app/build.gradle.kts | 6 +++--- Jetcaster/mobile/build.gradle.kts | 6 +++--- Jetchat/app/build.gradle.kts | 6 +++--- Jetsnack/app/build.gradle.kts | 8 ++++---- Owl/app/build.gradle.kts | 6 +++--- Reply/app/build.gradle.kts | 6 +++--- 9 files changed, 27 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build-sample.yml b/.github/workflows/build-sample.yml index 8b210d7448..8027172334 100644 --- a/.github/workflows/build-sample.yml +++ b/.github/workflows/build-sample.yml @@ -69,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 diff --git a/Crane/app/build.gradle.kts b/Crane/app/build.gradle.kts index 09edb0705b..5fda8bff5b 100644 --- a/Crane/app/build.gradle.kts +++ b/Crane/app/build.gradle.kts @@ -48,7 +48,7 @@ android { val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore") val localKeystore = rootProject.file("debug_2.keystore") val hasKeyInfo = userKeystore.exists() - named("debug") { + named("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") @@ -58,18 +58,19 @@ android { buildTypes { getByName("debug") { + signingConfig = null } 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/JetLagged/app/build.gradle.kts b/JetLagged/app/build.gradle.kts index e19c3a8e09..5e7b69f40f 100644 --- a/JetLagged/app/build.gradle.kts +++ b/JetLagged/app/build.gradle.kts @@ -38,7 +38,7 @@ android { val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore") val localKeystore = rootProject.file("debug_2.keystore") val hasKeyInfo = userKeystore.exists() - named("debug") { + named("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") @@ -48,19 +48,19 @@ android { buildTypes { getByName("debug") { - + signingConfig = null } 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/JetNews/app/build.gradle.kts b/JetNews/app/build.gradle.kts index 621ea55542..52fc73b9c2 100644 --- a/JetNews/app/build.gradle.kts +++ b/JetNews/app/build.gradle.kts @@ -38,7 +38,7 @@ android { val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore") val localKeystore = rootProject.file("debug_2.keystore") val hasKeyInfo = userKeystore.exists() - named("debug") { + named("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") @@ -48,12 +48,12 @@ android { buildTypes { getByName("debug") { - + signingConfig = null } getByName("release") { isMinifyEnabled = true - signingConfig = signingConfigs.getByName("debug") + signingConfig = signingConfigs.getByName("release") proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") } diff --git a/Jetcaster/mobile/build.gradle.kts b/Jetcaster/mobile/build.gradle.kts index 47cfafd312..e67a938a00 100644 --- a/Jetcaster/mobile/build.gradle.kts +++ b/Jetcaster/mobile/build.gradle.kts @@ -40,7 +40,7 @@ android { val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore") val localKeystore = rootProject.file("debug_2.keystore") val hasKeyInfo = userKeystore.exists() - named("debug") { + named("release") { // get from env variables storeFile = if (hasKeyInfo) userKeystore else localKeystore storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password") @@ -51,12 +51,12 @@ android { buildTypes { getByName("debug") { - + signingConfig = null } getByName("release") { isMinifyEnabled = true - signingConfig = signingConfigs.getByName("debug") + signingConfig = signingConfigs.getByName("release") proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" diff --git a/Jetchat/app/build.gradle.kts b/Jetchat/app/build.gradle.kts index 12c3ba1762..51238c83b3 100644 --- a/Jetchat/app/build.gradle.kts +++ b/Jetchat/app/build.gradle.kts @@ -39,7 +39,7 @@ android { val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore") val localKeystore = rootProject.file("debug_2.keystore") val hasKeyInfo = userKeystore.exists() - named("debug") { + named("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") @@ -49,12 +49,12 @@ android { buildTypes { getByName("debug") { - + signingConfig = null } getByName("release") { isMinifyEnabled = true - signingConfig = signingConfigs.getByName("debug") + signingConfig = signingConfigs.getByName("release") proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") } diff --git a/Jetsnack/app/build.gradle.kts b/Jetsnack/app/build.gradle.kts index 61e3a7f4f5..766ab96530 100644 --- a/Jetsnack/app/build.gradle.kts +++ b/Jetsnack/app/build.gradle.kts @@ -38,7 +38,7 @@ android { val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore") val localKeystore = rootProject.file("debug_2.keystore") val hasKeyInfo = userKeystore.exists() - named("debug") { + named("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") @@ -48,19 +48,19 @@ android { buildTypes { getByName("debug") { - + signingConfig = null } 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/Owl/app/build.gradle.kts b/Owl/app/build.gradle.kts index 6697c3f6fe..7d217ce7fd 100644 --- a/Owl/app/build.gradle.kts +++ b/Owl/app/build.gradle.kts @@ -38,7 +38,7 @@ android { val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore") val localKeystore = rootProject.file("debug_2.keystore") val hasKeyInfo = userKeystore.exists() - named("debug") { + named("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") @@ -48,12 +48,12 @@ android { buildTypes { getByName("debug") { - + signingConfig = null } getByName("release") { isMinifyEnabled = true - signingConfig = signingConfigs.getByName("debug") + signingConfig = signingConfigs.getByName("release") proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") } diff --git a/Reply/app/build.gradle.kts b/Reply/app/build.gradle.kts index 38e17e5e38..0af2566180 100644 --- a/Reply/app/build.gradle.kts +++ b/Reply/app/build.gradle.kts @@ -38,7 +38,7 @@ android { val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore") val localKeystore = rootProject.file("debug_2.keystore") val hasKeyInfo = userKeystore.exists() - named("debug") { + named("release") { // get from env variables storeFile = if (hasKeyInfo) userKeystore else localKeystore storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password") @@ -49,12 +49,12 @@ android { buildTypes { getByName("debug") { - + signingConfig = null } getByName("release") { isMinifyEnabled = true - signingConfig = signingConfigs.getByName("debug") + signingConfig = signingConfigs.getByName("release") proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") } From 505bb43334601524fad78b9a73bfd88e7c580ee4 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Tue, 30 Apr 2024 13:32:06 +0100 Subject: [PATCH 2/7] change from named -> create --- JetLagged/app/build.gradle.kts | 2 +- JetNews/app/build.gradle.kts | 2 +- Jetchat/app/build.gradle.kts | 2 +- Jetsnack/app/build.gradle.kts | 2 +- Owl/app/build.gradle.kts | 2 +- Reply/app/build.gradle.kts | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/JetLagged/app/build.gradle.kts b/JetLagged/app/build.gradle.kts index 5e7b69f40f..4dff1d3bab 100644 --- a/JetLagged/app/build.gradle.kts +++ b/JetLagged/app/build.gradle.kts @@ -38,7 +38,7 @@ android { val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore") val localKeystore = rootProject.file("debug_2.keystore") val hasKeyInfo = userKeystore.exists() - named("release") { + 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") diff --git a/JetNews/app/build.gradle.kts b/JetNews/app/build.gradle.kts index 52fc73b9c2..0ce5c33838 100644 --- a/JetNews/app/build.gradle.kts +++ b/JetNews/app/build.gradle.kts @@ -38,7 +38,7 @@ android { val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore") val localKeystore = rootProject.file("debug_2.keystore") val hasKeyInfo = userKeystore.exists() - named("release") { + 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") diff --git a/Jetchat/app/build.gradle.kts b/Jetchat/app/build.gradle.kts index 51238c83b3..830795a66c 100644 --- a/Jetchat/app/build.gradle.kts +++ b/Jetchat/app/build.gradle.kts @@ -39,7 +39,7 @@ android { val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore") val localKeystore = rootProject.file("debug_2.keystore") val hasKeyInfo = userKeystore.exists() - named("release") { + 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") diff --git a/Jetsnack/app/build.gradle.kts b/Jetsnack/app/build.gradle.kts index 766ab96530..14dd1b897a 100644 --- a/Jetsnack/app/build.gradle.kts +++ b/Jetsnack/app/build.gradle.kts @@ -38,7 +38,7 @@ android { val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore") val localKeystore = rootProject.file("debug_2.keystore") val hasKeyInfo = userKeystore.exists() - named("release") { + 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") diff --git a/Owl/app/build.gradle.kts b/Owl/app/build.gradle.kts index 7d217ce7fd..6c2454c201 100644 --- a/Owl/app/build.gradle.kts +++ b/Owl/app/build.gradle.kts @@ -38,7 +38,7 @@ android { val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore") val localKeystore = rootProject.file("debug_2.keystore") val hasKeyInfo = userKeystore.exists() - named("release") { + 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") diff --git a/Reply/app/build.gradle.kts b/Reply/app/build.gradle.kts index 0af2566180..45d12a3a7d 100644 --- a/Reply/app/build.gradle.kts +++ b/Reply/app/build.gradle.kts @@ -38,7 +38,7 @@ android { val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore") val localKeystore = rootProject.file("debug_2.keystore") val hasKeyInfo = userKeystore.exists() - named("release") { + create("release") { // get from env variables storeFile = if (hasKeyInfo) userKeystore else localKeystore storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password") From e2a293f983c8542a490322701bb75f57ad289cba Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Tue, 30 Apr 2024 13:36:07 +0100 Subject: [PATCH 3/7] Fix for Crane --- Crane/app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Crane/app/build.gradle.kts b/Crane/app/build.gradle.kts index 5fda8bff5b..30fc6f19d1 100644 --- a/Crane/app/build.gradle.kts +++ b/Crane/app/build.gradle.kts @@ -48,7 +48,7 @@ android { val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore") val localKeystore = rootProject.file("debug_2.keystore") val hasKeyInfo = userKeystore.exists() - named("release") { + 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") From 0bd2bff780af0f3fd777bc4064428ce3fbab8a36 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Tue, 30 Apr 2024 13:37:15 +0100 Subject: [PATCH 4/7] Change to release --- Jetcaster/mobile/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jetcaster/mobile/build.gradle.kts b/Jetcaster/mobile/build.gradle.kts index e67a938a00..92085cb58c 100644 --- a/Jetcaster/mobile/build.gradle.kts +++ b/Jetcaster/mobile/build.gradle.kts @@ -40,7 +40,7 @@ android { val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore") val localKeystore = rootProject.file("debug_2.keystore") val hasKeyInfo = userKeystore.exists() - named("release") { + create("release") { // get from env variables storeFile = if (hasKeyInfo) userKeystore else localKeystore storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password") From bf5ce411e3769019b1c862ca05c950e69eea91c0 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Tue, 30 Apr 2024 13:56:38 +0100 Subject: [PATCH 5/7] Remove setting signingConfig to null --- Crane/app/build.gradle.kts | 2 +- JetLagged/app/build.gradle.kts | 2 +- JetNews/app/build.gradle.kts | 2 +- Jetcaster/mobile/build.gradle.kts | 2 +- Jetchat/app/build.gradle.kts | 2 +- Jetsnack/app/build.gradle.kts | 2 +- Owl/app/build.gradle.kts | 2 +- Reply/app/build.gradle.kts | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Crane/app/build.gradle.kts b/Crane/app/build.gradle.kts index 30fc6f19d1..be92f89d0c 100644 --- a/Crane/app/build.gradle.kts +++ b/Crane/app/build.gradle.kts @@ -58,7 +58,7 @@ android { buildTypes { getByName("debug") { - signingConfig = null + } getByName("release") { diff --git a/JetLagged/app/build.gradle.kts b/JetLagged/app/build.gradle.kts index 4dff1d3bab..14efbd8cab 100644 --- a/JetLagged/app/build.gradle.kts +++ b/JetLagged/app/build.gradle.kts @@ -48,7 +48,7 @@ android { buildTypes { getByName("debug") { - signingConfig = null + } getByName("release") { diff --git a/JetNews/app/build.gradle.kts b/JetNews/app/build.gradle.kts index 0ce5c33838..fce54065cb 100644 --- a/JetNews/app/build.gradle.kts +++ b/JetNews/app/build.gradle.kts @@ -48,7 +48,7 @@ android { buildTypes { getByName("debug") { - signingConfig = null + } getByName("release") { diff --git a/Jetcaster/mobile/build.gradle.kts b/Jetcaster/mobile/build.gradle.kts index 92085cb58c..c0d8ab1653 100644 --- a/Jetcaster/mobile/build.gradle.kts +++ b/Jetcaster/mobile/build.gradle.kts @@ -51,7 +51,7 @@ android { buildTypes { getByName("debug") { - signingConfig = null + } getByName("release") { diff --git a/Jetchat/app/build.gradle.kts b/Jetchat/app/build.gradle.kts index 830795a66c..1d3c8f46df 100644 --- a/Jetchat/app/build.gradle.kts +++ b/Jetchat/app/build.gradle.kts @@ -49,7 +49,7 @@ android { buildTypes { getByName("debug") { - signingConfig = null + } getByName("release") { diff --git a/Jetsnack/app/build.gradle.kts b/Jetsnack/app/build.gradle.kts index 14dd1b897a..7860407a2b 100644 --- a/Jetsnack/app/build.gradle.kts +++ b/Jetsnack/app/build.gradle.kts @@ -48,7 +48,7 @@ android { buildTypes { getByName("debug") { - signingConfig = null + } getByName("release") { diff --git a/Owl/app/build.gradle.kts b/Owl/app/build.gradle.kts index 6c2454c201..ec8ae36849 100644 --- a/Owl/app/build.gradle.kts +++ b/Owl/app/build.gradle.kts @@ -48,7 +48,7 @@ android { buildTypes { getByName("debug") { - signingConfig = null + } getByName("release") { diff --git a/Reply/app/build.gradle.kts b/Reply/app/build.gradle.kts index 45d12a3a7d..ea163e170c 100644 --- a/Reply/app/build.gradle.kts +++ b/Reply/app/build.gradle.kts @@ -49,7 +49,7 @@ android { buildTypes { getByName("debug") { - signingConfig = null + } getByName("release") { From 9fbcfd1b80dfabeb0dfab398143ef57bf4c07d50 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Tue, 30 Apr 2024 17:21:05 +0100 Subject: [PATCH 6/7] Change crane to not run benchmarks. --- .github/workflows/Crane.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Crane.yaml b/.github/workflows/Crane.yaml index 486661dd91..228b3dc79a 100644 --- a/.github/workflows/Crane.yaml +++ b/.github/workflows/Crane.yaml @@ -76,7 +76,7 @@ jobs: target: google_apis arch: x86 disable-animations: true - script: ./gradlew connectedCheck --stacktrace + script: ./gradlew connectedAndroidDebugTest --stacktrace working-directory: ${{ env.SAMPLE_PATH }} - name: Upload test reports From b704c2dfe8d5ebe0cf9468fb0da9d0895c5c4d5d Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Tue, 30 Apr 2024 22:40:25 +0100 Subject: [PATCH 7/7] Change crane to not run benchmark --- .github/workflows/Crane.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Crane.yaml b/.github/workflows/Crane.yaml index 228b3dc79a..d13e4fe6d4 100644 --- a/.github/workflows/Crane.yaml +++ b/.github/workflows/Crane.yaml @@ -76,7 +76,7 @@ jobs: target: google_apis arch: x86 disable-animations: true - script: ./gradlew connectedAndroidDebugTest --stacktrace + script: ./gradlew app:connectedDebugAndroidTest --stacktrace working-directory: ${{ env.SAMPLE_PATH }} - name: Upload test reports