From 23789c328697a7317e5a7dec11f9fbbfd4b9aa96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Poizat?= Date: Thu, 11 Jul 2024 14:25:21 +0200 Subject: [PATCH 1/2] feat: Upload AAB artifact to GitHub --- .github/workflows/build-android-prod.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-android-prod.yml b/.github/workflows/build-android-prod.yml index 37f0f080b..10b9ccc16 100644 --- a/.github/workflows/build-android-prod.yml +++ b/.github/workflows/build-android-prod.yml @@ -98,6 +98,12 @@ jobs: env: BUILD_TOOLS_VERSION: "33.0.0" + - name: Upload AAB artifact to GitHub + uses: actions/upload-artifact@v3 + with: + name: AAB + path: android/app/build/outputs/bundle/prodRelease/*.aab + - name: Upload App to Google Play uses: r0adkll/upload-google-play@v1 with: @@ -125,13 +131,13 @@ jobs: --ks-pass=pass:${{ secrets[format('{0}_ANDROID_KEY_STORE_PASSWORD', inputs.brand)] }} \ --ks-key-alias=${{ secrets[format('{0}_ANDROID_ALIAS', inputs.brand)] }} \ --key-pass=pass:${{ secrets[format('{0}_ANDROID_KEY_PASSWORD', inputs.brand)] }} - + - name: Rename .apks file to .zip run: mv app-prod-release.apks app-prod-release.zip - + - name: Unzip the universal APK from the .zip file run: unzip app-prod-release.zip -d ./extracted-apks - + - name: Rename and move Universal APK run: | APK_PATH=$(find ./extracted-apks -name '*.apk') @@ -146,7 +152,7 @@ jobs: echo "ARTIFACT_NAME=$ARTIFACT_NAME" >> $GITHUB_ENV echo "::set-output name=artifact_name::$ARTIFACT_NAME" id: artifact_info - + - name: Upload APK artifact to GitHub uses: actions/upload-artifact@v3 with: From c98d4f13449c87951cffd843b7c75d566469cafb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Poizat?= Date: Wed, 10 Jul 2024 11:10:20 +0200 Subject: [PATCH 2/2] feat: Bump app version to 1.1.29 --- CHANGELOG.md | 19 ++++++++++++++++++- android/app/build.gradle | 4 ++-- ios/CozyReactNative/Info.plist | 4 ++-- package.json | 2 +- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6cd130e98..4a5759d84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 1.1.29 +# 1.1.30 ## ✨ Features @@ -9,6 +9,23 @@ ## 🔧 Tech +# 1.1.29 + +## ✨ Features + + +## 🐛 Bug Fixes + + +## 🔧 Tech +* Full dark mode support. Not enabled generally for the moment. ([PR #1222](https://github.com/cozy/cozy-flagship-app/pull/1222), [PR #1223](https://github.com/cozy/cozy-flagship-app/pull/1223), [PR #1228](https://github.com/cozy/cozy-flagship-app/pull/1228), [PR #1231](https://github.com/cozy/cozy-flagship-app/pull/1231)) +* Update to React Native 0.72.12 ([PR #1161](https://github.com/cozy/cozy-flagship-app/pull/1161)) +* Target Android API 34 ([PR #1225](https://github.com/cozy/cozy-flagship-app/pull/1225), [PR #1232](https://github.com/cozy/cozy-flagship-app/pull/1232)) +* Add check on language files and add missing translations for en and es files ([PR #999](https://github.com/cozy/cozy-flagship-app/pull/999)) +* Update react-native-background-geolocation ([PR #1227](https://github.com/cozy/cozy-flagship-app/pull/1227)) +* Fix build related to react-native-gzip ([PR #1229](https://github.com/cozy/cozy-flagship-app/pull/1229)) +* Fix build related to AndroidManifest ([PR #1230](https://github.com/cozy/cozy-flagship-app/pull/1230)) + # 1.1.28 ## ✨ Features diff --git a/android/app/build.gradle b/android/app/build.gradle index b7e8cf739..bd2a56b95 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -99,8 +99,8 @@ android { // if absent use `yarn brand:configure:cozy` to create it minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 101282 * 10000 // Legacy version number patch, needed for Play Store version increment - versionName "1.1.28" + versionCode 101295 * 10000 // Legacy version number patch, needed for Play Store version increment + versionName "1.1.29" multiDexEnabled true resValue "string", "build_config_package", "io.cozy.flagship.mobile" missingDimensionStrategy "store", "play" diff --git a/ios/CozyReactNative/Info.plist b/ios/CozyReactNative/Info.plist index ddebf9aed..59be93e5d 100644 --- a/ios/CozyReactNative/Info.plist +++ b/ios/CozyReactNative/Info.plist @@ -60,7 +60,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.1.28 + 1.1.29 CFBundleSignature ???? CFBundleURLTypes @@ -85,7 +85,7 @@ CFBundleVersion - 0101282 + 0101295 FIREBASE_ANALYTICS_COLLECTION_DEACTIVATED FirebaseDataCollectionDefaultEnabled diff --git a/package.json b/package.json index 80821bf9c..932b0b03d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cozy-react-native", - "version": "1.1.28", + "version": "1.1.29", "private": true, "scripts": { "android": "react-native run-android --variant=devDebug --main-activity=MainActivitybase",