Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge back release/1.1.29 #1233

Merged
merged 2 commits into from
Jul 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions .github/workflows/build-android-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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')
Expand All @@ -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:
Expand Down
19 changes: 18 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 1.1.29
# 1.1.30

## ✨ Features

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions ios/CozyReactNative/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.1.28</string>
<string>1.1.29</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand All @@ -85,7 +85,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>0101282</string>
<string>0101295</string>
<key>FIREBASE_ANALYTICS_COLLECTION_DEACTIVATED</key>
<true/>
<key>FirebaseDataCollectionDefaultEnabled</key>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Loading