Skip to content

Commit 6e0f47e

Browse files
LiqiankunLiqiankun
committed
upgrade to rn 60+
1 parent a012018 commit 6e0f47e

File tree

16,660 files changed

+2930853
-2616
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

16,660 files changed

+2930853
-2616
lines changed

‎android/app/build.gradle‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,6 @@ android {
137137
}
138138

139139
dependencies {
140-
compile project(':react-native-device-info')
141-
compile project(':react-native-gesture-handler')
142140
implementation fileTree(dir: "libs", include: ["*.jar"])
143141
implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
144142
implementation "com.facebook.react:react-native:+" // From node_modules

‎android/app/src/main/java/com/dlreactnativearchitecture/MainApplication.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import android.app.Application;
44

55
import com.facebook.react.ReactApplication;
6-
import com.learnium.RNDeviceInfo.RNDeviceInfo;
7-
import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
86
import com.facebook.react.ReactNativeHost;
97
import com.facebook.react.ReactPackage;
108
import com.facebook.react.shell.MainReactPackage;
@@ -24,9 +22,7 @@ public boolean getUseDeveloperSupport() {
2422
@Override
2523
protected List<ReactPackage> getPackages() {
2624
return Arrays.<ReactPackage>asList(
27-
new MainReactPackage(),
28-
new RNDeviceInfo(),
29-
new RNGestureHandlerPackage()
25+
new MainReactPackage()
3026
);
3127
}
3228

‎android/settings.gradle‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
rootProject.name = 'DLReactNativeArchitecture'
2-
include ':react-native-device-info'
3-
project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-device-info/android')
4-
include ':react-native-gesture-handler'
5-
project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')
62

73
include ':app'

‎ios/DLReactNativeArchitecture-Bridging-Header.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
//
2+
// Use this file to import your target's public headers that you would like to expose to Swift.
3+
//
4+

‎ios/DLReactNativeArchitecture.xcodeproj/project.pbxproj‎

Lines changed: 158 additions & 853 deletions
Large diffs are not rendered by default.

‎ios/DLReactNativeArchitecture.xcodeproj/xcshareddata/xcschemes/DLReactNativeArchitecture.xcscheme‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,15 @@
5555
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5656
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
5757
shouldUseLaunchSchemeArgsEnv = "YES">
58+
<MacroExpansion>
59+
<BuildableReference
60+
BuildableIdentifier = "primary"
61+
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
62+
BuildableName = "DLReactNativeArchitecture.app"
63+
BlueprintName = "DLReactNativeArchitecture"
64+
ReferencedContainer = "container:DLReactNativeArchitecture.xcodeproj">
65+
</BuildableReference>
66+
</MacroExpansion>
5867
<Testables>
5968
<TestableReference
6069
skipped = "NO">
@@ -67,17 +76,6 @@
6776
</BuildableReference>
6877
</TestableReference>
6978
</Testables>
70-
<MacroExpansion>
71-
<BuildableReference
72-
BuildableIdentifier = "primary"
73-
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
74-
BuildableName = "DLReactNativeArchitecture.app"
75-
BlueprintName = "DLReactNativeArchitecture"
76-
ReferencedContainer = "container:DLReactNativeArchitecture.xcodeproj">
77-
</BuildableReference>
78-
</MacroExpansion>
79-
<AdditionalOptions>
80-
</AdditionalOptions>
8179
</TestAction>
8280
<LaunchAction
8381
buildConfiguration = "Debug"
@@ -99,8 +97,6 @@
9997
ReferencedContainer = "container:DLReactNativeArchitecture.xcodeproj">
10098
</BuildableReference>
10199
</BuildableProductRunnable>
102-
<AdditionalOptions>
103-
</AdditionalOptions>
104100
</LaunchAction>
105101
<ProfileAction
106102
buildConfiguration = "Release"

‎ios/DLReactNativeArchitecture.xcworkspace/contents.xcworkspacedata‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ios/DLReactNativeArchitecture.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎ios/Podfile‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
platform :ios, '9.0'
2+
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
3+
4+
def add_flipper_pods!(versions = {})
5+
versions['Flipper'] ||= '~> 0.33.1'
6+
versions['DoubleConversion'] ||= '1.1.7'
7+
versions['Flipper-Folly'] ||= '~> 2.1'
8+
versions['Flipper-Glog'] ||= '0.3.6'
9+
versions['Flipper-PeerTalk'] ||= '~> 0.0.4'
10+
versions['Flipper-RSocket'] ||= '~> 1.0'
11+
12+
pod 'FlipperKit', versions['Flipper'], :configuration => 'Debug'
13+
pod 'FlipperKit/FlipperKitLayoutPlugin', versions['Flipper'], :configuration => 'Debug'
14+
pod 'FlipperKit/SKIOSNetworkPlugin', versions['Flipper'], :configuration => 'Debug'
15+
pod 'FlipperKit/FlipperKitUserDefaultsPlugin', versions['Flipper'], :configuration => 'Debug'
16+
pod 'FlipperKit/FlipperKitReactPlugin', versions['Flipper'], :configuration => 'Debug'
17+
18+
# List all transitive dependencies for FlipperKit pods
19+
# to avoid them being linked in Release builds
20+
pod 'Flipper', versions['Flipper'], :configuration => 'Debug'
21+
pod 'Flipper-DoubleConversion', versions['DoubleConversion'], :configuration => 'Debug'
22+
pod 'Flipper-Folly', versions['Flipper-Folly'], :configuration => 'Debug'
23+
pod 'Flipper-Glog', versions['Flipper-Glog'], :configuration => 'Debug'
24+
pod 'Flipper-PeerTalk', versions['Flipper-PeerTalk'], :configuration => 'Debug'
25+
pod 'Flipper-RSocket', versions['Flipper-RSocket'], :configuration => 'Debug'
26+
pod 'FlipperKit/Core', versions['Flipper'], :configuration => 'Debug'
27+
pod 'FlipperKit/CppBridge', versions['Flipper'], :configuration => 'Debug'
28+
pod 'FlipperKit/FBCxxFollyDynamicConvert', versions['Flipper'], :configuration => 'Debug'
29+
pod 'FlipperKit/FBDefines', versions['Flipper'], :configuration => 'Debug'
30+
pod 'FlipperKit/FKPortForwarding', versions['Flipper'], :configuration => 'Debug'
31+
pod 'FlipperKit/FlipperKitHighlightOverlay', versions['Flipper'], :configuration => 'Debug'
32+
pod 'FlipperKit/FlipperKitLayoutTextSearchable', versions['Flipper'], :configuration => 'Debug'
33+
pod 'FlipperKit/FlipperKitNetworkPlugin', versions['Flipper'], :configuration => 'Debug'
34+
end
35+
36+
# Post Install processing for Flipper
37+
def flipper_post_install(installer)
38+
installer.pods_project.targets.each do |target|
39+
if target.name == 'YogaKit'
40+
target.build_configurations.each do |config|
41+
config.build_settings['SWIFT_VERSION'] = '4.1'
42+
end
43+
end
44+
end
45+
end
46+
47+
target 'DLReactNativeArchitecture' do
48+
# Pods for DLReactNativeArchitecture
49+
pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector"
50+
pod 'FBReactNativeSpec', :path => "../node_modules/react-native/Libraries/FBReactNativeSpec"
51+
pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired"
52+
pod 'RCTTypeSafety', :path => "../node_modules/react-native/Libraries/TypeSafety"
53+
pod 'React', :path => '../node_modules/react-native/'
54+
pod 'React-Core', :path => '../node_modules/react-native/'
55+
pod 'React-CoreModules', :path => '../node_modules/react-native/React/CoreModules'
56+
pod 'React-Core/DevSupport', :path => '../node_modules/react-native/'
57+
pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS'
58+
pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation'
59+
pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob'
60+
pod 'React-RCTImage', :path => '../node_modules/react-native/Libraries/Image'
61+
pod 'React-RCTLinking', :path => '../node_modules/react-native/Libraries/LinkingIOS'
62+
pod 'React-RCTNetwork', :path => '../node_modules/react-native/Libraries/Network'
63+
pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings'
64+
pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text'
65+
pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration'
66+
pod 'React-Core/RCTWebSocket', :path => '../node_modules/react-native/'
67+
68+
pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact'
69+
pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi'
70+
pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor'
71+
pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector'
72+
pod 'ReactCommon/callinvoker', :path => "../node_modules/react-native/ReactCommon"
73+
pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon"
74+
pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga', :modular_headers => true
75+
76+
pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
77+
pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
78+
pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
79+
80+
target 'DLReactNativeArchitectureTests' do
81+
inherit! :complete
82+
# Pods for testing
83+
end
84+
85+
use_native_modules!
86+
87+
# Enables Flipper.
88+
#
89+
# Note that if you have use_frameworks! enabled, Flipper will not work and
90+
# you should disable these next few lines.
91+
add_flipper_pods!
92+
post_install do |installer|
93+
flipper_post_install(installer)
94+
end
95+
end
96+
97+
target 'DLReactNativeArchitecture-tvOS' do
98+
# Pods for DLReactNativeArchitecture-tvOS
99+
100+
target 'DLReactNativeArchitecture-tvOSTests' do
101+
inherit! :search_paths
102+
# Pods for testing
103+
end
104+
end

0 commit comments

Comments
 (0)