digidem · achou11 · Jan 20, 2022 · Sep 7, 2021 · Nov 8, 2021 · Nov 8, 2021
diff --git a/.flowconfig b/.flowconfig
@@ -51,8 +51,7 @@ node_modules/react-native/flow/
 [options]
 emoji=true
 
-esproposal.optional_chaining=enable
-esproposal.nullish_coalescing=enable
+exact_by_default=true
 
 module.file_ext=.js
 module.file_ext=.json
@@ -68,10 +67,6 @@ suppress_type=$FlowFixMe
 suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)?:? #[0-9]+
-suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
-
 [lints]
 sketchy-null-number=warn
 sketchy-null-mixed=warn
@@ -82,7 +77,6 @@ deprecated-type=warn
 unsafe-getters-setters=warn
 unnecessary-invariant=warn
 signature-verification-failure=warn
-deprecated-utility=error
 
 [strict]
 deprecated-type
@@ -94,4 +88,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.122.0
+^0.149.0
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,3 @@
-*.pbxproj -text
-# specific for windows script files
+# Windows files should use crlf line endings
+# https://help.github.com/articles/dealing-with-line-endings/
 *.bat text eol=crlf
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -57,7 +57,9 @@ jobs:
           path: android/build/nodejs-native-assets
           key: ${{ runner.os }}-nodejs-mobile-${{ hashFiles('src/backend/package-lock.json') }}
       - name: Node
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
+        with:
+          node-version: "12.16.3"
       - name: Use specific Java version for sdkmanager to work
         uses: joschi/setup-jdk@v2
         with:
@@ -103,7 +105,9 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node-
       - name: Node
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
+        with:
+          node-version: "12.16.3"
       - name: Use specific Java version for sdkmanager to work
         uses: joschi/setup-jdk@v2
         with:

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -141,7 +141,6 @@ def jscFlavor = 'org.webkit:android-jsc:+'
  */
 def enableHermes = project.ext.react.get("enableHermes", false);
 
