Skip to content

Commit 5489f9e

Browse files
authored
feat: Upgrade to React Native 0.60.0 / CocoaPods / Android X. (#513)
BREAKING CHANGE: You should upgrade React Native. See https://facebook.github.io/react-native/blog/2019/07/03/version-60
1 parent df76905 commit 5489f9e

File tree

221 files changed

+3853
-15592
lines changed

Some content is hidden

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

221 files changed

+3853
-15592
lines changed

.gitmodules

Lines changed: 0 additions & 9 deletions
This file was deleted.

.npmignore

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,9 @@ android/build
66
ios/build
77
react-native-fast-image-*.tgz
88

9-
# We need to ignore some things in submodules.
10-
# This probably isn't everything we'd like to ignore but it's good enough.
11-
.git*
12-
*.png
13-
ios/Vendor/SDWebImage/Examples
14-
ios/Vendor/SDWebImage/Tests
15-
ios/Vendor/SDWebImage/Docs
16-
ios/Vendor/SDWebImage/Vendors/FLAnimatedImage/FLAnimatedImageDemo
17-
ios/Vendor/SDWebImage/Vendors/FLAnimatedImage/images
18-
ios/Vendor/SDWebImage/Vendors/libwebp/examples
19-
209
# Examples
21-
react-native-fast-image-example
22-
react-native-fast-image-example-cocoapods
23-
react-native-fast-image-example-server
10+
ReactNativeFastImageExample
11+
ReactNativeFastImageExampleServer
2412

2513
# Tests
2614
.circleci

.prettierignore

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
/ios/Vendor/
2-
/react-native-fast-image-example/
3-
/react-native-fast-image-example-cocoapods/
1+
/ReactNativeFastImageExample/
2+
/ReactNativeFastImageExampleServer/
43
node_modules
54
coverage

README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,11 @@ const YourImage = () => (
8181
)
8282
```
8383

84-
## Other Linking Methods
84+
## Are you using Glide already using an AppGlideModule?
8585

86-
- [Manual](docs/installation-manual.md) (might be needed if something went wrong with `react-native link`)
87-
- [CocoaPods (iOS)](docs/installation-cocoapods.md) (you may wish to use this if you are already using CocoaPods)
8886
- [Are you using Glide already using an AppGlideModule?](docs/app-glide-module.md) (you might have problems if you don't read this)
8987

90-
## Proguard
88+
## Are you using Proguard?
9189

9290
If you use Proguard you will need to add these lines to `android/app/proguard-rules.pro`:
9391

RNFastImage.podspec

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
require 'json'
2+
3+
Pod::Spec.new do |s|
4+
package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
5+
6+
s.name = "RNFastImage"
7+
s.version = package['version']
8+
s.summary = package['description']
9+
s.authors = { "Dylan Vann" => "[email protected]" }
10+
s.homepage = "https://github.com/DylanVann/react-native-fast-image#readme"
11+
s.license = "MIT"
12+
s.platforms = { :ios => "8.0", :tvos => "9.0" }
13+
s.framework = 'UIKit'
14+
s.requires_arc = true
15+
s.source = { :git => "https://github.com/DylanVann/react-native-fast-image.git" }
16+
s.source_files = "ios/**/*.{h,m}"
17+
18+
s.dependency 'React'
19+
s.dependency 'SDWebImage', '~> 5.0'
20+
s.dependency 'SDWebImageWebPCoder', '~> 0.2.3'
21+
end
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module.exports = {
2+
root: true,
3+
extends: '@react-native-community',
4+
};

react-native-fast-image-example-cocoapods/.flowconfig renamed to ReactNativeFastImageExample/.flowconfig

Lines changed: 44 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,20 @@
1111
; Ignore duplicate module providers
1212
; For RN Apps installed via npm, "Libraries" folder is inside
1313
; "node_modules/react-native" but in the source repo it is in the root
14-
.*/Libraries/react-native/React.js
14+
node_modules/react-native/Libraries/react-native/React.js
1515

1616
; Ignore polyfills
17-
.*/Libraries/polyfills/.*
17+
node_modules/react-native/Libraries/polyfills/.*
1818

19-
; Ignore metro
20-
.*/node_modules/metro/.*
19+
; These should not be required directly
20+
; require from fbjs/lib instead: require('fbjs/lib/warning')
21+
node_modules/warning/.*
22+
23+
; Flow doesn't support platforms
24+
.*/Libraries/Utilities/HMRLoadingView.js
25+
26+
[untyped]
27+
.*/node_modules/@react-native-community/cli/.*/.*
2128

2229
[include]
2330

@@ -31,6 +38,10 @@ emoji=true
3138
esproposal.optional_chaining=enable
3239
esproposal.nullish_coalescing=enable
3340

41+
module.file_ext=.js
42+
module.file_ext=.json
43+
module.file_ext=.ios.js
44+
3445
module.system=haste
3546
module.system.haste.use_name_reducers=true
3647
# get basename
@@ -43,27 +54,46 @@ module.system.haste.name_reducers='^\(.*\)\.android$' -> '\1'
4354
module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1'
4455
module.system.haste.paths.blacklist=.*/__tests__/.*
4556
module.system.haste.paths.blacklist=.*/__mocks__/.*
46-
module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/Animated/src/polyfills/.*
4757
module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/Libraries/.*
58+
module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/RNTester/.*
59+
module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/IntegrationTests/.*
60+
module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/react-native/react-native-implementation.js
61+
module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/Animated/src/polyfills/.*
4862

4963
munge_underscores=true
5064

5165
module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
5266

53-
module.file_ext=.js
54-
module.file_ext=.jsx
55-
module.file_ext=.json
56-
module.file_ext=.native.js
57-
5867
suppress_type=$FlowIssue
5968
suppress_type=$FlowFixMe
6069
suppress_type=$FlowFixMeProps
6170
suppress_type=$FlowFixMeState
6271

63-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
64-
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
65-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
72+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)
73+
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)?:? #[0-9]+
6674
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
6775

76+
[lints]
77+
sketchy-null-number=warn
78+
sketchy-null-mixed=warn
79+
sketchy-number=warn
80+
untyped-type-import=warn
81+
nonstrict-import=warn
82+
deprecated-type=warn
83+
unsafe-getters-setters=warn
84+
inexact-spread=warn
85+
unnecessary-invariant=warn
86+
signature-verification-failure=warn
87+
deprecated-utility=error
88+
89+
[strict]
90+
deprecated-type
91+
nonstrict-import
92+
sketchy-null
93+
unclear-type
94+
unsafe-getters-setters
95+
untyped-import
96+
untyped-type-import
97+
6898
[version]
69-
^0.92.0
99+
^0.98.0

react-native-fast-image-example/.gitignore renamed to ReactNativeFastImageExample/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,6 @@ buck-out/
5454

5555
# Bundle artifact
5656
*.jsbundle
57+
58+
# CocoaPods
59+
/ios/Pods/

0 commit comments

Comments
 (0)