From f7a290f5c034075085538a86ce1bdce47919faa7 Mon Sep 17 00:00:00 2001 From: Walter Huf Date: Thu, 5 Dec 2024 01:41:03 -0800 Subject: [PATCH] Prepare Gestalt fork --- .github/workflows/pull-request.yml | 10 +-- .github/workflows/push.yml | 104 +++++------------------------ README.md | 18 ++--- app/build.gradle.kts | 8 +++ 4 files changed, 34 insertions(+), 106 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 7c7fe4eda..f238547d5 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -3,8 +3,8 @@ name: Breezy Weather Pull Request CI on: pull_request: branches: - - main - dev + - gestalt paths-ignore: - ".editorconfig" - "docs/*" @@ -36,10 +36,10 @@ jobs: - name: Set up Gradle uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1 - - name: Lint + Assemble basic flavor - run: ./gradlew spotlessCheck assembleBasicDebug + - name: Lint + Assemble gestalt flavor + run: ./gradlew spotlessCheck assembleGestaltDebug - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 with: - name: BreezyWeather_basicDebug.apk - path: app/build/outputs/apk/basic/debug/app-basic-universal-debug.apk + name: BreezyWeather_gestaltDebug.apk + path: app/build/outputs/apk/gestalt/debug/app-gestalt-universal-debug.apk diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 4c111e7c7..9627d511c 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -3,7 +3,7 @@ name: Breezy Weather push CI on: push: branches: - - main + - gestalt tags: - v* @@ -31,97 +31,36 @@ jobs: - name: Set up gradle uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1 - - name: Lint + Assemble freenet flavor - run: ./gradlew spotlessCheck assembleFreenetRelease - - - name: Add secrets to local.properties - if: startsWith(github.ref, 'refs/tags/') && github.repository == 'breezy-weather/breezy-weather' - run: | - set -e - echo "breezy.accu.key=$ACCU_WEATHER_KEY" >> local.properties - echo "breezy.aemet.key=$AEMET_KEY" >> local.properties - echo "breezy.atmoaura.key=$ATMO_AURA_KEY" >> local.properties - echo "breezy.baiduip.key=$BAIDU_IP_LOCATION_AK" >> local.properties - echo "breezy.bmkg.key=$BMKG_KEY" >> local.properties - echo "breezy.cwa.key=$CWA_KEY" >> local.properties - echo "breezy.geonames.key=$GEO_NAMES_KEY" >> local.properties - echo "breezy.mf.jwtKey=$MF_WSFT_JWT_KEY" >> local.properties - echo "breezy.mf.key=$MF_WSFT_KEY" >> local.properties - echo "breezy.openweather.key=$OPEN_WEATHER_KEY" >> local.properties - env: - ACCU_WEATHER_KEY: ${{ secrets.ACCU_WEATHER_KEY }} - AEMET_KEY: ${{ secrets.AEMET_KEY }} - ATMO_AURA_KEY: ${{ secrets.ATMO_AURA_KEY }} - BAIDU_IP_LOCATION_AK: ${{ secrets.BAIDU_IP_LOCATION_AK }} - BMKG_KEY: ${{ secrets.BMKG_KEY }} - CWA_KEY: ${{ secrets.CWA_KEY }} - GEO_NAMES_KEY: ${{ secrets.GEO_NAMES_KEY }} - MF_WSFT_JWT_KEY: ${{ secrets.MF_WSFT_JWT_KEY }} - MF_WSFT_KEY: ${{ secrets.MF_WSFT_KEY }} - OPEN_WEATHER_KEY: ${{ secrets.OPEN_WEATHER_KEY }} - - - name: Assemble basic flavor - run: ./gradlew assembleBasicRelease - - - name: Delete local.properties - if: startsWith(github.ref, 'refs/tags/') && github.repository == 'breezy-weather/breezy-weather' - run: | - set -e - rm local.properties + - name: Lint + Assemble gestalt flavor + run: ./gradlew spotlessCheck assembleGestaltRelease - name: Save version tag in env - if: startsWith(github.ref, 'refs/tags/') && github.repository == 'breezy-weather/breezy-weather' + if: startsWith(github.ref, 'refs/tags/') && github.repository == 'BimmerGestalt/breezy-weather' run: | set -x echo "VERSION_TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV - - name: Sign APK (free networks) - if: startsWith(github.ref, 'refs/tags/') && github.repository == 'breezy-weather/breezy-weather' - uses: r0adkll/sign-android-release@349ebdef58775b1e0d8099458af0816dc79b6407 # v1 - with: - releaseDirectory: app/build/outputs/apk/freenet/release - signingKeyBase64: ${{ secrets.SIGNING_KEY }} - alias: ${{ secrets.ALIAS }} - keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} - keyPassword: ${{ secrets.KEY_PASSWORD }} - - - name: Sign APK (basic) - if: startsWith(github.ref, 'refs/tags/') && github.repository == 'breezy-weather/breezy-weather' + - name: Sign APK (gestalt) + if: startsWith(github.ref, 'refs/tags/') && github.repository == 'BimmerGestalt/breezy-weather' uses: r0adkll/sign-android-release@349ebdef58775b1e0d8099458af0816dc79b6407 # v1 with: - releaseDirectory: app/build/outputs/apk/basic/release + releaseDirectory: app/build/outputs/apk/gestalt/release signingKeyBase64: ${{ secrets.SIGNING_KEY }} alias: ${{ secrets.ALIAS }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} - name: Prepare APKs with checksums, archive mapping.txt file - if: startsWith(github.ref, 'refs/tags/') && github.repository == 'breezy-weather/breezy-weather' + if: startsWith(github.ref, 'refs/tags/') && github.repository == 'BimmerGestalt/breezy-weather' run: | set -e - mv app/build/outputs/apk/basic/release/app-basic-universal-release-unsigned-signed.apk breezy-weather-${{ env.VERSION_TAG }}_standard.apk - sha256=`sha256sum breezy-weather-${{ env.VERSION_TAG }}_standard.apk | awk '{ print $1 }'` - echo "APK_UNIVERSAL_SHA256=$sha256" >> $GITHUB_ENV - mv app/build/outputs/apk/basic/release/app-basic-arm64-v8a-release-unsigned-signed.apk breezy-weather-arm64-v8a-${{ env.VERSION_TAG }}_standard.apk - sha256=`sha256sum breezy-weather-arm64-v8a-${{ env.VERSION_TAG }}_standard.apk | awk '{ print $1 }'` - echo "APK_ARM64_V8A_SHA256=$sha256" >> $GITHUB_ENV - mv app/build/outputs/apk/basic/release/app-basic-armeabi-v7a-release-unsigned-signed.apk breezy-weather-armeabi-v7a-${{ env.VERSION_TAG }}_standard.apk - sha256=`sha256sum breezy-weather-armeabi-v7a-${{ env.VERSION_TAG }}_standard.apk | awk '{ print $1 }'` - echo "APK_ARMEABI_V7A_SHA256=$sha256" >> $GITHUB_ENV - mv app/build/outputs/apk/basic/release/app-basic-x86-release-unsigned-signed.apk breezy-weather-x86-${{ env.VERSION_TAG }}_standard.apk - sha256=`sha256sum breezy-weather-x86-${{ env.VERSION_TAG }}_standard.apk | awk '{ print $1 }'` - echo "APK_X86_SHA256=$sha256" >> $GITHUB_ENV - mv app/build/outputs/apk/basic/release/app-basic-x86_64-release-unsigned-signed.apk breezy-weather-x86_64-${{ env.VERSION_TAG }}_standard.apk - sha256=`sha256sum breezy-weather-x86_64-${{ env.VERSION_TAG }}_standard.apk | awk '{ print $1 }'` - echo "APK_X86_64_SHA256=$sha256" >> $GITHUB_ENV - mv app/build/outputs/apk/freenet/release/app-freenet-universal-release-unsigned-signed.apk breezy-weather-${{ env.VERSION_TAG }}_freenet.apk - sha256=`sha256sum breezy-weather-${{ env.VERSION_TAG }}_freenet.apk | awk '{ print $1 }'` - echo "APK_UNIVERSAL_FREENET_SHA256=$sha256" >> $GITHUB_ENV - tar -czvf mapping-${{ env.VERSION_TAG }}_standard.tar.gz --directory=app/build/outputs/mapping/basicRelease/ mapping.txt - tar -czvf mapping-${{ env.VERSION_TAG }}_freenet.tar.gz --directory=app/build/outputs/mapping/freenetRelease/ mapping.txt + mv app/build/outputs/apk/gestalt/release/app-gestalt-universal-release-unsigned-signed.apk breezy-weather-${{ env.VERSION_TAG }}_gestalt.apk + sha256=`sha256sum breezy-weather-${{ env.VERSION_TAG }}_gestalt.apk | awk '{ print $1 }'` + echo "APK_GESTALT_SHA256=$sha256" >> $GITHUB_ENV + tar -czvf mapping-${{ env.VERSION_TAG }}_gestalt.tar.gz --directory=app/build/outputs/mapping/gestaltRelease/ mapping.txt - name: Create release - if: startsWith(github.ref, 'refs/tags/') && github.repository == 'breezy-weather/breezy-weather' + if: startsWith(github.ref, 'refs/tags/') && github.repository == 'BimmerGestalt/breezy-weather' uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0 with: tag_name: ${{ env.VERSION_TAG }} @@ -134,20 +73,9 @@ jobs: ### Checksums | Flavor | Variant | SHA-256 | |---------------|-------------|----------------------------------------| - | Standard | Universal | ${{ env.APK_UNIVERSAL_SHA256 }} | - | Standard | arm64-v8a | ${{ env.APK_ARM64_V8A_SHA256 }} | - | Standard | armeabi-v7a | ${{ env.APK_ARMEABI_V7A_SHA256 }} | - | Standard | x86 | ${{ env.APK_X86_SHA256 }} | - | Standard | x86_64 | ${{ env.APK_X86_64_SHA256 }} | - | Free networks | Universal | ${{ env.APK_UNIVERSAL_FREENET_SHA256 }} | + | Gestalt | Universal | ${{ env.APK_GESTALT_SHA256 }} | files: | - breezy-weather-${{ env.VERSION_TAG }}_standard.apk - breezy-weather-arm64-v8a-${{ env.VERSION_TAG }}_standard.apk - breezy-weather-armeabi-v7a-${{ env.VERSION_TAG }}_standard.apk - breezy-weather-x86-${{ env.VERSION_TAG }}_standard.apk - breezy-weather-x86_64-${{ env.VERSION_TAG }}_standard.apk - mapping-${{ env.VERSION_TAG }}_standard.tar.gz - breezy-weather-${{ env.VERSION_TAG }}_freenet.apk - mapping-${{ env.VERSION_TAG }}_freenet.tar.gz + breezy-weather-${{ env.VERSION_TAG }}_gestalt.apk + mapping-${{ env.VERSION_TAG }}_gestalt.tar.gz draft: true prerelease: false diff --git a/README.md b/README.md index a71367c56..90eb73580 100644 --- a/README.md +++ b/README.md @@ -13,18 +13,8 @@ Jetpack Compose Material You
- License LGPL-3.0 - GitHub code size in bytes -

- - Download from GitHub - - - Download from IzzyOnDroid repo - - - Download from F-Droid default repo - + License LGPL-3.0 + GitHub code size in bytes @@ -34,7 +24,9 @@ # Download - +This is a fork adding BMW car app support. Please use the upstream if you don't need this feature: + + Get it on GitHub diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 5bc04b496..ecf6b509b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -163,6 +163,10 @@ android { dimension = "default" versionNameSuffix = "_freenet" } + create("gestalt") { + dimension = "default" + versionNameSuffix = "_gestalt" + } } sourceSets { @@ -172,6 +176,10 @@ android { getByName("freenet") { java.srcDirs("src/src_freenet") } + getByName("gestalt") { + java.srcDirs("src/src_freenet") + java.srcDirs("src/src_gestalt") + } } packaging {