Skip to content

Commit 3b688ae

Browse files
vzdravkovic9facebook-github-bot
authored andcommitted
Updated the glog library version from 0.3.4 to 0.3.5 (facebook#20811)
Summary: While the original reason for this change was because of an issue facebook#20780, with further investigation I concluded that the issue is till present for this combo of versions: glog - 0.3.5 google-cast-sdk - 4.3.1 Downgrading google-cast-sdk to 4.3.0 fixed the build issue. Release Notes: -------------- Updated glog version from 0.3.4 to 0.3.5 for iOS [IOS] [ENHANCEMENT] [GLOG] Pull Request resolved: facebook#20811 Differential Revision: D9485221 Pulled By: hramos fbshipit-source-id: 65caf0839588384a5229a6165506dc6ef62e5fc5
1 parent 966bb63 commit 3b688ae

File tree

7 files changed

+73
-66
lines changed

7 files changed

+73
-66
lines changed

RNTester/Podfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
PODS:
22
- boost-for-react-native (1.63.0)
3-
- DoubleConversion (1.1.5)
3+
- DoubleConversion (1.1.6)
44
- Folly (2016.10.31.00):
55
- boost-for-react-native
66
- DoubleConversion
77
- glog
8-
- glog (0.3.4)
8+
- glog (0.3.5)
99
- React/ART (1000.0.0):
1010
- React/Core
1111
- React/Core (1000.0.0):
@@ -101,12 +101,12 @@ EXTERNAL SOURCES:
101101

102102
SPEC CHECKSUMS:
103103
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
104-
DoubleConversion: a9706f16e388b53ff12cca34473428ee29746a26
104+
DoubleConversion: bb338842f62ab1d708ceb63ec3d999f0f3d98ecd
105105
Folly: c89ac2d5c6ab169cd7397ef27485c44f35f742c7
106-
glog: 3931855c9cc99c3fab1355fc162fe369162d8183
106+
glog: e8acf0ebbf99759d3ff18c86c292a5898282dcde
107107
React: 1fe0eb13d90b625d94c3b117c274dcfd2e760e11
108108
yoga: b1ce48b6cf950b98deae82838f5173ea7cf89e85
109109

110110
PODFILE CHECKSUM: 7af77fbc34af9646e8c6389e7e2c0b4663bb16d9
111111

112-
COCOAPODS: 1.5.2
112+
COCOAPODS: 1.5.3

RNTester/RNTesterPods.xcworkspace/contents.xcworkspacedata

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

React/React.xcodeproj/project.pbxproj

Lines changed: 53 additions & 56 deletions
Large diffs are not rendered by default.

React/third-party.xcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
// Copyright © 2017 Facebook. All rights reserved.
77
//
88

9-
HEADER_SEARCH_PATHS = $(SRCROOT)/../third-party/boost_1_63_0 $(SRCROOT)/../third-party/folly-2016.10.31.00 $(SRCROOT)/../third-party/glog-0.3.4/src
9+
HEADER_SEARCH_PATHS = $(SRCROOT)/../third-party/boost_1_63_0 $(SRCROOT)/../third-party/folly-2016.10.31.00 $(SRCROOT)/../third-party/glog-0.3.5/src
1010
OTHER_CFLAGS = -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1

scripts/ios-install-third-party.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ mkdir -p third-party
6161

6262
SCRIPTDIR=$(dirname "$0")
6363

64-
fetch_and_unpack glog-0.3.4.tar.gz https://github.com/google/glog/archive/v0.3.4.tar.gz 69f91cd5a1de35ead0bc4103ea87294b0206a456 "\"$SCRIPTDIR/ios-configure-glog.sh\""
65-
fetch_and_unpack double-conversion-1.1.5.tar.gz https://github.com/google/double-conversion/archive/v1.1.5.tar.gz 96a8aba1b4ce7d4a7a3c123be26c379c2fed1def
64+
fetch_and_unpack glog-0.3.5.tar.gz https://github.com/google/glog/archive/v0.3.5.tar.gz 61067502c5f9769d111ea1ee3f74e6ddf0a5f9cc "\"$SCRIPTDIR/ios-configure-glog.sh\""
65+
fetch_and_unpack double-conversion-1.1.6.tar.gz https://github.com/google/double-conversion/archive/v1.1.6.tar.gz 1c7d88afde3aaeb97bb652776c627b49e132e8e0
6666
fetch_and_unpack boost_1_63_0.tar.gz https://github.com/react-native-community/boost-for-react-native/releases/download/v1.63.0-0/boost_1_63_0.tar.gz c3f57e1d22a995e608983effbb752b54b6eab741
6767
fetch_and_unpack folly-2016.10.31.00.tar.gz https://github.com/facebook/folly/archive/v2016.10.31.00.tar.gz fb8cdf8962d8c9d0c20a150b6ec3b75d1fa50696

third-party-podspecs/DoubleConversion.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |spec|
22
spec.name = 'DoubleConversion'
3-
spec.version = '1.1.5'
3+
spec.version = '1.1.6'
44
spec.license = { :type => 'MIT' }
55
spec.homepage = 'https://github.com/google/double-conversion'
66
spec.summary = 'Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles'

third-party-podspecs/glog.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |spec|
22
spec.name = 'glog'
3-
spec.version = '0.3.4'
3+
spec.version = '0.3.5'
44
spec.license = { :type => 'Google', :file => 'COPYING' }
55
spec.homepage = 'https://github.com/google/glog'
66
spec.summary = 'Google logging module'

0 commit comments

Comments
 (0)