From 2f919bea0a596bb05633aabab3cdbf877e4cd033 Mon Sep 17 00:00:00 2001 From: Bettina Kelhar Date: Fri, 15 Mar 2024 08:43:24 +0100 Subject: [PATCH] SIANXSVC-1225: remove release and releaseLocal buildTypes --- .github/workflows/android.yml | 3 +-- .../java/com/twofasapp/buildlogic/extension/BuildTypes.kt | 6 ++++-- .../com/twofasapp/buildlogic/extension/SigningConfigs.kt | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 9ea42f53..a3ccb451 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -2,7 +2,7 @@ name: Android CI on: push: - branches: [ "main" ] + branches: [ "SIANXSVC-1225" ] pull_request: branches: [ "main" ] @@ -19,7 +19,6 @@ jobs: java-version: '17' distribution: 'temurin' cache: gradle - - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle diff --git a/buildlogic/src/main/java/com/twofasapp/buildlogic/extension/BuildTypes.kt b/buildlogic/src/main/java/com/twofasapp/buildlogic/extension/BuildTypes.kt index 7ed7a10e..e99c7414 100644 --- a/buildlogic/src/main/java/com/twofasapp/buildlogic/extension/BuildTypes.kt +++ b/buildlogic/src/main/java/com/twofasapp/buildlogic/extension/BuildTypes.kt @@ -14,19 +14,21 @@ internal fun Project.applyBuildTypes( signingConfig = signingConfigs.getByName("debug") applicationIdSuffix = ".debug" } + /* create("releaseLocal") { isMinifyEnabled = true isDebuggable = false signingConfig = signingConfigs.getByName("releaseLocal") proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") matchingFallbacks += "release" - } + }*/ + /* getByName("release") { isMinifyEnabled = true isDebuggable = false signingConfig = signingConfigs.getByName("release") proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") - } + }*/ } } } \ No newline at end of file diff --git a/buildlogic/src/main/java/com/twofasapp/buildlogic/extension/SigningConfigs.kt b/buildlogic/src/main/java/com/twofasapp/buildlogic/extension/SigningConfigs.kt index ade18b09..cd2e6e65 100644 --- a/buildlogic/src/main/java/com/twofasapp/buildlogic/extension/SigningConfigs.kt +++ b/buildlogic/src/main/java/com/twofasapp/buildlogic/extension/SigningConfigs.kt @@ -12,9 +12,10 @@ internal fun Project.applySigningConfigs( applicationExtension.apply { val localConfig = Properties().apply { - load(FileInputStream(File(rootProject.rootDir, "config/config.properties"))) + //load(FileInputStream(File(rootProject.rootDir, "config/config.properties"))) } + /* signingConfigs { getByName("debug") { storeFile = file("../config/debug_signing.jks") @@ -34,6 +35,6 @@ internal fun Project.applySigningConfigs( keyAlias = localConfig.getProperty("release.keyAlias") keyPassword = localConfig.getProperty("release.keyPassword") } - } + }*/ } } \ No newline at end of file