Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update fresco to v1.9.0 #18848

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions RNTester/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Podfile.lock
Pods/
36 changes: 36 additions & 0 deletions RNTester/Podfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
platform :ios, '8.0'

target 'RNTester' do
# Uncomment for Swift
# use_frameworks!

project 'RNTesterPods.xcodeproj'

pod 'React', :path => '../', :subspecs => [
'ART',
'Core',
'CxxBridge',
'DevSupport',
'RCTActionSheet',
'RCTAnimation',
'RCTBlob',
'RCTCameraRoll',
'RCTGeolocation',
'RCTImage',
'RCTLinkingIOS',
'RCTNetwork',
'RCTPushNotification',
'RCTSettings',
'RCTText',
'RCTVibration',
'RCTWebSocket',
]

pod 'yoga', :path => '../ReactCommon/yoga'

# Third party deps podspec link
pod 'DoubleConversion', :podspec => '../third-party-podspecs/DoubleConversion.podspec'
pod 'glog', :podspec => '../third-party-podspecs/glog.podspec'
pod 'Folly', :podspec => '../third-party-podspecs/Folly.podspec'

end
8 changes: 8 additions & 0 deletions RNTester/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,14 @@ Mac OS and Xcode are required.

See [Running on device](https://facebook.github.io/react-native/docs/running-on-device.html) if you want to use a physical device.

### Running on iOS with CocoaPods

Similar to above, you can build the app via Xcode with help of CocoaPods.

- Install [CocoaPods](http://facebook.github.io/react-native/docs/integration-with-existing-apps.html#3-install-cocoapods)
- Run `cd RNTester; pod install`
- Open the generated `RNTesterPods.xcworkspace` (this is not checked in). Do not open `RNTesterPods.xcodeproj` directly.

### Running on Android

You'll need to have all the [prerequisites](https://github.com/facebook/react-native/tree/master/ReactAndroid#prerequisites) (SDK, NDK) for Building React Native installed.
Expand Down
729 changes: 729 additions & 0 deletions RNTester/RNTesterPods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

9 changes: 8 additions & 1 deletion React.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Pod::Spec.new do |s|
"React/Inspector/*",
"ReactCommon/yoga/*",
"React/Cxx*/*",
"React/Fabric/*",
"React/Fabric/**/*",
ss.ios.exclude_files = "React/**/RCTTV*.*"
ss.tvos.exclude_files = "React/Modules/RCTClipboard*",
"React/Views/RCTDatePicker*",
Expand All @@ -73,6 +73,13 @@ Pod::Spec.new do |s|
ss.compiler_flags = folly_compiler_flags
ss.private_header_files = "React/Cxx*/*.h"
ss.source_files = "React/Cxx*/*.{h,m,mm}"
ss.exclude_files = "React/CxxExceptions/**/*"
end

s.subspec "CxxExceptions" do |ss|
ss.dependency "React/CxxBridge"
ss.private_header_files = "React/CxxExceptions/*.h"
ss.source_files = "React/CxxExceptions/*.{h,m,mm}"
end

s.subspec "DevSupport" do |ss|
Expand Down
8 changes: 4 additions & 4 deletions ReactAndroid/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -294,12 +294,12 @@ dependencies {
compile 'javax.inject:javax.inject:1'
compile 'com.android.support:appcompat-v7:23.0.1'
compile 'com.facebook.fbui.textlayoutbuilder:textlayoutbuilder:1.0.0'
compile 'com.facebook.fresco:fresco:1.8.1'
compile 'com.facebook.fresco:imagepipeline-okhttp3:1.8.1'
compile 'com.facebook.fresco:fresco:1.9.0'
compile 'com.facebook.fresco:imagepipeline-okhttp3:1.9.0'
compile 'com.facebook.soloader:soloader:0.3.0'
compile 'com.google.code.findbugs:jsr305:3.0.0'
compile 'com.squareup.okhttp3:okhttp:3.8.0'
compile 'com.squareup.okhttp3:okhttp-urlconnection:3.8.0'
compile 'com.squareup.okhttp3:okhttp:3.10.0'
compile 'com.squareup.okhttp3:okhttp-urlconnection:3.10.0'
compile 'com.squareup.okio:okio:1.14.0'
compile 'org.webkit:android-jsc:r174650'

Expand Down
24 changes: 12 additions & 12 deletions ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ rn_android_prebuilt_aar(

remote_file(
name = "fresco-binary-aar",
sha1 = "c6ed3f696ed47dca3b20d4ffbd0600c94b9119b2",
url = "mvn:com.facebook.fresco:fresco:aar:1.8.1",
sha1 = "f4415e8676eef4d12fdc8ddbd784bb752cf0c5e3",
url = "mvn:com.facebook.fresco:fresco:aar:1.9.0",
)

android_prebuilt_aar(
Expand All @@ -20,8 +20,8 @@ android_prebuilt_aar(

remote_file(
name = "drawee-binary-aar",
sha1 = "6bc689901ddcac8f3df5ba4db1f8aabeb8e80107",
url = "mvn:com.facebook.fresco:drawee:aar:1.8.1",
sha1 = "e0c3b0fa64fc7525f05a852476bc8723ae6ddc90",
url = "mvn:com.facebook.fresco:drawee:aar:1.9.0",
)

rn_android_library(
Expand All @@ -42,8 +42,8 @@ rn_android_prebuilt_aar(

remote_file(
name = "imagepipeline-base-aar",
sha1 = "42fd80c46a853850dfc0d71808b982fef401c841",
url = "mvn:com.facebook.fresco:imagepipeline-base:aar:1.8.1",
sha1 = "8034e5c8a75385bd20e72ff51489b0673029fcf7",
url = "mvn:com.facebook.fresco:imagepipeline-base:aar:1.9.0",
)

rn_android_prebuilt_aar(
Expand All @@ -54,8 +54,8 @@ rn_android_prebuilt_aar(

remote_file(
name = "imagepipeline-aar",
sha1 = "06a2a4c3e1d9a7fb7d7f1ad14db63e2d32ef0b61",
url = "mvn:com.facebook.fresco:imagepipeline:aar:1.8.1",
sha1 = "8043733b1bf3713d3a3c7fc7896205c96c050fd7",
url = "mvn:com.facebook.fresco:imagepipeline:aar:1.9.0",
)

rn_prebuilt_jar(
Expand All @@ -78,8 +78,8 @@ android_prebuilt_aar(

remote_file(
name = "fbcore-aar",
sha1 = "99b7a83946e16f037149e4cd3abfd6840a09445d",
url = "mvn:com.facebook.fresco:fbcore:aar:1.8.1",
sha1 = "fc3703511dc7b135bcd0e76d8015cdaf247b1760",
url = "mvn:com.facebook.fresco:fbcore:aar:1.9.0",
)

android_prebuilt_aar(
Expand All @@ -90,6 +90,6 @@ android_prebuilt_aar(

remote_file(
name = "imagepipeline-okhttp3-binary-aar",
sha1 = "751f19412e1843b1c1e76eae46e388fb1deddbcc",
url = "mvn:com.facebook.fresco:imagepipeline-okhttp3:aar:1.8.1",
sha1 = "4ac95941c1761a1ba5647ed551f7e47a5c417c7b",
url = "mvn:com.facebook.fresco:imagepipeline-okhttp3:aar:1.9.0",
)
8 changes: 4 additions & 4 deletions ReactAndroid/src/main/third-party/java/okhttp/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ prebuilt_jar(

remote_file(
name = "okhttp3-binary-jar",
sha1 = "5a11f020cce2d11eb71ba916700600e18c4547e7",
url = "mvn:com.squareup.okhttp3:okhttp:jar:3.8.0",
sha1 = "7ef0f1d95bf4c0b3ba30bbae25e0e562b05cf75e",
url = "mvn:com.squareup.okhttp3:okhttp:jar:3.10.0",
)

prebuilt_jar(
Expand All @@ -18,6 +18,6 @@ prebuilt_jar(

remote_file(
name = "okhttp3-urlconnection-binary-jar",
sha1 = "265257b82f20bb0371a926cc8ceb5f7bb17c0df8",
url = "mvn:com.squareup.okhttp3:okhttp-urlconnection:jar:3.8.0",
sha1 = "ec614c05825ddd2267677a99f585d3913474b125",
url = "mvn:com.squareup.okhttp3:okhttp-urlconnection:jar:3.10.0",
)