Skip to content

Commit 29a7e5f

Browse files
authored
Merge pull request #28 from PSPDFKit/simone/issue/upgrade-react-native-0.48.1
Upgrade to React Native 0.48.1
2 parents c044c91 + c2433d4 commit 29a7e5f

File tree

9 files changed

+307
-86
lines changed

9 files changed

+307
-86
lines changed

.flowconfig

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
; We fork some components by platform
33
.*/*[.]android.js
44

5-
; Ignore BUCK generated dirs
5+
; Ignore "BUCK" generated dirs
66
<PROJECT_ROOT>/\.buckd/
77

88
; Ignore unexpected extra "@providesModule"
99
.*/node_modules/.*/node_modules/fbjs/.*
1010

1111
; Ignore duplicate module providers
1212
; For RN Apps installed via npm, "Libraries" folder is inside
13-
; "node_modules/react-native" but in the source repo it is in the rootrepo it is in the root
13+
; "node_modules/react-native" but in the source repo it is in the root
1414
.*/Libraries/react-native/React.js
1515
.*/Libraries/react-native/ReactNative.js
1616

@@ -22,9 +22,9 @@ node_modules/react-native/flow
2222
flow/
2323

2424
[options]
25-
module.system=haste
25+
emoji=true
2626

27-
experimental.strict_type_args=true
27+
module.system=haste
2828

2929
munge_underscores=true
3030

@@ -34,11 +34,12 @@ suppress_type=$FlowIssue
3434
suppress_type=$FlowFixMe
3535
suppress_type=$FixMe
3636

37-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-7]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
38-
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-7]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
37+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-9]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
38+
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-9]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
3939
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
40+
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
4041

4142
unsafe.enable_getters_and_setters=true
4243

4344
[version]
44-
^0.37.0
45+
^0.49.1

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ See our [announcement blog post](https://pspdfkit.com/blog/2016/react-native-mod
66

77
#### Requirements
88
- Xcode 8.3.3
9-
- PSPDFKit >= 6.8
10-
- react-native >= 0.46.4
9+
- PSPDFKit >= 6.9.3
10+
- react-native >= 0.48.1
1111

1212
#### Getting Started
1313

@@ -113,8 +113,8 @@ PSPDFKit.present('document.pdf', {
113113
- Android SDK
114114
- Android Build Tools 23.0.1 (React Native)
115115
- Android Build Tools 25.0.2 (PSPDFKit module)
116-
- PSPDFKit >= 3.3.0
117-
- react-native >= 0.46.4
116+
- PSPDFKit >= 3.3.3
117+
- react-native >= 0.48.1
118118

119119
#### Getting Started
120120

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Contains gradle configuration constants
33
*/
44
ext {
5-
PSPDFKIT_VERSION = '3.3.0'
5+
PSPDFKIT_VERSION = '3.3.3'
66
}
77

88
buildscript {

android/src/main/java/com/pspdfkit/react/PSPDFKitPackage.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ public List<NativeModule> createNativeModules(ReactApplicationContext reactConte
3131
return modules;
3232
}
3333

34-
@Override
35-
public List<Class<? extends JavaScriptModule>> createJSModules() {
36-
return Collections.emptyList();
37-
}
38-
3934
@Override
4035
public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
4136
return Collections.emptyList();

ios/cocoapods.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
#### Requirements
66
- Xcode 8.3.3
7-
- PSPDFKit >=6.8
8-
- react-native >= 0.46.4
9-
- CocoaPods >= 1.2.1
7+
- PSPDFKit >=6.9.3
8+
- react-native >= 0.48.1
9+
- CocoaPods >= 1.3.1
1010

1111
#### Getting Started
1212

@@ -42,10 +42,9 @@ target 'YourApp' do
4242
'RCTText',
4343
'RCTNetwork',
4444
'RCTWebSocket', # needed for debugging
45-
'RCTAnimation',
4645
'RCTImage',
4746
'RCTNetwork',
48-
'BatchedBridge', # https://github.com/facebook/react-native/issues/14749
47+
'BatchedBridge', # https://github.com/facebook/react-native/issues/14749
4948
# Add any other subspecs you want to use in your project
5049
]
5150

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-native-pspdfkit",
3-
"version": "1.3.1",
3+
"version": "1.4.0",
44
"description": "A React Native module for the PSPDFKit library.",
55
"keywords": [
66
"react native",

samples/Catalog/.flowconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ suppress_type=$FlowIssue
3232
suppress_type=$FlowFixMe
3333
suppress_type=$FixMe
3434

35-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-7]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
36-
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-7]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
35+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-9]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
36+
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-9]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
3737
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
3838

3939
unsafe.enable_getters_and_setters=true
4040

4141
[version]
42-
^0.47.0
42+
^0.49.1

samples/Catalog/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "Catalog",
3-
"version": "1.2.0",
3+
"version": "1.3.0",
44
"private": true,
55
"scripts": {
66
"start": "node node_modules/react-native/local-cli/cli.js start"
77
},
88
"dependencies": {
99
"react": "16.0.0-alpha.12",
10-
"react-native": "0.46.4",
10+
"react-native": "0.48.1",
1111
"react-native-fs": "github:johanneslumpe/react-native-fs#55dd2a7624f4617e04a895a9a319cb012c1002a5",
1212
"react-native-pspdfkit": "file:../../"
1313
}

0 commit comments

Comments
 (0)