Bump example project to RN 0.57.8

oblador · oblador · commit ef1c7f1cf25a · 2019-01-22T18:24:33.000Z
diff --git a/Example/android/build.gradle b/Example/android/build.gradle
@@ -9,8 +9,8 @@ buildscript {
         supportLibVersion = "27.1.1"
     }
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.4'
@@ -23,12 +23,12 @@ buildscript {
 allprojects {
     repositories {
         mavenLocal()
+        google()
         jcenter()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
             url "$rootDir/../node_modules/react-native/android"
         }
-        google()
     }
 }
 
diff --git a/Example/ios/Example.xcodeproj/project.pbxproj b/Example/ios/Example.xcodeproj/project.pbxproj
diff --git a/Example/ios/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme b/Example/ios/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme
@@ -6,6 +6,20 @@
       parallelizeBuildables = "NO"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "83CBBA2D1A601D0E00E9B192"
+               BuildableName = "libReact.a"
+               BlueprintName = "React"
+               ReferencedContainer = "container:../node_modules/react-native/React/React.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
diff --git a/Example/ios/Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Example/ios/Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/Example/ios/Example/AppDelegate.m b/Example/ios/Example/AppDelegate.m
@@ -16,7 +16,11 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 {
   NSURL *jsCodeLocation;
 
-  jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
+  #ifdef DEBUG
+    jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
+  #else
+    jsCodeLocation = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
+  #endif
 
   RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation
                                                       moduleName:@"Example"
diff --git a/Example/ios/Example/Info.plist b/Example/ios/Example/Info.plist
@@ -24,19 +24,6 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-		<key>NSExceptionDomains</key>
-		<dict>
-			<key>localhost</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-			</dict>
-		</dict>
-	</dict>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string></string>
 	<key>UILaunchStoryboardName</key>
@@ -53,5 +40,21 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string></string>
+	<key>NSAppTransportSecurity</key>
+	<!--See http://ste.vn/2015/06/10/configuring-app-transport-security-ios-9-osx-10-11/ -->
+	<dict>
+    <key>NSAllowsArbitraryLoads</key>
+    <true/>
+		<key>NSExceptionDomains</key>
+		<dict>
+			<key>localhost</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+			</dict>
+		</dict>
+	</dict>
 </dict>
 </plist>
diff --git a/Example/ios/Podfile b/Example/ios/Podfile
@@ -1,6 +1,25 @@
 # Uncomment the next line to define a global platform for your project
 platform :ios, '9.0'
 
+post_install do |installer|
+    patch_subspecs(installer)
+end
+
+def patch_subspecs(installer)
+  # patch source and header files
+  # `find node_modules/react-native/React node_modules/react-native/ReactCommon \\( -name *.h -o -name *.m -o -name *.mm \\) -print0 | xargs -0 sed -i '' -E 's:<(yoga|jschelpers|cxxreact)/(.*)>:"\\2":g'`
+
+  # exclude duplicate symbols
+  # https://github.com/facebook/react-native/issues/11502
+  installer.pods_project.targets.each do |target|
+    next unless target.name == 'React'
+
+    source_files = target.source_build_phase.files
+    uniqs = source_files.uniq { |f| f.file_ref.path }
+    (source_files - uniqs).each { |dup| source_files.delete(dup) }
+  end
+end
+
 target 'Example' do
   # Uncomment the next line if you're using Swift or would like to use dynamic frameworks
   # use_frameworks!
@@ -9,22 +28,22 @@ target 'Example' do
   pod 'react-native-shimmer', :path => '../../react-native-shimmer.podspec'
 
   pod 'React', :path => './../node_modules/react-native', :subspecs => [
-  'Core',
-  'CxxBridge', # Include this for RN >= 0.47
-  'DevSupport', # Include this to enable In-App Devmenu if RN >= 0.43
-  'RCTText',
-  'RCTActionSheet',
-  'RCTNetwork',
-  'RCTWebSocket', # Needed for debugging
-  'RCTAnimation', # Needed for FlatList and animations running on native UI thread
-  'RCTImage',
-  'RCTSettings'
-  # Add any other subspecs you want to use in your project
+    'Core',
+    'CxxBridge', # Include this for RN >= 0.47
+    'DevSupport', # Include this to enable In-App Devmenu if RN >= 0.43
+    'RCTText',
+    'RCTActionSheet',
+    'RCTNetwork',
+    'RCTWebSocket', # Needed for debugging
+    'RCTAnimation', # Needed for FlatList and animations running on native UI thread
+    'RCTImage',
+    'RCTSettings'
+    # Add any other subspecs you want to use in your project
   ]
-  
+
   # Explicitly include Yoga if you are using RN >= 0.42.0
   pod 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
-  
+
   # Third party deps podspec link
   pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
   pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
diff --git a/Example/ios/Podfile.lock b/Example/ios/Podfile.lock
@@ -6,52 +6,52 @@ PODS:
     - DoubleConversion
     - glog
   - glog (0.3.5)
-  - React (0.57.1):
-    - React/Core (= 0.57.1)
-  - react-native-shimmer (0.3.2):
+  - React (0.57.8):
+    - React/Core (= 0.57.8)
+  - react-native-shimmer (0.4.1):
     - React (>= 0.45.1)
     - Shimmer (~> 1)
-  - React/Core (0.57.1):
-    - yoga (= 0.57.1.React)
-  - React/CxxBridge (0.57.1):
+  - React/Core (0.57.8):
+    - yoga (= 0.57.8.React)
+  - React/CxxBridge (0.57.8):
     - Folly (= 2016.10.31.00)
     - React/Core
     - React/cxxreact
-  - React/cxxreact (0.57.1):
+  - React/cxxreact (0.57.8):
     - boost-for-react-native (= 1.63.0)
     - Folly (= 2016.10.31.00)
     - React/jschelpers
     - React/jsinspector
-  - React/DevSupport (0.57.1):
+  - React/DevSupport (0.57.8):
     - React/Core
     - React/RCTWebSocket
-  - React/fishhook (0.57.1)
-  - React/jschelpers (0.57.1):
+  - React/fishhook (0.57.8)
+  - React/jschelpers (0.57.8):
     - Folly (= 2016.10.31.00)
     - React/PrivateDatabase
-  - React/jsinspector (0.57.1)
-  - React/PrivateDatabase (0.57.1)
-  - React/RCTActionSheet (0.57.1):
+  - React/jsinspector (0.57.8)
+  - React/PrivateDatabase (0.57.8)
+  - React/RCTActionSheet (0.57.8):
     - React/Core
-  - React/RCTAnimation (0.57.1):
+  - React/RCTAnimation (0.57.8):
     - React/Core
-  - React/RCTBlob (0.57.1):
+  - React/RCTBlob (0.57.8):
     - React/Core
-  - React/RCTImage (0.57.1):
+  - React/RCTImage (0.57.8):
     - React/Core
     - React/RCTNetwork
-  - React/RCTNetwork (0.57.1):
+  - React/RCTNetwork (0.57.8):
     - React/Core
-  - React/RCTSettings (0.57.1):
+  - React/RCTSettings (0.57.8):
     - React/Core
-  - React/RCTText (0.57.1):
+  - React/RCTText (0.57.8):
     - React/Core
-  - React/RCTWebSocket (0.57.1):
+  - React/RCTWebSocket (0.57.8):
     - React/Core
     - React/fishhook
     - React/RCTBlob
   - Shimmer (1.0.2)
-  - yoga (0.57.1.React)
+  - yoga (0.57.8.React)
 
 DEPENDENCIES:
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
@@ -95,10 +95,10 @@ SPEC CHECKSUMS:
   Folly: c89ac2d5c6ab169cd7397ef27485c44f35f742c7
   glog: e8acf0ebbf99759d3ff18c86c292a5898282dcde
   React: 1fe0eb13d90b625d94c3b117c274dcfd2e760e11
-  react-native-shimmer: 037bebac572a59889f59fc70447c5b948da23566
+  react-native-shimmer: 5f0d6556b577e4390e99ee16dd2667a6996f9015
   Shimmer: c5374be1c2b0c9e292fb05b339a513cf291cac86
   yoga: b1ce48b6cf950b98deae82838f5173ea7cf89e85
 
-PODFILE CHECKSUM: d325383b623f56dd24147c217fcb6a59d1981eec
+PODFILE CHECKSUM: e3cf1ead8566a7f97c0be51ea225d4825dc5210b
 
 COCOAPODS: 1.5.3
diff --git a/Example/package.json b/Example/package.json
@@ -3,17 +3,21 @@
   "version": "0.0.1",
   "private": true,
   "scripts": {
-    "start": "node node_modules/react-native/local-cli/cli.js start"
+    "start": "node node_modules/react-native/local-cli/cli.js start",
+    "test": "jest"
   },
   "dependencies": {
-    "react": "16.5.0",
-    "react-native": "0.57.1",
+    "react": "16.6.3",
+    "react-native": "0.57.8",
     "react-native-shimmer": "*"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0-0",
-    "@babel/runtime": "^7.0.0",
-    "babel-core": "^7.0.0-bridge.0",
-    "metro-react-native-babel-preset": "0.47.1"
+    "babel-jest": "23.6.0",
+    "jest": "23.6.0",
+    "metro-react-native-babel-preset": "0.51.1",
+    "react-test-renderer": "16.6.3"
+  },
+  "jest": {
+    "preset": "react-native"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ buildscript {`
`9`	`9`	`supportLibVersion = "27.1.1"`
`10`	`10`	`}`
`11`	`11`	`repositories {`
`12`		`- jcenter()`
`13`	`12`	`google()`
	`13`	`+ jcenter()`
`14`	`14`	`}`
`15`	`15`	`dependencies {`
`16`	`16`	`classpath 'com.android.tools.build:gradle:3.1.4'`
`@@ -23,12 +23,12 @@ buildscript {`
`23`	`23`	`allprojects {`
`24`	`24`	`repositories {`
`25`	`25`	`mavenLocal()`
	`26`	`+ google()`
`26`	`27`	`jcenter()`
`27`	`28`	`maven {`
`28`	`29`	`// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm`
`29`	`30`	`url "$rootDir/../node_modules/react-native/android"`
`30`	`31`	`}`
`31`		`- google()`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`