Merge pull request #3557 from StoDevX/rn0_59

Upgrade to React-Native v0.59

Author: hawkrives

.circleci/config.yml

@@ -322,8 +322,10 @@ jobs:
       - run:
           name: Download Android dependencies
           command: cd android && ./gradlew androidDependencies --console=plain
-          environment: {TERM: xterm-256color}
+          environment:
+            TERM: xterm-256color
       - gradle-cache
+      - run: echo 'org.gradle.workers.max=2' >> ./android/gradle.properties
       - run:
           name: Run Fastlane
           command: bundle exec fastlane android ci-run | tee ./logs/build

.flowconfig

@@ -9,15 +9,14 @@
 ; remove this after rn-linear-gradient fixes their @flow/no type arguments issue
 .*/node_modules/react-native-linear-gradient/.*
 
-; remove after github.com/react-native-community/react-native-safe-area-view/pull/57 is merged
-.*/node_modules/react-native-safe-area-view/.*
+.*/node_modules/@callstack/react-theme-provider/.*
+.*/node_modules/react-native-paper/.*
 
 [include]
 
 [libs]
 node_modules/react-native/Libraries/react-native/react-native-interface.js
 node_modules/react-native/flow/
-node_modules/react-native/flow-github/
 flow-typed/
 
 [options]
