Skip to content

Commit 7878ce4

Browse files
example: update to react-native 0.63
1 parent 7ca7ba9 commit 7878ce4

File tree

11 files changed

+3085
-2925
lines changed

11 files changed

+3085
-2925
lines changed

examples/.flowconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ untyped-type-import=warn
5656
nonstrict-import=warn
5757
deprecated-type=warn
5858
unsafe-getters-setters=warn
59-
inexact-spread=warn
6059
unnecessary-invariant=warn
6160
signature-verification-failure=warn
6261
deprecated-utility=error
@@ -71,4 +70,4 @@ untyped-import
7170
untyped-type-import
7271

7372
[version]
74-
^0.113.0
73+
^0.122.0

examples/android/app/build.gradle

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import com.android.build.OutputFile
2020
* // default. Can be overridden with ENTRY_FILE environment variable.
2121
* entryFile: "index.android.js",
2222
*
23-
* // https://facebook.github.io/react-native/docs/performance#enable-the-ram-format
23+
* // https://reactnative.dev/docs/performance#enable-the-ram-format
2424
* bundleCommand: "ram-bundle",
2525
*
2626
* // whether to bundle JS and assets in debug mode
@@ -157,20 +157,13 @@ android {
157157
}
158158
release {
159159
// Caution! In production, you need to generate your own keystore file.
160-
// see https://facebook.github.io/react-native/docs/signed-apk-android.
160+
// see https://reactnative.dev/docs/signed-apk-android.
161161
signingConfig signingConfigs.debug
162162
minifyEnabled enableProguardInReleaseBuilds
163163
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
164164
}
165165
}
166166

167-
packagingOptions {
168-
pickFirst "lib/armeabi-v7a/libc++_shared.so"
169-
pickFirst "lib/arm64-v8a/libc++_shared.so"
170-
pickFirst "lib/x86/libc++_shared.so"
171-
pickFirst "lib/x86_64/libc++_shared.so"
172-
}
173-
174167
// applicationVariants are e.g. debug, release
175168
applicationVariants.all { variant ->
176169
variant.outputs.each { output ->
@@ -200,6 +193,7 @@ dependencies {
200193

201194
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
202195
exclude group:'com.facebook.flipper'
196+
exclude group:'com.squareup.okhttp3', module:'okhttp'
203197
}
204198

205199
debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
@@ -222,4 +216,4 @@ task copyDownloadableDepsToLibs(type: Copy) {
222216
into 'libs'
223217
}
224218

225-
apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
219+
apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

examples/android/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
buildscript {
44
ext {
5-
buildToolsVersion = "28.0.3"
5+
buildToolsVersion = "29.0.2"
66
minSdkVersion = 16
7-
compileSdkVersion = 28
8-
targetSdkVersion = 28
7+
compileSdkVersion = 29
8+
targetSdkVersion = 29
99
}
1010
repositories {
1111
google()
1212
jcenter()
1313
}
1414
dependencies {
15-
classpath("com.android.tools.build:gradle:3.5.2")
15+
classpath("com.android.tools.build:gradle:3.5.3")
1616

1717
// NOTE: Do not place your application dependencies here; they belong
1818
// in the individual module build.gradle files

examples/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ android.useAndroidX=true
2525
android.enableJetifier=true
2626

2727
# Version of flipper SDK to use with React Native
28-
FLIPPER_VERSION=0.33.1
28+
FLIPPER_VERSION=0.54.0

examples/ios/Podfile

Lines changed: 6 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,23 @@
1-
platform :ios, '9.0'
1+
require_relative '../node_modules/react-native/scripts/react_native_pods'
22
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
33

4-
def add_flipper_pods!
5-
version = '~> 0.33.1'
6-
pod 'FlipperKit', version, :configuration => 'Debug'
7-
pod 'FlipperKit/FlipperKitLayoutPlugin', version, :configuration => 'Debug'
8-
pod 'FlipperKit/SKIOSNetworkPlugin', version, :configuration => 'Debug'
9-
pod 'FlipperKit/FlipperKitUserDefaultsPlugin', version, :configuration => 'Debug'
10-
pod 'FlipperKit/FlipperKitReactPlugin', version, :configuration => 'Debug'
11-
end
12-
13-
# Post Install processing for Flipper
14-
def flipper_post_install(installer)
15-
installer.pods_project.targets.each do |target|
16-
if target.name == 'YogaKit'
17-
target.build_configurations.each do |config|
18-
config.build_settings['SWIFT_VERSION'] = '4.1'
19-
end
20-
end
21-
end
22-
end
4+
platform :ios, '10.0'
235

246
target 'examples' do
25-
# Pods for examples
26-
pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector"
27-
pod 'FBReactNativeSpec', :path => "../node_modules/react-native/Libraries/FBReactNativeSpec"
28-
pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired"
29-
pod 'RCTTypeSafety', :path => "../node_modules/react-native/Libraries/TypeSafety"
30-
pod 'React', :path => '../node_modules/react-native/'
31-
pod 'React-Core', :path => '../node_modules/react-native/'
32-
pod 'React-CoreModules', :path => '../node_modules/react-native/React/CoreModules'
33-
pod 'React-Core/DevSupport', :path => '../node_modules/react-native/'
34-
pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS'
35-
pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation'
36-
pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob'
37-
pod 'React-RCTImage', :path => '../node_modules/react-native/Libraries/Image'
38-
pod 'React-RCTLinking', :path => '../node_modules/react-native/Libraries/LinkingIOS'
39-
pod 'React-RCTNetwork', :path => '../node_modules/react-native/Libraries/Network'
40-
pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings'
41-
pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text'
42-
pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration'
43-
pod 'React-Core/RCTWebSocket', :path => '../node_modules/react-native/'
7+
config = use_native_modules!
448

45-
pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact'
46-
pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi'
47-
pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor'
48-
pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector'
49-
pod 'ReactCommon/callinvoker', :path => "../node_modules/react-native/ReactCommon"
50-
pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon"
51-
pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga', :modular_headers => true
52-
53-
pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
54-
pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
55-
pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
9+
use_react_native!(:path => config["reactNativePath"])
5610

5711
target 'examplesTests' do
5812
inherit! :complete
5913
# Pods for testing
6014
end
6115

62-
use_native_modules!
63-
6416
# Enables Flipper.
6517
#
6618
# Note that if you have use_frameworks! enabled, Flipper will not work and
6719
# you should disable these next few lines.
68-
add_flipper_pods!
20+
use_flipper!
6921
post_install do |installer|
7022
flipper_post_install(installer)
7123
end
@@ -78,4 +30,4 @@ target 'examples-tvOS' do
7830
inherit! :search_paths
7931
# Pods for testing
8032
end
81-
end
33+
end

0 commit comments

Comments
 (0)