-
 def loadDotEnv() {
     def envFile = ".env"
 
@@ -228,6 +227,11 @@ android {
         versionName myVersionName
         archivesBaseName = "mapeo"
 
+        // For nodejs-mobile. If this is not set, then nodejs-mobile thinks that this is an empty array, so it does not do any native builds
+        ndk {
+            abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
+        }
+
         // Detox integration
         testBuildType System.getProperty('testBuildType', 'debug')  // This will later be used to control the test apk build type
         testInstrumentationRunner 'com.mapeo.DetoxTestAppJUnitRunner'
@@ -320,6 +324,7 @@ android {
         variant.outputs.each { output ->
             // For each separate APK per architecture, set a unique version code as described here:
             // https://developer.android.com/studio/build/configure-apk-splits.html
+            // Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc.
             def versionCodes = ["armeabi-v7a":1, "x86":2, "arm64-v8a": 3, "x86_64": 4]
             def abi = output.getFilter(OutputFile.ABI)
             if (abi != null) {  // null for the universal-debug, universal-release variants
@@ -351,24 +356,18 @@ android {
     }
 }
 
-configurations.all {
-    resolutionStrategy {
-        force "com.facebook.soloader:soloader:0.8.0"
-    }
-}
-
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules
     // Add v8-android - prebuilt libv8.so into APK
-    implementation 'org.chromium:v8-android:+'
+    implementation 'org.chromium:v8-android:9.93.+'
 
     addUnimodulesDependencies()
 
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
     debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
-      exclude group:'com.facebook.fbjni'
+        exclude group:'com.facebook.fbjni'
     }
     debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
         exclude group:'com.facebook.flipper'
@@ -394,7 +393,7 @@ dependencies {
 // 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
+    from configurations.implementation
     into 'libs'
 }
 

diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
@@ -2,7 +2,10 @@
 <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 android:usesCleartextTraffic="true" 
-    tools:targetApi="28" 
-    tools:ignore="GoogleAppIndexingWarning" />
+    <application
+        android:usesCleartextTraffic="true"
+        tools:targetApi="28"
+        tools:ignore="GoogleAppIndexingWarning">
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+    </application>
 </manifest>
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -53,7 +53,6 @@
       </intent-filter>
 
     </activity>
-    <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
     <provider android:name="androidx.core.content.FileProvider"
       android:authorities="${applicationId}.provider"
       android:grantUriPermissions="true"

diff --git a/android/app/src/main/java/com/mapeo/MainApplication.java b/android/app/src/main/java/com/mapeo/MainApplication.java
@@ -19,8 +19,6 @@
 import org.unimodules.adapters.react.ReactModuleRegistryProvider;
 import org.unimodules.core.interfaces.SingletonModule;
 
-import com.mapbox.rctmgl.RCTMGLPackage;
-
 import com.mapeo.AppInfoPackage;
 import com.mapeo.ApkInstallerPackage;
 

diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
@@ -2,11 +2,22 @@
 
     <!-- Base application theme. -->
     <style name="AppTheme" 
-        parent="Theme.AppCompat.Light.NoActionBar">
+        parent="Theme.AppCompat.DayNight.NoActionBar">
         <!-- This stops you seeing a white screen before the spash screen -->
         <item name="android:windowDisablePreview">true</item>
         <!-- Customize your theme here. -->
         <item name="android:textColor">#000000</item>
+        <item name="android:alertDialogTheme">@style/ThemeAlert</item>
+    </style>
+
+    <!-- https://stackoverflow.com/a/42533536 -->
+    <style name="ThemeAlert" parent="Theme.AppCompat.DayNight.Dialog.Alert">
+        <!-- Used for the buttons -->
+        <!-- <item name="colorAccent"></item> -->
+        <!-- Used for the title and text -->
+        <item name="android:textColorPrimary">#000000</item>
+        <!-- Used for the background -->
+        <item name="android:background">#ffffff</item>
     </style>
 
 </resources>
diff --git a/android/build.gradle b/android/build.gradle
@@ -2,26 +2,27 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "29.0.2"
+        buildToolsVersion = "30.0.2"
         // Android 5.0 - requirement for expo unimodules
         minSdkVersion = 21
-        compileSdkVersion = 29
-        targetSdkVersion = 29
-        supportLibVersion = "29.0.0"
+        compileSdkVersion = 30
+        targetSdkVersion = 30
+        supportLibVersion = "30.0.0"
         // Kotlin is needed by Detox testing framework and react-native-screens
         kotlinVersion = "1.6.10"
         ndkVersion = "21.4.7075529"
     }
     repositories {
         google()
         mavenCentral()
+        // Needed for Mapbox deps, see https://github.com/react-native-mapbox-gl/maps/issues/1572
         jcenter()
         maven { url("$rootDir/../node_modules/react-native/android") }
         maven { url("https://www.jitpack.io") }
         maven { url("https://maven.google.com") }
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.5.4")
+        classpath("com.android.tools.build:gradle:4.2.2")
         // Bugsnag plugin for uploading source maps and symbols to bugsnag
         classpath 'com.bugsnag:bugsnag-android-gradle-plugin:5.+'
         // Used in ./app/build.gradle to parse app version for Bugsnag
@@ -52,6 +53,7 @@ allprojects {
         }
         google()
         mavenCentral()
+        // Needed for Mapbox deps, see https://github.com/react-native-mapbox-gl/maps/issues/1572
         jcenter()
         maven { url 'https://www.jitpack.io' }
         maven {

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -25,4 +25,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.54.0
+FLIPPER_VERSION=0.99.0
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/android/gradlew.bat b/android/gradlew.bat
diff --git a/ios/Podfile b/ios/Podfile
@@ -1,12 +1,16 @@
 require_relative '../node_modules/react-native/scripts/react_native_pods'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 
-platform :ios, '10.0'
+platform :ios, '11.0'
 
 target 'mapeo' do
   config = use_native_modules!
 
-  use_react_native!(:path => config["reactNativePath"])
+  use_react_native!(
+    :path => config[:reactNativePath],
+    # to enable hermes on iOS, change `false` to `true` and then install pods
+    :hermes_enabled => false
+  )
 
   target 'mapeoTests' do
     inherit! :complete
@@ -16,19 +20,11 @@ target 'mapeo' do
   # Enables Flipper.
   #
   # Note that if you have use_frameworks! enabled, Flipper will not work and
-  # you should disable these next few lines.
-  use_flipper!
-  post_install do |installer|
-    flipper_post_install(installer)
-  end
-end
-
-target 'mapeo-tvOS' do
-  # Pods for mapeo-tvOS
+  # you should disable the next line.
+  use_flipper!()
 
-  target 'mapeo-tvOSTests' do
-    inherit! :search_paths
-    # Pods for testing
+  post_install do |installer|
+    react_native_post_install(installer)
+    __apply_Xcode_12_5_M1_post_install_workaround(installer)
   end
-
 end
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -397,7 +397,7 @@ DEPENDENCIES:
   - ReactCommon/callinvoker (from `../node_modules/react-native/ReactCommon`)
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
   - "ReactNativeART (from `../node_modules/@react-native-community/art`)"
-  - "RNCAsyncStorage (from `../node_modules/@react-native-community/async-storage`)"
+  - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
   - RNFS (from `../node_modules/react-native-fs`)
   - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
   - RNReanimated (from `../node_modules/react-native-reanimated`)
@@ -495,7 +495,7 @@ EXTERNAL SOURCES:
   ReactNativeART:
     :path: "../node_modules/@react-native-community/art"
   RNCAsyncStorage:
-    :path: "../node_modules/@react-native-community/async-storage"
+    :path: "../node_modules/@react-native-async-storage/async-storage"
   RNFS:
     :path: "../node_modules/react-native-fs"
   RNGestureHandler:

diff --git a/ios/mapeo.xcodeproj/xcshareddata/xcschemes/mapeo.xcscheme b/ios/mapeo.xcodeproj/xcshareddata/xcschemes/mapeo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1210"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"

diff --git a/ios/mapeo/AppDelegate.m b/ios/mapeo/AppDelegate.m
@@ -36,7 +36,11 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
                                                    moduleName:@"RnDiffApp"
                                             initialProperties:nil];
 
-  rootView.backgroundColor = [[UIColor alloc] initWithRed:1.0f green:1.0f blue:1.0f alpha:1];
+  if (@available(iOS 13.0, *)) {
+      rootView.backgroundColor = [UIColor systemBackgroundColor];
+  } else {
+      rootView.backgroundColor = [UIColor whiteColor];
+  }
 
   self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
   UIViewController *rootViewController = [UIViewController new];

diff --git a/ios/mapeo/Info.plist b/ios/mapeo/Info.plist
@@ -26,8 +26,6 @@
 	<true/>
 	<key>NSAppTransportSecurity</key>
 	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
 		<key>NSExceptionDomains</key>
 		<dict>
 			<key>localhost</key>