diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 800687f..b5042e2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -51,7 +51,7 @@ jobs: # if: ${{ github.event_name == 'push' }} # run: | # echo 'androidStorePassword=${{ secrets.KEY_STORE_PASSWORD }}' >> local.properties -# echo 'androidKeyAlias=${{ secrets.ALIAS }}' >> local.properties +# echo 'androidKeyAlias=${{ secrets.KEY_ALIAS }}' >> local.properties # echo 'androidKeyPassword=${{ secrets.KEY_PASSWORD }}' >> local.properties # echo 'androidStoreFile=sign_key.jks' >> local.properties # echo '${{ secrets.KEY_STORE }}' | base64 --decode > sign_key.jks diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7ef32ca..15ebbf4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,11 +38,13 @@ jobs: gradle-builds - name: Signing key run: | - echo 'androidStorePassword=${{ secrets.KEY_STORE_PASSWORD }}' >> local.properties - echo 'androidKeyAlias=${{ secrets.ALIAS }}' >> local.properties - echo 'androidKeyPassword=${{ secrets.KEY_PASSWORD }}' >> local.properties - echo 'androidStoreFile=sign_key.jks' >> local.properties - echo '${{ secrets.KEY_STORE }}' | base64 --decode > sign_key.jks + echo "androidStorePassword=${{ secrets.KEY_STORE_PASSWORD }}" >> local.properties + echo "androidKeyAlias=${{ secrets.KEY_ALIAS }}" >> local.properties + echo "androidKeyPassword=${{ secrets.KEY_PASSWORD }}" >> local.properties + echo "androidStoreFile=aer_sign_keystore.jks" >> local.properties + if [ ! -z "${{ secrets.KEY_STORE }}" ]; then + echo '${{ secrets.KEY_STORE }}' | base64 --decode > aer_sign_keystore.jks + fi - name: Build id: build run: | diff --git a/.gitignore b/.gitignore index 4a67d60..d53ec5c 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ local.properties # Sign key *.jks +*.jks.base64 # VSCode */.classpath diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b1dd7c8..2818cb6 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -14,8 +14,8 @@ android { defaultConfig { minSdk = rootProject.extra["minSdkVersion"] as Int targetSdk = rootProject.extra["targetSdkVersion"] as Int - versionCode = 1727869000 - versionName = "2024.10.02" + versionCode = 1727979000 + versionName = "2024.10.03" applicationId = "alt.nainapps.aer" vectorDrawables { useSupportLibrary = true @@ -48,24 +48,22 @@ android { } buildTypes { - // Disable this for now. We focus on F-droid builds - // which have their own signing system. - // val useAnemoConfig = rootProject.ext.get("keyStoreFile") != null && (rootProject.ext.get("keyStoreFile") as File).exists() - val useAnemoConfig = false + val useAerSignConfig = rootProject.ext.get("keyStoreFile") != null && (rootProject.ext.get("keyStoreFile") as File).exists() getByName("release") { isMinifyEnabled = true proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") signingConfig = signingConfigs.getByName("debug") - if (useAnemoConfig) { + if (useAerSignConfig) { signingConfig = signingConfigs.getByName("aer") } } getByName("debug") { applicationIdSuffix = ".debug" signingConfig = signingConfigs.getByName("debug") - if (useAnemoConfig) { + + if (useAerSignConfig) { signingConfig = signingConfigs.getByName("aer") } }