Skip to content

Commit f817aa3

Browse files
terrysahaidakterrysahaidak
committed
Upgrade RN
1 parent 4c61ae8 commit f817aa3

File tree

12 files changed

+32
-21
lines changed

12 files changed

+32
-21
lines changed

‎.babelrc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"presets": ["react-native"]
3-
}
2+
"presets": ["react-native"]
3+
}

‎.flowconfig

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ suppress_type=$FlowIssue
3636
suppress_type=$FlowFixMe
3737
suppress_type=$FixMe
3838

39-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-0]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
40-
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-0]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
39+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-5]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
40+
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-5]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
4141
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
4242
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
4343

4444
unsafe.enable_getters_and_setters=true
4545

4646
[version]
47-
^0.40.0
47+
^0.45.0

‎android/app/build.gradle

+8-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,13 @@ import com.android.build.OutputFile
3333
* // bundleInPaidRelease: true,
3434
* // bundleInBeta: true,
3535
*
36+
* // whether to disable dev mode in custom build variants (by default only disabled in release)
37+
* // for example: to disable dev mode in the staging build type (if configured)
38+
* devDisabledInStaging: true,
39+
* // The configuration property can be in the following formats
40+
* // 'devDisabledIn${productFlavor}${buildType}'
41+
* // 'devDisabledIn${buildType}'
42+
*
3643
* // the root of your project, i.e. where "package.json" lives
3744
* root: "../../",
3845
*
@@ -58,7 +65,7 @@ import com.android.build.OutputFile
5865
* inputExcludes: ["android/**", "ios/**"],
5966
*
6067
* // override which node gets called and with what additional arguments
61-
* nodeExecutableAndArgs: ["node"]
68+
* nodeExecutableAndArgs: ["node"],
6269
*
6370
* // supply additional arguments to the packager
6471
* extraPackagerArgs: []

‎android/app/proguard-rules.pro

+4
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@
5050

5151
-dontwarn com.facebook.react.**
5252

53+
# TextLayoutBuilder uses a non-public Android constructor within StaticLayout.
54+
# See libs/proxy/src/main/java/com/facebook/fbui/textlayoutbuilder/proxy for details.
55+
-dontwarn android.text.StaticLayout
56+
5357
# okhttp
5458

5559
-keepattributes Signature

‎android/app/src/main/res/mipmap-hdpi/ic_launcher.png

1.79 KB
Loading

‎android/app/src/main/res/mipmap-mdpi/ic_launcher.png

338 Bytes
Loading

‎android/app/src/main/res/mipmap-xhdpi/ic_launcher.png

1.74 KB
Loading

‎android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png

3.52 KB
Loading

‎ios/gittermobile.xcodeproj/xcshareddata/xcschemes/gittermobile-tvOS.xcscheme

