Skip to content

Commit

Permalink
fix: ios build
Browse files Browse the repository at this point in the history
  • Loading branch information
@nikhedonia
nikhedonia committed Feb 21, 2018
1 parent 681a2a1 commit eec7028
Show file tree
Hide file tree
Showing 10 changed files with 40 additions and 76 deletions.
32 changes: 16 additions & 16 deletions ios/storybooknative.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,18 +339,18 @@
remoteGlobalIDString = E72EC1401F7ABB5A0001BC90;
remoteInfo = "RNDeviceInfo-tvOS";
};
CE3EB74E203DEE2000FD1723 /* PBXContainerItemProxy */ = {
CEA921E6203DF8AA001ACD7A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = CE3EB748203DEE2000FD1723 /* RNSVG.xcodeproj */;
containerPortal = CEA921E0203DF8AA001ACD7A /* RNSVG.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 0CF68AC11AF0540F00FF9E5C;
remoteInfo = RNSVG;
};
CE3EB750203DEE2000FD1723 /* PBXContainerItemProxy */ = {
CEA921E8203DF8AA001ACD7A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = CE3EB748203DEE2000FD1723 /* RNSVG.xcodeproj */;
containerPortal = CEA921E0203DF8AA001ACD7A /* RNSVG.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = CE3EB74B203DEE2000FD1723;
remoteGlobalIDString = CEA921E3203DF8AA001ACD7A;
remoteInfo = "RNSVG-tvOS";
};
/* End PBXContainerItemProxy section */
Expand Down Expand Up @@ -407,7 +407,7 @@
A8EA890E2023732700C2D919 /* RNDeviceInfo.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNDeviceInfo.xcodeproj; path = "../node_modules/react-native-device-info/RNDeviceInfo.xcodeproj"; sourceTree = "<group>"; };
ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = "<group>"; };
CE3EB6EC203DE6E700FD1723 /* BVLinearGradient.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = BVLinearGradient.xcodeproj; path = "../node_modules/react-native-linear-gradient/BVLinearGradient.xcodeproj"; sourceTree = "<group>"; };
CE3EB748203DEE2000FD1723 /* RNSVG.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNSVG.xcodeproj; path = "../../blub/node_modules/react-native-svg/ios/RNSVG.xcodeproj"; sourceTree = "<group>"; };
CEA921E0203DF8AA001ACD7A /* RNSVG.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNSVG.xcodeproj; path = "../../blub/node_modules/react-native-svg/ios/RNSVG.xcodeproj"; sourceTree = "<group>"; };
ED3A0BAC1F38C8F300048867 /* RNTBrightcoveView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RNTBrightcoveView.h; path = "../packages/brightcove-video/ios/RNTBrightcove/RNTBrightcoveView.h"; sourceTree = "<group>"; };
ED3A0BAD1F38C8F300048867 /* RNTBrightcoveView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RNTBrightcoveView.m; path = "../packages/brightcove-video/ios/RNTBrightcove/RNTBrightcoveView.m"; sourceTree = "<group>"; };
ED3A0BAE1F38C8F300048867 /* RNTBrightcoveManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RNTBrightcoveManager.h; path = "../packages/brightcove-video/ios/RNTBrightcove/RNTBrightcoveManager.h"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -593,7 +593,7 @@
832341AE1AAA6A7D00B99B32 /* Libraries */ = {
isa = PBXGroup;
children = (
CE3EB748203DEE2000FD1723 /* RNSVG.xcodeproj */,
CEA921E0203DF8AA001ACD7A /* RNSVG.xcodeproj */,
CE3EB6EC203DE6E700FD1723 /* BVLinearGradient.xcodeproj */,
A8EA890E2023732700C2D919 /* RNDeviceInfo.xcodeproj */,
5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */,
Expand Down Expand Up @@ -710,11 +710,11 @@
name = Products;
sourceTree = "<group>";
};
CE3EB749203DEE2000FD1723 /* Products */ = {
CEA921E1203DF8AA001ACD7A /* Products */ = {
isa = PBXGroup;
children = (
CE3EB74F203DEE2000FD1723 /* libRNSVG.a */,
CE3EB751203DEE2000FD1723 /* libRNSVG-tvOS.a */,
CEA921E7203DF8AA001ACD7A /* libRNSVG.a */,
CEA921E9203DF8AA001ACD7A /* libRNSVG-tvOS.a */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -824,8 +824,8 @@
ProjectRef = A8EA890E2023732700C2D919 /* RNDeviceInfo.xcodeproj */;
},
{
ProductGroup = CE3EB749203DEE2000FD1723 /* Products */;
ProjectRef = CE3EB748203DEE2000FD1723 /* RNSVG.xcodeproj */;
ProductGroup = CEA921E1203DF8AA001ACD7A /* Products */;
ProjectRef = CEA921E0203DF8AA001ACD7A /* RNSVG.xcodeproj */;
},
);
projectRoot = "";
Expand Down Expand Up @@ -1123,18 +1123,18 @@
remoteRef = CE3EB724203DE6E800FD1723 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
CE3EB74F203DEE2000FD1723 /* libRNSVG.a */ = {
CEA921E7203DF8AA001ACD7A /* libRNSVG.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libRNSVG.a;
remoteRef = CE3EB74E203DEE2000FD1723 /* PBXContainerItemProxy */;
remoteRef = CEA921E6203DF8AA001ACD7A /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
CE3EB751203DEE2000FD1723 /* libRNSVG-tvOS.a */ = {
CEA921E9203DF8AA001ACD7A /* libRNSVG-tvOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libRNSVG-tvOS.a";
remoteRef = CE3EB750203DEE2000FD1723 /* PBXContainerItemProxy */;
remoteRef = CEA921E8203DF8AA001ACD7A /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
Expand Down
4 changes: 2 additions & 2 deletions packages/article-flag/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
"dependencies": {
"@times-components/icons": "0.1.15",
"prop-types": "15.6.0",
"react-native-svg": "6.2.2",
"svgs": "3.1.1"
"react-native-svg": "5.5.1",
"svgs": "3.2.1"
},
"peerDependencies": {
"babel-preset-env": "1.6.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/author-head/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"@times-components/tracking": "0.7.6",
"prop-types": "15.6.0",
"styled-components": "2.2.3",
"svgs": "3.1.1"
"svgs": "3.2.1"
},
"peerDependencies": {
"babel-preset-env": "1.6.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/brightcove-video/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
},
"dependencies": {
"prop-types": "15.6.0",
"react-native-svg": "6.2.2",
"svgs": "3.1.1"
"react-native-svg": "5.5.1",
"svgs": "3.2.1"
},
"peerDependencies": {
"babel-preset-env": "1.6.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/card/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
"@times-components/markup": "0.21.2",
"@times-components/responsive-styles": "0.2.20",
"prop-types": "15.6.0",
"react-native-svg": "6.2.2",
"svgs": "3.1.1"
"react-native-svg": "5.5.1",
"svgs": "3.2.1"
},
"peerDependencies": {
"babel-preset-env": "1.6.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/icons/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
},
"dependencies": {
"prop-types": "15.6.0",
"svgs": "3.1.1"
"svgs": "3.2.1"
},
"peerDependencies": {
"babel-preset-env": "1.6.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/image/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
"@times-components/gradient": "0.5.7",
"@times-components/link": "0.14.1",
"prop-types": "15.6.0",
"react-native-svg": "6.2.2",
"svgs": "3.1.1"
"react-native-svg": "5.5.1",
"svgs": "3.2.1"
},
"peerDependencies": {
"babel-preset-env": "1.6.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/pagination/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
"@times-components/tracking": "0.7.6",
"prop-types": "15.6.0",
"react-display-name": "0.2.3",
"react-native-svg": "6.2.2",
"svgs": "3.1.1"
"react-native-svg": "5.5.1",
"svgs": "3.2.1"
},
"peerDependencies": {
"babel-preset-env": "1.6.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/watermark/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
},
"dependencies": {
"prop-types": "15.6.0",
"react-native-svg": "6.2.2",
"svgs": "3.1.1"
"react-native-svg": "5.5.1",
"svgs": "3.2.1"
},
"peerDependencies": {
"babel-preset-env": "1.6.1",
Expand Down
56 changes: 10 additions & 46 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -994,7 +994,7 @@ babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
esutils "^2.0.2"
js-tokens "^3.0.2"

[email protected], babel-core@^6.0.0, babel-core@^6.0.14, babel-core@^6.24.1, babel-core@^6.25.0, babel-core@^6.26.0, babel-core@^6.7.2:
[email protected], babel-core@^6.0.0, babel-core@^6.24.1, babel-core@^6.25.0, babel-core@^6.26.0, babel-core@^6.7.2:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
dependencies:
Expand Down Expand Up @@ -2094,13 +2094,6 @@ babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.25
lodash "^4.17.4"
to-fast-properties "^1.0.3"

babelify@^7.3.0:
version "7.3.0"
resolved "https://registry.yarnpkg.com/babelify/-/babelify-7.3.0.tgz#aa56aede7067fd7bd549666ee16dc285087e88e5"
dependencies:
babel-core "^6.0.14"
object-assign "^4.0.0"

[email protected]:
version "7.0.0-beta.36"
resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.36.tgz#3a3683ba6a9a1e02b0aa507c8e63435e39305b9e"
Expand Down Expand Up @@ -2888,7 +2881,7 @@ collection-visit@^1.0.0:
map-visit "^1.0.0"
object-visit "^1.0.0"

color-convert@^1.3.0, color-convert@^1.9.0, color-convert@^1.9.1:
color-convert@^1.3.0, color-convert@^1.9.0:
version "1.9.1"
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
dependencies:
Expand All @@ -2904,32 +2897,18 @@ color-string@^0.3.0:
dependencies:
color-name "^1.0.0"

color-string@^1.5.2:
version "1.5.2"
resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.2.tgz#26e45814bc3c9a7cbd6751648a41434514a773a9"
dependencies:
color-name "^1.0.0"
simple-swizzle "^0.2.2"

color-support@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"

color@^0.11.0:
color@^0.11.0, color@^0.11.1:
version "0.11.4"
resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
dependencies:
clone "^1.0.2"
color-convert "^1.3.0"
color-string "^0.3.0"

color@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/color/-/color-2.0.1.tgz#e4ed78a3c4603d0891eba5430b04b86314f4c839"
dependencies:
color-convert "^1.9.1"
color-string "^1.5.2"

colormin@^1.0.5:
version "1.1.2"
resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
Expand Down Expand Up @@ -6271,10 +6250,6 @@ is-arrayish@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"

is-arrayish@^0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.1.tgz#c2dfc386abaa0c3e33c48db3fe87059e69065efd"

is-binary-path@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
Expand Down Expand Up @@ -9708,13 +9683,12 @@ [email protected]:
glob "^7.1.1"
yargs "^8.0.2"

react-native-svg@6.2.2:
version "6.2.2"
resolved "https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-6.2.2.tgz#5803cddce374a542b4468c38a2474fca32080685"
react-native-svg@5.5.1:
version "5.5.1"
resolved "https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-5.5.1.tgz#633d882077f048f05c721ebb793cd073e846ba1f"
dependencies:
color "^2.0.1"
color "^0.11.1"
lodash "^4.16.6"
pegjs "^0.10.0"

[email protected]:
version "0.3.2"
Expand Down Expand Up @@ -10655,12 +10629,6 @@ simple-plist@^0.2.1:
bplist-parser "0.1.1"
plist "2.0.1"

simple-swizzle@^0.2.2:
version "0.2.2"
resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
dependencies:
is-arrayish "^0.3.1"

slash@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
Expand Down Expand Up @@ -11195,14 +11163,10 @@ svgo@^0.7.0:
sax "~1.2.1"
whet.extend "~0.9.9"

svgs@3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/svgs/-/svgs-3.1.1.tgz#ad9b9882e23036d874411a9413df92d6a7641b73"
svgs@3.2.1:
version "3.2.1"
resolved "https://registry.yarnpkg.com/svgs/-/svgs-3.2.1.tgz#cf0804ab0cb346815d696cbc79b30f6343d710be"
dependencies:
babel-plugin-transform-object-rest-spread "^6.23.0"
babel-preset-es2015 "^6.24.1"
babel-preset-react "^6.24.1"
babelify "^7.3.0"
prop-types "^15.5.10"
rip-out "^1.0.0"

Expand Down

0 comments on commit eec7028

Please sign in to comment.