Merge branch 'develop' into bump-bindings

Emurgo · Jan 17, 2022 · 927b8bb · 927b8bb
2 parents fc6cd20 + 2fefa78
commit 927b8bb
Show file tree

Hide file tree

Showing 18 changed files with 207 additions and 103 deletions.
diff --git a/install-release.sh b/install-release.sh
@@ -25,48 +25,81 @@ function prompt() {
   then exit; fi
 }
 
-prompt "Android : bump";
+function bumpAndroid() {
+  APP_GRADLE_FILE='android/app/build.gradle'
+  TMP_FILE='zzzzz.tmp'
 
-APP_GRADLE_FILE='android/app/build.gradle'
-TMP_FILE='zzzzz.tmp'
+  VC='versionCode'
+  VN='versionName'
 
-VC='versionCode'
-VN='versionName'
+  versionCode=$(grep "$VC " $APP_GRADLE_FILE | awk '{print $2}')
+  versionName=$(grep "$VN " $APP_GRADLE_FILE | awk '{print $2}' | tr -d '"')
+  nextVersionCode=$(($versionCode + 1))
 
-versionCode=$(grep "$VC " $APP_GRADLE_FILE | awk '{print $2}')
-versionName=$(grep "$VN " $APP_GRADLE_FILE | awk '{print $2}' | tr -d '"')
-nextVersionCode=$(($versionCode + 1))
+  echo "Version code: ${versionCode}"
+  echo "Next version code: ${nextVersionCode}"
 
-echo "Version code: ${versionCode}"
-echo "Next version code: ${nextVersionCode}"
+  echo "Version name: ${versionName}"
+  nextVersionName=$(ask "Next version name? (Skip to use same)")
+  if [ -z ${nextVersionName} ]
+  then nextVersionName=${versionName}; fi
+  echo "Next version name: ${nextVersionName}"
 
-echo "Version name: ${versionName}"
-nextVersionName=$(ask "Next version name? (Skip to use same)")
-if [ -z ${nextVersionName} ]
-then nextVersionName=${versionName}; fi
-echo "Next version name: ${nextVersionName}"
+  OLD_VC_LINE="$VC ${versionCode}"
+  OLD_VN_LINE="$VN \\\"${versionName}\\\""
+  VC_LINE="$VC ${nextVersionCode}"
+  VN_LINE="$VN \\\"${nextVersionName}\\\""
+  awk "{sub(/$OLD_VC_LINE/,\"$VC_LINE\")}1 {sub(/$OLD_VN_LINE/,\"$VN_LINE\")}1" $APP_GRADLE_FILE > $TMP_FILE && mv $TMP_FILE $APP_GRADLE_FILE
 
-OLD_VC_LINE="$VC ${versionCode}"
-OLD_VN_LINE="$VN \\\"${versionName}\\\""
-VC_LINE="$VC ${nextVersionCode}"
-VN_LINE="$VN \\\"${nextVersionName}\\\""
-awk "{sub(/$OLD_VC_LINE/,\"$VC_LINE\")}1 {sub(/$OLD_VN_LINE/,\"$VN_LINE\")}1" $APP_GRADLE_FILE > $TMP_FILE && mv $TMP_FILE $APP_GRADLE_FILE
+  echo "Bumped $APP_GRADLE_FILE"
+}
 
-echo "Bumped $APP_GRADLE_FILE"
+function buildAndroid() {
+  if ask-yn "Build nightly"
+  then BUILD_TYPE="Nightly"; BUILD_DIR="nightly";
+  elif ask-yn "Build prod"
+  then BUILD_TYPE="Mainnet"; BUILD_DIR="mainnet";
+  else echo "No build selected"; exit 1;
+  fi
 
-prompt "Android : build";
+  prompt "Android : building gradle \"${BUILD_TYPE}\""
 
-if ask-yn "Build nightly"
-then BUILD_TYPE="Nightly"; BUILD_DIR="nightly";
-else
-  if ask-yn "Build prod"
-  then BUILD_TYPE="Mainnet"; BUILD_DIR="mainnet";
+  (cd android; \
+  ENTRY_FILE=index.ts ./gradlew clean "assemble${BUILD_TYPE}Release" \
+  && open app/build/outputs/apk/${BUILD_DIR}/release)
+}
+
+function doAndroid() {
+
+  if ask-yn "Android : bump"
+  then bumpAndroid
+  fi
+
+  if ask-yn "Android : build"
+  then buildAndroid
+  fi
+}
+
+function doApple() {
+
+  prompt "!!! Cannot bump iOS versions yet! You need to bump them manually. Proceed"
+
+  if ask-yn "Build nightly"
+  then BUILD_TYPE="nightly"; BUILD_DIR="nightly";
+  elif ask-yn "Build prod"
+  then BUILD_TYPE="mainnet"; BUILD_DIR="mainnet";
   else echo "No build selected"; exit 1;
   fi
-fi
 
-prompt "Android : building \"${BUILD_TYPE}\""
+  prompt "Apple : building fastlane \"${BUILD_TYPE}\""
+
+  (cd ios; fastlane ios ${BUILD_TYPE})
+}
+
+if ask-yn "Do Android"
+then doAndroid
+fi
 
-(cd android; \
-ENTRY_FILE=index.ts ./gradlew clean "assemble${BUILD_TYPE}Release" \
-&& open app/build/outputs/apk/${BUILD_DIR}/release)
+if ask-yn "Do Apple"
+then doApple
+fi
diff --git a/ios/Nightly-Info.plist b/ios/Nightly-Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>351</string>
+	<string>353</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -593,17 +593,17 @@ SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
-  DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
+  DoubleConversion: cde416483dac037923206447da6e1454df403714
   FBLazyVector: e686045572151edef46010a6f819ade377dfeb4b
