Bump version and android debug build script (#76)

app/.gitignore

@@ -34,6 +34,8 @@ local.properties
 .cxx/
 *.keystore
 !debug.keystore
+# debug bundled builds
+android/app/src/main/
 
 # node.js
 #

app/android/app/build.gradle

@@ -85,8 +85,8 @@ android {
         applicationId "com.proofofpassportapp"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 19
-        versionName "1.8"
+        versionCode 21
+        versionName "2.2.3"
         externalNativeBuild {
             cmake {
                 cppFlags += "-fexceptions -frtti -std=c++11"

app/ios/OpenPassport.xcodeproj/project.pbxproj

@@ -546,7 +546,7 @@
 				CODE_SIGN_ENTITLEMENTS = OpenPassport/OpenPassportDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 72;
+				CURRENT_PROJECT_VERSION = 80;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 5B29R5LYHQ;
 				ENABLE_BITCODE = NO;
@@ -661,7 +661,7 @@
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/MoproKit/Libs",
 				);
-				MARKETING_VERSION = 2.0.6;
+				MARKETING_VERSION = 2.2.3;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -684,7 +684,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = OpenPassport/OpenPassport.entitlements;
-				CURRENT_PROJECT_VERSION = 72;
+				CURRENT_PROJECT_VERSION = 80;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 5B29R5LYHQ;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -798,7 +798,7 @@
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/MoproKit/Libs",
 				);
-				MARKETING_VERSION = 2.0.6;
+				MARKETING_VERSION = 2.2.3;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

app/ios/OpenPassport/Info.plist

@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleGetInfoString</key>
-	<string/>
+	<string />
 	<key>CFBundleIconName</key>
 	<string>AppIcon</string>
 	<key>CFBundleIdentifier</key>
@@ -27,26 +27,26 @@
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSApplicationCategoryType</key>
-	<string/>
+	<string />
 	<key>LSRequiresIPhoneOS</key>
-	<true/>
+	<true />
 	<key>NFCReaderUsageDescription</key>
 	<string>Need NFC to read Passport</string>
 	<key>NSAppTransportSecurity</key>
-	<string/>
+	<string />
   <!-- Do not change NSAllowsArbitraryLoads to true, or you will risk app rejection! -->
 	<key>NSAllowsArbitraryLoads</key>
-	<false/>
+	<false />
 	<key>NSAllowsLocalNetworking</key>
-	<true/>
+	<true />
 	<key>NSCameraUsageDescription</key>
 	<string>Needed to scan the passport MRZ.</string>
 	<key>NSFaceIDUsageDescription</key>
 	<string>Needed to secure the secret</string>
 	<key>NSHumanReadableCopyright</key>
-	<string/>
+	<string />
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string/>
+	<string />
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>We need access to your photo library to allow you to choose passport photos or save generated QR codes.</string>
 	<key>UILaunchStoryboardName</key>
@@ -62,7 +62,7 @@
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
+	<false />
 	<key>com.apple.developer.nfc.readersession.iso7816.select-identifiers</key>
 	<array>
 		<string>A0000002471001</string>

app/package.json

@@ -1,11 +1,13 @@
 {
   "name": "openpassport",
-  "version": "0.0.1",
+  "version": "2.2.2",
   "private": true,
   "scripts": {
     "analyze-android": "react-native-bundle-visualizer --platform android --dev",
     "analyze-ios": "react-native-bundle-visualizer --platform ios --dev",
     "android": "react-native run-android",
+    "android:build-debug": "cd ./android && yarn android:build-debug-bundle && ./gradlew clean assembleDebug && cd ..",
+    "android:build-debug-bundle": "yarn react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/",
     "clean": "watchman watch-del-all && rm -rf node_modules ios/Pods ios/build android/app/build android/build .yarn/cache ios/.xcode.env.local",
     "clean:xcode-env-local": "rm -f ios/.xcode.env.local",
     "fmt": "prettier --check .",
@@ -16,6 +18,7 @@
     "lint": "eslint .",
     "lint:fix": "eslint --fix .",
     "nice": "yarn fmt:fix && yarn lint:fix",
+    "reinstall": "yarn clean && yarn install && yarn install-app",
     "start": "watchman watch-del-all && react-native start",
     "test": "jest --passWithNoTests"
   },

app/src/Navigation.tsx

@@ -281,7 +281,6 @@ const AppNavigation = createNativeStackNavigator({
     DevSettings: {
       screen: DevSettingsScreen,
       options: {
-        if: () => __DEV__,
         title: 'Developer Settings',
         headerStyle: {
           backgroundColor: white,

app/src/screens/SplashScreen.tsx

@@ -12,7 +12,7 @@ import { impactLight } from '../utils/haptic';
 const SplashScreen: React.FC = ({}) => {
   const navigation = useNavigation();
   const { userLoaded, passportData } = useUserStore();
-  // TODO: Uncomment when we are done testing
+
   const redirect = useCallback(() => {
     if (userLoaded && passportData) {
       navigation.navigate('Home');