[LTO22004-65] Update for android release (#39)

* Upgrade gradle version

* Add build android to package.json

* Configure abb release

* Update readme

* update app icon

* release build

* update changelog

Co-authored-by: ErnestoEsp <[email protected]>

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v2022-10-25]
+
+-   App bundle release version for Android
+
 -   [As a LTO user, I want to see an error message if wrong Qr is scanned](https://wealize.atlassian.net/browse/LTO22004-63)
 -   [As a LTO user, I want to sign in web wallet with my wallet mobile](https://wealize.atlassian.net/browse/LTO22004-37)
 -   [Add transaction confirmation dialog](https://wealize.atlassian.net/browse/LTO22004-59)

README.md

@@ -76,16 +76,31 @@ LTO_MAC_KEYSTORE_NAME=lto-android               # Your mac keychain store name (
 
 ## Prepare Android build
 
-To get a new and updated apk debug file use:
+To update `index.android.bundle` so project is prepared and updated use:
+
+```bash
+yarn build:android
+```
+
+To get a new apk debug file use:
 
 ```bash
 cd android
 ./gradlew assembleDebug
 ```
 
-This will [generate an apk](https://reactnative.dev/docs/signed-apk-android#generating-the-release-aab) for testing purposes
+This will generate APK Debug file so you can test your app on your device directly or mount it on emulator.
+
+To get an Release version use:
+
+```bash
+cd android
+./gradlew bundleRelease
+```
+
+This will bundle and generate ABB file, ready to be uploaded to Google Play Console. Follow [these indications](https://reactnative.dev/docs/signed-apk-android#generating-the-release-aab)
 
-## Prepare IOS build
+## Prepare iOS build
 
 To update `main.jsbundle` so project is prepared to be uploaded for testing purposes or to the appstore use:
 

android/app/build.gradle

@@ -134,21 +134,22 @@ def reactNativeArchitectures() {
     def value = project.getProperties().get("reactNativeArchitectures")
     return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
 }
-
-def getPassword(String currentUser, String keyChain) {
-   def stdout = new ByteArrayOutputStream()
-   def stderr = new ByteArrayOutputStream()
-   exec {
-       commandLine 'security', '-q', 'find-generic-password', '-a', currentUser, '-s', keyChain, '-w'
-       standardOutput = stdout
-       errorOutput = stderr
-       ignoreExitValue true
-   }
-   //noinspection GroovyAssignabilityCheck
-      stdout.toString().trim()
-}
-
-def pass = getPassword(LTO_MAC_USERNAME, LTO_MAC_KEYSTORE_NAME)
+// Uncomment next lines if you are using mac keychain for constants security variables and change signingConfigs.release:
+
+// def getPassword(String currentUser, String keyChain) {
+//    def stdout = new ByteArrayOutputStream()
+//    def stderr = new ByteArrayOutputStream()
+//    exec {
+//        commandLine 'security', '-q', 'find-generic-password', '-a', currentUser, '-s', keyChain, '-w'
+//        standardOutput = stdout
+//        errorOutput = stderr
+//        ignoreExitValue true
+//    }
+//    //noinspection GroovyAssignabilityCheck
+//       stdout.toString().trim()
+// }
+
+// def pass = getPassword(LTO_MAC_USERNAME, LTO_MAC_KEYSTORE_NAME)
 
 android {
     ndkVersion rootProject.ext.ndkVersion
@@ -159,7 +160,7 @@ android {
         applicationId 'lto.net.com'
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
+        versionCode 5
         versionName "1.0.0"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
@@ -253,9 +254,9 @@ android {
         release {
             if (project.hasProperty('LTO_UPLOAD_STORE_FILE')) {
                 storeFile file(LTO_UPLOAD_STORE_FILE)
-                storePassword pass
+                storePassword LTO_UPLOAD_STORE_PASSWORD
                 keyAlias LTO_UPLOAD_KEY_ALIAS
-                keyPassword pass
+                keyPassword LTO_UPLOAD_KEY_PASSWORD
             }
         }
     }

android/build.gradle

@@ -26,7 +26,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath('com.android.tools.build:gradle:7.0.4')
+        classpath('com.android.tools.build:gradle:7.2.1')
         classpath('com.facebook.react:react-native-gradle-plugin')
         classpath('de.undercouch:gradle-download-task:4.1.2')
         // NOTE: Do not place your application dependencies here; they belong

ios/LTOWallet/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -1,118 +1,154 @@
 {
   "images": [
     {
-      "idiom": "iphone",
+      "size": "1024x1024",
+      "idiom": "ios-marketing",
+      "scale": "1x",
+      "filename": "ios-marketing-1024x1024-1x.png"
+    },
+    {
       "size": "20x20",
-      "scale": "2x",
-      "filename": "[email protected]"
+      "idiom": "ipad",
+      "scale": "1x",
+      "filename": "ipad-20x20-1x.png"
     },
     {
-      "idiom": "iphone",
       "size": "20x20",
-      "scale": "3x",
-      "filename": "[email protected]"
+      "idiom": "ipad",
+      "scale": "2x",
+      "filename": "ipad-20x20-2x.png"
     },
     {
-      "idiom": "iphone",
       "size": "29x29",
+      "idiom": "ipad",
       "scale": "1x",
-      "filename": "App-Icon-29x29@1x.png"
+      "filename": "ipad-29x29-1x.png"
     },
     {
-      "idiom": "iphone",
       "size": "29x29",
+      "idiom": "ipad",
       "scale": "2x",
-      "filename": "App-Icon-29x29@2x.png"
+      "filename": "ipad-29x29-2x.png"
     },
     {
-      "idiom": "iphone",
-      "size": "29x29",
-      "scale": "3x",
-      "filename": "App-Icon-29x29@3x.png"
+      "size": "40x40",
+      "idiom": "ipad",
+      "scale": "1x",
+      "filename": "ipad-40x40-1x.png"
     },
     {
-      "idiom": "iphone",
       "size": "40x40",
+      "idiom": "ipad",
       "scale": "2x",
-      "filename": "App-Icon-40x40@2x.png"
+      "filename": "ipad-40x40-2x.png"
     },
     {
-      "idiom": "iphone",
-      "size": "40x40",
-      "scale": "3x",
-      "filename": "App-Icon-40x40@3x.png"
+      "size": "50x50",
+      "idiom": "ipad",
+      "scale": "1x",
+      "filename": "ipad-50x50-1x.png"
     },
     {
-      "idiom": "iphone",
-      "size": "60x60",
+      "size": "50x50",
+      "idiom": "ipad",
       "scale": "2x",
-      "filename": "App-Icon-60x60@2x.png"
+      "filename": "ipad-50x50-2x.png"
     },
     {
-      "idiom": "iphone",
-      "size": "60x60",
-      "scale": "3x",
-      "filename": "App-Icon-60x60@3x.png"
+      "size": "72x72",
+      "idiom": "ipad",
+      "scale": "1x",
+      "filename": "ipad-72x72-1x.png"
     },
     {
+      "size": "72x72",
+      "idiom": "ipad",
+      "scale": "2x",
+      "filename": "ipad-72x72-2x.png"
+    },
+    {
+      "size": "76x76",
       "idiom": "ipad",
-      "size": "20x20",
       "scale": "1x",
-      "filename": "App-Icon-20x20@1x.png"
+      "filename": "ipad-76x76-1x.png"
     },
     {
+      "size": "76x76",
       "idiom": "ipad",
-      "size": "20x20",
       "scale": "2x",
-      "filename": "App-Icon-20x20@2x.png"
+      "filename": "ipad-76x76-2x.png"
     },
     {
+      "size": "83.5x83.5",
       "idiom": "ipad",
+      "scale": "2x",
+      "filename": "ipad-83.5x83.5-2x.png"
+    },
+    {
+      "size": "20x20",
+      "idiom": "iphone",
+      "scale": "2x",
+      "filename": "iphone-20x20-2x.png"
+    },
+    {
+      "size": "20x20",
+      "idiom": "iphone",
+      "scale": "3x",
+      "filename": "iphone-20x20-3x.png"
+    },
+    {
       "size": "29x29",
+      "idiom": "iphone",
       "scale": "1x",
-      "filename": "App-Icon-29x29@1x.png"
+      "filename": "iphone-29x29-1x.png"
     },
     {
-      "idiom": "ipad",
       "size": "29x29",
+      "idiom": "iphone",
       "scale": "2x",
-      "filename": "App-Icon-29x29@2x.png"
+      "filename": "iphone-29x29-2x.png"
     },
     {
-      "idiom": "ipad",
-      "size": "40x40",
-      "scale": "1x",
-      "filename": "App-Icon-40x40@1x.png"
+      "size": "29x29",
+      "idiom": "iphone",
+      "scale": "3x",
+      "filename": "iphone-29x29-3x.png"
     },
     {
-      "idiom": "ipad",
       "size": "40x40",
+      "idiom": "iphone",
       "scale": "2x",
-      "filename": "App-Icon-40x40@2x.png"
+      "filename": "iphone-40x40-2x.png"
     },
     {
-      "idiom": "ipad",
-      "size": "76x76",
+      "size": "40x40",
+      "idiom": "iphone",
+      "scale": "3x",
+      "filename": "iphone-40x40-3x.png"
+    },
+    {
+      "size": "57x57",
+      "idiom": "iphone",
       "scale": "1x",
-      "filename": "App-Icon-76x76@1x.png"
+      "filename": "iphone-57x57-1x.png"
     },
     {
-      "idiom": "ipad",
-      "size": "76x76",
+      "size": "57x57",
+      "idiom": "iphone",
       "scale": "2x",
-      "filename": "App-Icon-76x76@2x.png"
+      "filename": "iphone-57x57-2x.png"
     },
     {
-      "idiom": "ipad",
-      "size": "83.5x83.5",
+      "size": "60x60",
+      "idiom": "iphone",
       "scale": "2x",
-      "filename": "App-Icon-83.5x83.5@2x.png"
+      "filename": "iphone-60x60-2x.png"
     },
     {
-      "idiom": "ios-marketing",
-      "size": "1024x1024",
-      "scale": "1x",
-      "filename": "ItunesArtwork@2x.png"
+      "size": "60x60",
+      "idiom": "iphone",
+      "scale": "3x",
+      "filename": "iphone-60x60-3x.png"
     }
   ],
   "info": {

package.json

@@ -9,7 +9,8 @@
     "test": "jest",
     "watch": "jest --watchAll",
     "postinstall": "node_modules/.bin/rn-nodeify --install crypto,assert,url,stream,events --hack",
-    "build:ios": "react-native bundle --entry-file='index.js' --bundle-output='./ios/main.jsbundle' --dev=false --platform='ios' --assets-dest='./ios'"
+    "build:ios": "react-native bundle --entry-file='index.js' --bundle-output='./ios/main.jsbundle' --dev=false --platform='ios' --assets-dest='./ios'",
+    "build:android": "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"
   },
   "jest": {
     "preset": "jest-expo"