+6-6
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
BlueprintIdentifier = "2D02E47A1E0B4A5D006451C7"
3232
BuildableName = "GitterMobile-tvOS.app"
3333
BlueprintName = "GitterMobile-tvOS"
34-
ReferencedContainer = "container:gittermobile.xcodeproj">
34+
ReferencedContainer = "container:GitterMobile.xcodeproj">
3535
</BuildableReference>
3636
</BuildActionEntry>
3737
<BuildActionEntry
@@ -45,7 +45,7 @@
4545
BlueprintIdentifier = "2D02E48F1E0B4A5D006451C7"
4646
BuildableName = "GitterMobile-tvOSTests.xctest"
4747
BlueprintName = "GitterMobile-tvOSTests"
48-
ReferencedContainer = "container:gittermobile.xcodeproj">
48+
ReferencedContainer = "container:GitterMobile.xcodeproj">
4949
</BuildableReference>
5050
</BuildActionEntry>
5151
</BuildActionEntries>
@@ -63,7 +63,7 @@
6363
BlueprintIdentifier = "2D02E48F1E0B4A5D006451C7"
6464
BuildableName = "GitterMobile-tvOSTests.xctest"
6565
BlueprintName = "GitterMobile-tvOSTests"
66-
ReferencedContainer = "container:gittermobile.xcodeproj">
66+
ReferencedContainer = "container:GitterMobile.xcodeproj">
6767
</BuildableReference>
6868
</TestableReference>
6969
</Testables>
@@ -73,7 +73,7 @@
7373
BlueprintIdentifier = "2D02E47A1E0B4A5D006451C7"
7474
BuildableName = "GitterMobile-tvOS.app"
7575
BlueprintName = "GitterMobile-tvOS"
76-
ReferencedContainer = "container:gittermobile.xcodeproj">
76+
ReferencedContainer = "container:GitterMobile.xcodeproj">
7777
</BuildableReference>
7878
</MacroExpansion>
7979
<AdditionalOptions>
@@ -96,7 +96,7 @@
9696
BlueprintIdentifier = "2D02E47A1E0B4A5D006451C7"
9797
BuildableName = "GitterMobile-tvOS.app"
9898
BlueprintName = "GitterMobile-tvOS"
99-
ReferencedContainer = "container:gittermobile.xcodeproj">
99+
ReferencedContainer = "container:GitterMobile.xcodeproj">
100100
</BuildableReference>
101101
</BuildableProductRunnable>
102102
<AdditionalOptions>
@@ -115,7 +115,7 @@
115115
BlueprintIdentifier = "2D02E47A1E0B4A5D006451C7"
116116
BuildableName = "GitterMobile-tvOS.app"
117117
BlueprintName = "GitterMobile-tvOS"
118-
ReferencedContainer = "container:gittermobile.xcodeproj">
118+
ReferencedContainer = "container:GitterMobile.xcodeproj">
119119
</BuildableReference>
120120
</BuildableProductRunnable>
121121
</ProfileAction>

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "0620"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "NO"
@@ -31,7 +31,7 @@
3131
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
3232
BuildableName = "GitterMobile.app"
3333
BlueprintName = "GitterMobile"
34-
ReferencedContainer = "container:gittermobile.xcodeproj">
34+
ReferencedContainer = "container:GitterMobile.xcodeproj">
3535
</BuildableReference>
3636
</BuildActionEntry>
3737
<BuildActionEntry
@@ -45,7 +45,7 @@
4545
BlueprintIdentifier = "00E356ED1AD99517003FC87E"
4646
BuildableName = "GitterMobileTests.xctest"
4747
BlueprintName = "GitterMobileTests"
48-
ReferencedContainer = "container:gittermobile.xcodeproj">
48+
ReferencedContainer = "container:GitterMobile.xcodeproj">
4949
</BuildableReference>
5050
</BuildActionEntry>
5151
</BuildActionEntries>
@@ -63,7 +63,7 @@
6363
BlueprintIdentifier = "00E356ED1AD99517003FC87E"
6464
BuildableName = "GitterMobileTests.xctest"
6565
BlueprintName = "GitterMobileTests"
66-
ReferencedContainer = "container:gittermobile.xcodeproj">
66+
ReferencedContainer = "container:GitterMobile.xcodeproj">
6767
</BuildableReference>
6868
</TestableReference>
6969
</Testables>
@@ -73,7 +73,7 @@
7373
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
7474
BuildableName = "GitterMobile.app"
7575
BlueprintName = "GitterMobile"
76-
ReferencedContainer = "container:gittermobile.xcodeproj">
76+
ReferencedContainer = "container:GitterMobile.xcodeproj">
7777
</BuildableReference>
7878
</MacroExpansion>
7979
<AdditionalOptions>
@@ -96,7 +96,7 @@
9696
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
9797
BuildableName = "GitterMobile.app"
9898
BlueprintName = "GitterMobile"
99-
ReferencedContainer = "container:gittermobile.xcodeproj">
99+
ReferencedContainer = "container:GitterMobile.xcodeproj">
100100
</BuildableReference>
101101
</BuildableProductRunnable>
102102
<AdditionalOptions>
@@ -115,7 +115,7 @@
115115
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
116116
BuildableName = "GitterMobile.app"
117117
BlueprintName = "GitterMobile"
118-
ReferencedContainer = "container:gittermobile.xcodeproj">
118+
ReferencedContainer = "container:GitterMobile.xcodeproj">
119119
</BuildableReference>
120120
</BuildableProductRunnable>
121121
</ProfileAction>

‎ios/gittermobileTests/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>
10-
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
10+
<string>org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

‎ios/gittermobileTests/gittermobileTests.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ - (BOOL)findSubviewInView:(UIView *)view matching:(BOOL(^)(UIView *view))test
3737

3838
- (void)testRendersWelcomeScreen
3939
{
40-
UIViewController *vc = [[[[UIApplication sharedApplication] delegate] window] rootViewController];
40+
UIViewController *vc = [[[RCTSharedApplication() delegate] window] rootViewController];
4141
NSDate *date = [NSDate dateWithTimeIntervalSinceNow:TIMEOUT_SECONDS];
4242
BOOL foundElement = NO;
4343

0 commit comments

Comments
 (0)