-  FBReactNativeSpec: cb0a244da26421acd471dcb12b563b7d572ce3bb
+  FBReactNativeSpec: 1ebbbd3ac408f1dc94ace2457cd8ba6d3d0d1345
   Flipper: 1bd2db48dcc31e4b167b9a33ec1df01c2ded4893
   Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
   Flipper-Folly: 755929a4f851b2fb2c347d533a23f191b008554c
   Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
   Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
   Flipper-RSocket: 127954abe8b162fcaf68d2134d34dc2bd7076154
   FlipperKit: 651f50a42eb95c01b3e89a60996dd6aded529eeb
-  glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
+  glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   MultiplatformBleAdapter: 975cfb2a333b2c42b7a11628bd100ccb61872da2
   OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b

diff --git a/ios/Staging-Info.plist b/ios/Staging-Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>351</string>
+	<string>353</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/ios/emurgo.xcodeproj/project.pbxproj b/ios/emurgo.xcodeproj/project.pbxproj
@@ -5,6 +5,7 @@
 	};
 	objectVersion = 46;
 	objects = {
+
 /* Begin PBXBuildFile section */
 		00E356F31AD99517003FC87E /* emurgoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* emurgoTests.m */; };
 		0364225EA79340159305AC26 /* Rubik-MediumItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DB1534F401F64DFEB4584FD0 /* Rubik-MediumItalic.ttf */; };
@@ -1344,7 +1345,7 @@
 				BUNDLE_ID_SUFFIX = "";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 351;
+				CURRENT_PROJECT_VERSION = 353;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
@@ -1368,7 +1369,7 @@
 				INFOPLIST_PREPROCESS = NO;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 4.5.4;
+				MARKETING_VERSION = 4.5.401;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1394,7 +1395,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 351;
+				CURRENT_PROJECT_VERSION = 353;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -1417,7 +1418,7 @@
 				INFOPLIST_PREPROCESS = NO;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 4.5.4;
+				MARKETING_VERSION = 4.5.401;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1440,7 +1441,7 @@
 				BUNDLE_DISPLAY_NAME = Yoroi;
 				BUNDLE_ID_SUFFIX = "";
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 351;
+				CURRENT_PROJECT_VERSION = 353;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
@@ -1468,7 +1469,7 @@
 					"$(inherited)",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
-				MARKETING_VERSION = 4.5.4;
+				MARKETING_VERSION = 4.5.401;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1491,7 +1492,7 @@
 				BUNDLE_DISPLAY_NAME = "Yoroi Staging";
 				BUNDLE_ID_SUFFIX = .staging;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 351;
+				CURRENT_PROJECT_VERSION = 353;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
@@ -1519,7 +1520,7 @@
 					"$(inherited)",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
-				MARKETING_VERSION = 4.5.4;
+				MARKETING_VERSION = 4.5.401;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1544,7 +1545,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 351;
+				CURRENT_PROJECT_VERSION = 353;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -1571,7 +1572,7 @@
 					"$(inherited)",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
-				MARKETING_VERSION = 4.5.4;
+				MARKETING_VERSION = 4.5.401;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1594,7 +1595,7 @@
 				BUNDLE_DISPLAY_NAME = "Yoroi Staging";
 				BUNDLE_ID_SUFFIX = .staging;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 351;
+				CURRENT_PROJECT_VERSION = 353;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -1621,7 +1622,7 @@
 					"$(inherited)",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
-				MARKETING_VERSION = 4.5.4;
+				MARKETING_VERSION = 4.5.401;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1830,7 +1831,7 @@
 				BUNDLE_ID_SUFFIX = .staging;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 351;
+				CURRENT_PROJECT_VERSION = 353;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
@@ -1854,7 +1855,7 @@
 				INFOPLIST_PREPROCESS = NO;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 4.5.4;
+				MARKETING_VERSION = 4.5.401;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1978,7 +1979,7 @@
 				BUNDLE_ID_SUFFIX = .staging;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 351;
+				CURRENT_PROJECT_VERSION = 353;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -2001,7 +2002,7 @@
 				INFOPLIST_PREPROCESS = NO;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 4.5.4;
+				MARKETING_VERSION = 4.5.401;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2063,7 +2064,7 @@
 				BUNDLE_ID_SUFFIX = "";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 351;
+				CURRENT_PROJECT_VERSION = 353;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
@@ -2087,7 +2088,7 @@
 				INFOPLIST_PREPROCESS = NO;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 4.5.4;
+				MARKETING_VERSION = 4.5.401;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2112,7 +2113,7 @@
 				BUNDLE_ID_SUFFIX = .staging;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 351;
+				CURRENT_PROJECT_VERSION = 353;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
@@ -2136,7 +2137,7 @@
 				INFOPLIST_PREPROCESS = NO;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 4.5.4;
+				MARKETING_VERSION = 4.5.401;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2162,7 +2163,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 351;
+				CURRENT_PROJECT_VERSION = 353;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -2185,7 +2186,7 @@
 				INFOPLIST_PREPROCESS = NO;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 4.5.4;
+				MARKETING_VERSION = 4.5.401;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2209,7 +2210,7 @@
 				BUNDLE_ID_SUFFIX = .staging;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 351;
+				CURRENT_PROJECT_VERSION = 353;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -2232,7 +2233,7 @@
 				INFOPLIST_PREPROCESS = NO;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 4.5.4;
+				MARKETING_VERSION = 4.5.401;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

diff --git a/ios/emurgo/Info.plist b/ios/emurgo/Info.plist
@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>351</string>
+	<string>353</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/ios/emurgoTests/Info.plist b/ios/emurgoTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>351</string>
+	<string>353</string>
 </dict>
 </plist>