fix(deps): Update to Expo SDK37 (#532)

* fix(deps): Update to Expo SDK37 * Install additional packages
shootismoke · Apr 6, 2020 · eb51486 · eb51486
1 parent cf8db9b
commit eb51486
Show file tree

Hide file tree

Showing 5 changed files with 2,033 additions and 2,628 deletions.
diff --git a/App/Screens/Screens.tsx b/App/Screens/Screens.tsx
@@ -48,16 +48,12 @@ function stackNavigatorOptions(
   NavigationStackProp<NavigationRoute, any>
 > {
   return {
-    cardStyle: {
-      backgroundColor: theme.backgroundColor,
-    },
     headerMode: 'none',
     initialRouteName,
     defaultNavigationOptions: {
-      // FIXME the `headerVisible` field has been moved away from this config
-      // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-      // @ts-ignore
-      headerVisible: false,
+      cardStyle: {
+        backgroundColor: theme.backgroundColor,
+      },
     },
   };
 }

diff --git a/App/util/amplitude.ts b/App/util/amplitude.ts
@@ -70,6 +70,19 @@ export function setupAmplitude(): Promise<void> {
             sisRevisionId: Constants.manifest.revisionId || 'development',
             sisVersion: Constants.manifest.version,
           });
+          // Disable tracking all PII. Note: they are also disabled on
+          // Amplitude's dashboard.
+          // See https://help.amplitude.com/hc/en-us/articles/115002278527-iOS-SDK-Installation#disable-automatic-tracking-of-user-properties
+          // See https://help.amplitude.com/hc/en-us/articles/115002935588-Android-SDK-Installation#disable-automatic-tracking-of-user-properties
+          Amplitude.setTrackingOptions({
+            disableAdid: true,
+            disableCarrier: true,
+            disableDMA: true,
+            disableIDFA: true,
+            disableIDFV: true,
+            disableIPAddress: true,
+            disableLatLng: true,
+          });
         }
       )
     : Promise.resolve();

diff --git a/app.example.json b/app.example.json
@@ -8,10 +8,14 @@
       },
       "icon": "assets/logos/android/playstore-icon.png",
       "package": "com.shitismoke.app",
-      "permissions": ["ACCESS_FINE_LOCATION"],
+      "permissions": [
+        "ACCESS_FINE_LOCATION"
+      ],
       "versionCode": 13
     },
-    "assetBundlePatterns": ["assets/**/*"],
+    "assetBundlePatterns": [
+      "assets/**/*"
+    ],
     "backgroundColor": "#FAFAFC",
     "extra": {
       "aqicnToken": "6bb4237574756ba29f05cea553bd22576596c11e",
@@ -50,7 +54,6 @@
     },
     "primaryColor": "#EBE7DD",
     "privacy": "public",
-    "sdkVersion": "36.0.0",
     "slug": "shootismoke",
     "splash": {
       "backgroundColor": "#EBE7DD",

diff --git a/package.json b/package.json
@@ -21,38 +21,41 @@
     "@expo/react-native-action-sheet": "^3.5.0",
     "@expo/vector-icons": "^10.0.0",
     "@hapi/hawk": "^8.0.0",
+    "@react-native-community/masked-view": "0.1.6",
     "@shootismoke/convert": "^0.2.8",
     "@shootismoke/dataproviders": "^0.2.23",
     "@shootismoke/graphql": "^0.2.22",
     "@types/haversine": "^1.1.4",
     "@types/i18n-js": "^3.0.1",
     "@types/p-any": "^1.1.3",
-    "@types/react-native": "^0.62.0",
+    "@types/react-native": "^0.60.22",
     "apollo-cache-persist": "^0.1.1",
     "date-fns": "^2.11.1",
-    "expo": "^36.0.0",
-    "expo-analytics-amplitude": "~8.0.0",
-    "expo-av": "~8.0.0",
-    "expo-constants": "~8.0.0",
-    "expo-font": "~8.0.0",
-    "expo-localization": "~8.0.0",
-    "expo-location": "~8.0.0",
-    "expo-permissions": "~8.0.0",
+    "expo": "^37.0.0",
+    "expo-analytics-amplitude": "~8.1.0",
+    "expo-av": "~8.1.0",
+    "expo-constants": "~9.0.0",
+    "expo-font": "~8.1.0",
+    "expo-localization": "~8.1.0",
+    "expo-location": "~8.1.0",
+    "expo-permissions": "~8.1.0",
     "graphql": "^14.6.0",
     "haversine": "^1.1.1",
     "i18n-js": "^3.5.1",
     "lottie-react-native": "~2.6.1",
     "p-any": "^3.0.0",
     "react": "16.9.0",
-    "react-native": "https://github.com/expo/react-native/archive/sdk-36.0.1.tar.gz",
-    "react-native-gesture-handler": "~1.5.0",
+    "react-native": "https://github.com/expo/react-native/archive/sdk-37.0.0.tar.gz",
+    "react-native-gesture-handler": "~1.6.0",
     "react-native-maps": "0.26.1",
-    "react-native-reanimated": "~1.4.0",
+    "react-native-reanimated": "~1.7.0",
+    "react-native-safe-area-context": "0.7.3",
+    "react-native-screens": "~2.2.0",
     "react-native-scroll-into-view": "^1.0.3",
     "react-native-size-matters": "^0.3.0",
-    "react-native-view-shot": "3.0.2",
-    "react-navigation": "^4.0.10",
-    "react-navigation-stack": "^1.8.1",
+    "react-native-view-shot": "3.1.2",
+    "react-navigation": "^4.3.7",
+    "react-navigation-stack": "^2.3.11",
     "react-navigation-transitions": "^1.0.12",
     "retry-ts": "^0.1.2",
     "sentry-expo": "~2.0.3",
@@ -62,7 +65,7 @@
     "@amaurymartiny/config": "^1.1.0",
     "@types/jest": "^25.1.4",
     "jest": "^24.9.0",
-    "jest-expo": "^36.0.0",
+    "jest-expo": "^37.0.0",
     "ts-jest": "^24.3.0",
     "typescript": "^3.8.3"
   }