From 8a126831374c4fa65de4c7e874968d6eb1095051 Mon Sep 17 00:00:00 2001 From: OmarHatem Date: Wed, 14 Dec 2022 17:19:45 +0200 Subject: [PATCH 1/5] - Update version to 4.5.3 for cakewallet; 1.2.2 for monero.com - Fix android script to injecting app details --- scripts/android/app_env.sh | 8 ++++---- scripts/android/inject_app_details.sh | 4 ++-- scripts/ios/app_env.sh | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh index d361c8dfaf..5b704eea11 100644 --- a/scripts/android/app_env.sh +++ b/scripts/android/app_env.sh @@ -14,14 +14,14 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN) APP_ANDROID_TYPE=$1 MONERO_COM_NAME="Monero.com" -MONERO_COM_VERSION="1.2.1" -MONERO_COM_BUILD_NUMBER=32 +MONERO_COM_VERSION="1.2.2" +MONERO_COM_BUILD_NUMBER=33 MONERO_COM_BUNDLE_ID="com.monero.app" MONERO_COM_PACKAGE="com.monero.app" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="4.5.1" -CAKEWALLET_BUILD_NUMBER=136 +CAKEWALLET_VERSION="4.5.3" +CAKEWALLET_BUILD_NUMBER=138 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet" CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet" diff --git a/scripts/android/inject_app_details.sh b/scripts/android/inject_app_details.sh index 6bcdf7239b..c700a8c402 100755 --- a/scripts/android/inject_app_details.sh +++ b/scripts/android/inject_app_details.sh @@ -6,6 +6,6 @@ if [ -z "$APP_ANDROID_TYPE" ]; then fi cd ../.. -sed -i "0,/version:/{s/version:.*/version: ${APP_ANDROID_VERSION}+${APP_ANDROID_BUILD_NUMBER}/}" ./pubspec.yaml -sed -i "0,/version:/{s/__APP_PACKAGE__/${APP_ANDROID_PACKAGE}/}" ./android/app/src/main/AndroidManifest.xml +sed -i '' "1,/version:.*/s/version:.*/version: ${APP_ANDROID_VERSION}+${APP_ANDROID_BUILD_NUMBER}/" ./pubspec.yaml +sed -i '' "1,/__APP_PACKAGE__/s/__APP_PACKAGE__/${APP_ANDROID_PACKAGE}/" ./android/app/src/main/AndroidManifest.xml cd scripts/android \ No newline at end of file diff --git a/scripts/ios/app_env.sh b/scripts/ios/app_env.sh index 8bb945680d..fbf8233e55 100644 --- a/scripts/ios/app_env.sh +++ b/scripts/ios/app_env.sh @@ -13,13 +13,13 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN) APP_IOS_TYPE=$1 MONERO_COM_NAME="Monero.com" -MONERO_COM_VERSION="1.2.1" -MONERO_COM_BUILD_NUMBER=29 +MONERO_COM_VERSION="1.2.2" +MONERO_COM_BUILD_NUMBER=30 MONERO_COM_BUNDLE_ID="com.cakewallet.monero" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="4.5.1" -CAKEWALLET_BUILD_NUMBER=133 +CAKEWALLET_VERSION="4.5.3" +CAKEWALLET_BUILD_NUMBER=135 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" HAVEN_NAME="Haven" From de37b25f9265d52187b43d60f0a8704c22e7be25 Mon Sep 17 00:00:00 2001 From: OmarHatem Date: Wed, 14 Dec 2022 19:19:57 +0200 Subject: [PATCH 2/5] Revert script changes in injecting app details [skip ci] --- scripts/android/inject_app_details.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/android/inject_app_details.sh b/scripts/android/inject_app_details.sh index c700a8c402..15c39bca77 100755 --- a/scripts/android/inject_app_details.sh +++ b/scripts/android/inject_app_details.sh @@ -6,6 +6,6 @@ if [ -z "$APP_ANDROID_TYPE" ]; then fi cd ../.. -sed -i '' "1,/version:.*/s/version:.*/version: ${APP_ANDROID_VERSION}+${APP_ANDROID_BUILD_NUMBER}/" ./pubspec.yaml -sed -i '' "1,/__APP_PACKAGE__/s/__APP_PACKAGE__/${APP_ANDROID_PACKAGE}/" ./android/app/src/main/AndroidManifest.xml +sed -i "0,/version:/{s/version:.*/version: ${APP_ANDROID_VERSION}+${APP_ANDROID_BUILD_NUMBER}/}" ./pubspec.yaml +sed -i "0,/version:/{s/__APP_PACKAGE__/${APP_ANDROID_PACKAGE}/}" ./android/app/src/main/AndroidManifest.xml cd scripts/android \ No newline at end of file From b4aff6746739f71464f9d2985f4a9b1e54e5e5f4 Mon Sep 17 00:00:00 2001 From: Omar Hatem Date: Wed, 14 Dec 2022 19:21:51 +0200 Subject: [PATCH 3/5] Revert script changes in injecting app details [skip ci] --- scripts/android/inject_app_details.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/android/inject_app_details.sh b/scripts/android/inject_app_details.sh index 15c39bca77..8551dc7d0a 100755 --- a/scripts/android/inject_app_details.sh +++ b/scripts/android/inject_app_details.sh @@ -6,6 +6,6 @@ if [ -z "$APP_ANDROID_TYPE" ]; then fi cd ../.. -sed -i "0,/version:/{s/version:.*/version: ${APP_ANDROID_VERSION}+${APP_ANDROID_BUILD_NUMBER}/}" ./pubspec.yaml +sed -i "0,/version:/{s/version:.*/version: ${APP_ANDROID_VERSION}+${APP_ANDROID_BUILD_NUMBER}/}" ./pubspec.yaml sed -i "0,/version:/{s/__APP_PACKAGE__/${APP_ANDROID_PACKAGE}/}" ./android/app/src/main/AndroidManifest.xml -cd scripts/android \ No newline at end of file +cd scripts/android From 853e9264acd84be98aa66508c9f0d65f4017b6d0 Mon Sep 17 00:00:00 2001 From: Omar Hatem Date: Wed, 14 Dec 2022 19:22:58 +0200 Subject: [PATCH 4/5] Revert changes in injecting app details [skip ci] From 8e01b2d67a56eac8e4378ece3a9c6d72e3e178fd Mon Sep 17 00:00:00 2001 From: OmarHatem Date: Wed, 14 Dec 2022 19:27:44 +0200 Subject: [PATCH 5/5] Revert script changes in injecting app details [skip ci] --- scripts/android/inject_app_details.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/android/inject_app_details.sh b/scripts/android/inject_app_details.sh index 8551dc7d0a..6bcdf7239b 100755 --- a/scripts/android/inject_app_details.sh +++ b/scripts/android/inject_app_details.sh @@ -8,4 +8,4 @@ fi cd ../.. sed -i "0,/version:/{s/version:.*/version: ${APP_ANDROID_VERSION}+${APP_ANDROID_BUILD_NUMBER}/}" ./pubspec.yaml sed -i "0,/version:/{s/__APP_PACKAGE__/${APP_ANDROID_PACKAGE}/}" ./android/app/src/main/AndroidManifest.xml -cd scripts/android +cd scripts/android \ No newline at end of file