@@ -58,10 +57,10 @@ suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
 suppress_type=$FixMe
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(7[0-8]\\|[1-6][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(7[0-8]\\|[1-6][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(9[0-2]\\|[1-8][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(9[0-2]\\|[1-8][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
 [version]
-^0.78.0
+^0.92.0

CHANGELOG.md

@@ -46,6 +46,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Updated to CircleCI 2.1 configuration syntax (#3512)
 - Adjusted how we present the BonApp ultimatum on first visiting the Balances tab (#3515)
 - Changed the `data` prop on fancy-menu to be `extraData` (#3528)
+- Upgraded to RN 0.59 (#3557)
 
 ### Fixed
 - Fixed an issue where Fastlane was reporting build failures despite having skipped the build (#3215)

android/app/BUCK

@@ -1,4 +1,7 @@
-apply plugin: "com.android.application"
+// this includes the onesignal gradle plugin
+apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'
+// this plugin adapts the gradle build for android apps
+apply plugin: 'com.android.application'
 
 /**
  * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
@@ -94,18 +97,19 @@ def enableSeparateBuildPerCPUArchitecture = false
  */
 def enableProguardInReleaseBuilds = false
 
-def COMPILE_SDK_VERSION = 28
-def TARGET_SDK_VERSION = 28
-def ANDROID_SUPPORT_LIBRARY_VERSION = '27.1.1'
-
 android {
-    compileSdkVersion COMPILE_SDK_VERSION
+    compileSdkVersion rootProject.ext.compileSdkVersion
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 
     defaultConfig {
         applicationId "com.allaboutolaf"
 
-        minSdkVersion 21
-        targetSdkVersion TARGET_SDK_VERSION
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
 
         versionCode 1
         versionName "1.0.0"
@@ -115,16 +119,6 @@ android {
             BUGSNAG_KEY: System.getenv("BUGSNAG_KEY") ?: "",
             onesignal_google_project_number: "REMOTE",
         ]
-
-        ndk {
-            abiFilters "armeabi-v7a", "x86"
-        }
-    }
-
-    ext {
-        compileSdkVersion = COMPILE_SDK_VERSION
-        targetSdkVersion = TARGET_SDK_VERSION
-        androidSupportLibraryVersion = ANDROID_SUPPORT_LIBRARY_VERSION
     }
 
     signingConfigs {
@@ -137,7 +131,7 @@ android {
             reset()
             enable enableSeparateBuildPerCPUArchitecture
             universalApk false  // If true, also generate a universal APK
-            include "armeabi-v7a", "x86"
+            include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }
     }
 
@@ -163,7 +157,7 @@ android {
 
             // For each separate APK per architecture, set a unique version code as described here:
             // http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits
-            // def versionCodes = ["armeabi-v7a":1, "x86":2, nil:2]
+            // def versionCodes = ["armeabi-v7a":1, "x86":2, nil:2, "arm64-v8a": 3, "x86_64": 4]
 
             // `abi` is null for the universal-debug, universal-release variants
             // def abi = output.getFilter(OutputFile.ABI)
@@ -183,10 +177,10 @@ android {
     }
 
     configurations.all {
-        resolutionStrategy.force "com.android.support:appcompat-v7:$ANDROID_SUPPORT_LIBRARY_VERSION"
-        resolutionStrategy.force "com.android.support:customtabs:$ANDROID_SUPPORT_LIBRARY_VERSION"
-        resolutionStrategy.force "com.android.support:support-media-compat:$ANDROID_SUPPORT_LIBRARY_VERSION"
-        resolutionStrategy.force "com.android.support:support-v4:$ANDROID_SUPPORT_LIBRARY_VERSION"
+        resolutionStrategy.force "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
+        resolutionStrategy.force "com.android.support:customtabs:${rootProject.ext.supportLibVersion}"
+        resolutionStrategy.force "com.android.support:support-media-compat:${rootProject.ext.supportLibVersion}"
+        resolutionStrategy.force "com.android.support:support-v4:${rootProject.ext.supportLibVersion}"
 
         resolutionStrategy.force 'org.webkit:android-jsc:r236355'
     }
@@ -197,12 +191,13 @@ def propFile = new File('android/app/signing.properties')
 if (propFile.canRead()) {
     Properties props = new Properties()
     props.load(new FileInputStream(propFile))
-    if (props != null
-            && props.containsKey('STORE_FILE')
-            && props.containsKey('STORE_PASSWORD')
-            && props.containsKey('KEY_ALIAS')
-            && props.containsKey('KEY_PASSWORD')
-    ) {
+
+    bool hasFile = props != null && props.containsKey('STORE_FILE');
+    bool hasPassword = props != null && props.containsKey('STORE_PASSWORD');
+    bool hasAlias = props != null && props.containsKey('KEY_ALIAS');
+    bool hasKeyPass = props != null && props.containsKey('KEY_PASSWORD');
+
+    if (hasFile && hasPassword && hasAlias && hasKeyPass) {
         logger.info 'android/app/signing.properties is fully functional.'
         android.signingConfigs.release.storeFile = file(props['STORE_FILE'])
         android.signingConfigs.release.storePassword = props['STORE_PASSWORD']
@@ -213,10 +208,10 @@ if (propFile.canRead()) {
         if (props == null) {
             logger.warn '`props` was null'
         } else {
-            logger.warn "has STORE_FILE: ${props.containsKey('STORE_FILE')}"
-            logger.warn "has STORE_PASSWORD: ${props.containsKey('STORE_PASSWORD')}"
-            logger.warn "has KEY_ALIAS: ${props.containsKey('KEY_ALIAS')}"
-            logger.warn "has KEY_PASSWORD: ${props.containsKey('KEY_PASSWORD')}"
+            logger.warn "has STORE_FILE [y/n]: ${props.containsKey('STORE_FILE')}"
+            logger.warn "has STORE_PASSWORD [y/n]: ${props.containsKey('STORE_PASSWORD')}"
+            logger.warn "has KEY_ALIAS [y/n]: ${props.containsKey('KEY_ALIAS')}"
+            logger.warn "has KEY_PASSWORD [y/n]: ${props.containsKey('KEY_PASSWORD')}"
         }
         android.buildTypes.release.signingConfig = null
     }
@@ -240,20 +235,15 @@ dependencies {
     implementation project(':react-native-onesignal')
     implementation project(':react-native-restart')
     implementation project(':react-native-vector-icons')
+
     // this is for react-native itself
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "com.android.support:appcompat-v7:$ANDROID_SUPPORT_LIBRARY_VERSION"
+    implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
+
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules
 }
 
-// Run this once to be able to run the application with BUCK
-// puts all compile dependencies into folder libs for BUCK to use
-task copyDownloadableDepsToLibs(type: Copy) {
-    from configurations.compile
-    into 'libs'
-}
-
 // Bundles the app's data for the build process
 task bundleData(type: Exec) {
     workingDir '../../'
@@ -262,6 +252,10 @@ task bundleData(type: Exec) {
 
 gradle.projectsEvaluated {
     // hook bundleData into the android build process
-    bundleDebugJsAndAssets.dependsOn bundleData
-    bundleReleaseJsAndAssets.dependsOn bundleData
+    if (project.hasProperty('bundleDebugJsAndAssets')) {
+        bundleDebugJsAndAssets.dependsOn bundleData
+    }
+    if (project.hasProperty('bundleReleaseJsAndAssets')) {
+        bundleReleaseJsAndAssets.dependsOn bundleData
+    }
 }

android/app/build.gradle

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+
+    <application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" android:networkSecurityConfig="@xml/react_native_config" />
+</manifest>

android/app/src/debug/AndroidManifest.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+  <domain-config cleartextTrafficPermitted="true">
+    <domain includeSubdomains="false">localhost</domain>
+    <domain includeSubdomains="false">10.0.2.2</domain>
+    <domain includeSubdomains="false">10.0.3.2</domain>
+  </domain-config>
+</network-security-config>

android/app/src/debug/res/xml/react_native_config.xml

@@ -7,13 +7,13 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <!-- FINE_LOCATION is used for wifi reporting -->
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
     <application
         android:name=".MainApplication"
         android:allowBackup="true"
         android:label="@string/app_name"
         android:icon="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="${isDebug}"
     >

android/app/src/main/AndroidManifest.xml

@@ -2,7 +2,6 @@
 
 import android.app.Application;
 import android.net.http.HttpResponseCache;
-import android.os.Bundle;
 import android.util.Log;
 
 // keep these sorted alphabetically
@@ -11,7 +10,6 @@
 import com.BV.LinearGradient.LinearGradientPackage;
 import com.calendarevents.CalendarEventsPackage;
 import com.facebook.react.ReactApplication;
-import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
@@ -40,7 +38,7 @@ public boolean getUseDeveloperSupport() {
 
     @Override
     protected List<ReactPackage> getPackages() {
-      return Arrays.<ReactPackage>asList(
+      return Arrays.asList(
         new MainReactPackage(),
         // please keep these sorted alphabetically
         BugsnagReactNative.getPackage(),

android/app/src/main/java/com/allaboutolaf/MainApplication.java

@@ -0,0 +1 @@
+ic_launcher.png