Merge pull request #806 from microsoft/release/hotfix

Fix App Center build
microsoft · Feb 19, 2020 · 7085330 · 7085330
2 parents 6db3a11 + d5ef59f
commit 7085330
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 17 deletions.
diff --git a/DemoApp/android/app/build.gradle b/DemoApp/android/app/build.gradle
@@ -144,7 +144,6 @@ android {
 }
 
 dependencies {
-    implementation project(':react-native-screens')
     implementation project(':react-native-gesture-handler')
     implementation project(':appcenter')
     implementation project(':appcenter-analytics')

diff --git a/DemoApp/android/app/src/main/java/com/demoapp/MainApplication.java b/DemoApp/android/app/src/main/java/com/demoapp/MainApplication.java
@@ -7,7 +7,6 @@
 import android.util.Log;
 
 import com.facebook.react.ReactApplication;
-import com.swmansion.rnscreens.RNScreensPackage;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
@@ -38,7 +37,6 @@ public boolean getUseDeveloperSupport() {
         protected List<ReactPackage> getPackages() {
             return Arrays.asList(
                     new MainReactPackage(),
-                    new RNScreensPackage(),
                     new RNGestureHandlerPackage(),
                     new ImagePickerPackage(),
                     new RNFSPackage(),

diff --git a/DemoApp/android/settings.gradle b/DemoApp/android/settings.gradle
@@ -1,6 +1,4 @@
 rootProject.name = 'DemoApp'
-include ':react-native-screens'
-project(':react-native-screens').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-screens/android')
 include ':react-native-gesture-handler'
 project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')
 include ':react-native-image-picker'

diff --git a/DemoApp/ios/Podfile b/DemoApp/ios/Podfile
@@ -16,6 +16,4 @@ target 'DemoApp' do
   # This commented line is to avoid react-native link adding an optional dependency that is way too heavy.
   # pod 'RNGestureHandler', :path => '../node_modules/react-native-gesture-handler'
 
-  pod 'RNScreens', :path => '../node_modules/react-native-screens'
-
 end
diff --git a/DemoApp/ios/Podfile.lock b/DemoApp/ios/Podfile.lock
@@ -16,10 +16,10 @@ DEPENDENCIES:
   - AppCenterReactNativeShared (~> 3.0.0)
 
 SPEC REPOS:
-  https://github.com/CocoaPods/Specs.git:
-    - AppCenter
   https://msmobilecenter.visualstudio.com/SDK/_git/AppCenterSDK-Specs-Private:
     - AppCenterReactNativeShared
+  trunk:
+    - AppCenter
 
 SPEC CHECKSUMS:
   AppCenter: 7a0bbe928d07467ac8b2d7f6f2a675872a6471d8

diff --git a/DemoApp/package.json b/DemoApp/package.json
@@ -20,8 +20,8 @@
     "react-native-gesture-handler": "1.1.3",
     "react-native-image-picker": "0.28.1",
     "react-native-modal-selector": "1.1.2",
-    "react-native-screens": "2.0.0-alpha.34",
     "react-native-simple-toast": "0.0.8",
+    "react-native-screens": "2.0.0-alpha.34",
     "react-navigation": "3.13.0",
     "stacktrace-parser": "0.1.7"
   },

diff --git a/TestApp/ios/Podfile.lock b/TestApp/ios/Podfile.lock
@@ -249,8 +249,6 @@ PODS:
     - React
   - RNGestureHandler (1.5.0):
     - React
-  - RNScreens (2.0.0-alpha.34):
-    - React
   - Yoga (1.14.0)
 
 DEPENDENCIES:
@@ -290,7 +288,6 @@ DEPENDENCIES:
   - "RNCAsyncStorage (from `../node_modules/@react-native-community/async-storage`)"
   - RNFS (from `../node_modules/react-native-fs`)
   - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
-  - RNScreens (from `../node_modules/react-native-screens`)
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
 SPEC REPOS:
@@ -366,8 +363,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-fs"
   RNGestureHandler:
     :path: "../node_modules/react-native-gesture-handler"
-  RNScreens:
-    :path: "../node_modules/react-native-screens"
   Yoga:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
@@ -407,7 +402,6 @@ SPEC CHECKSUMS:
   RNCAsyncStorage: 5ae4d57458804e99f73d427214442a6b10a53856
   RNFS: 795866388a01de4e470f3b1041a99cf20a343844
   RNGestureHandler: a4ddde1ffc6e590c8127b8b7eabfdade45475c74
-  RNScreens: 9d8a2900cd4f967af70dbfed74b64f77fbb6600a
   Yoga: 02036f6383c0008edb7ef0773a0e6beb6ce82bd1
 
 PODFILE CHECKSUM: 64162dc4bf7d5a1f1b45d18a8143677b2578e20e

diff --git a/TestApp/package.json b/TestApp/package.json
@@ -24,7 +24,6 @@
     "react-native-gesture-handler": "1.5.0",
     "react-native-image-picker": "1.1.0",
     "react-native-modal-selector": "1.1.2",
-    "react-native-screens": "2.0.0-alpha.34",
     "react-navigation": "3.13.0"
   },
   "devDependencies": {