Skip to content

Commit

Permalink
Revert "Upgrade [email protected]"
Browse files Browse the repository at this point in the history 
This reverts commit 3912619.

# Conflicts:
#	ios/StatusIm.xcodeproj/project.pbxproj
#	mobile_files/package.json.orig
#	react-native.config.js
  • Loading branch information
Pedro Pombeiro committed Sep 5, 2019
1 parent 4a64625 commit 778b5fd
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 7 deletions.
36 changes: 35 additions & 1 deletion ios/StatusIm.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
92A0DF7D1F4DE3A4002051BC /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 92A0DF491F4DE3A0002051BC /* GoogleService-Info.plist */; };
983F077E2119C9D2004133ED /* message.wav in Resources */ = {isa = PBXBuildFile; fileRef = 983F07442119C9D2004133ED /* message.wav */; };
9EF0836B1F3B53AB00876A8F /* libReactNativeConfig.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9EF083611F3B538B00876A8F /* libReactNativeConfig.a */; };
9EE89E2D1E03FD9F007D3C25 /* libimageCropPicker.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 20A5C9531D927137002C4965 /* libimageCropPicker.a */; };
B190FBFB6A9B43EAAF396CD7 /* Inter-BlackItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 2006E199700F423E84885CD9 /* Inter-BlackItalic.otf */; };
B24FC7FD1DE7195700D694FF /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FC1DE7195700D694FF /* Social.framework */; };
B24FC7FF1DE7195F00D694FF /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FE1DE7195F00D694FF /* MessageUI.framework */; };
Expand Down Expand Up @@ -65,6 +66,13 @@
remoteGlobalIDString = 206C9F3A1D474E910063E3E6;
remoteInfo = RCTStatus;
};
20A5C9521D927137002C4965 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 20A5C94B1D927137002C4965 /* imageCropPicker.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 3400A8081CEB54A6008A0BC7;
remoteInfo = imageCropPicker;
};
9EC013781E06FB1900155B5C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 9EC0135C1E06FB1900155B5C /* RCTWKWebView.xcodeproj */;
Expand Down Expand Up @@ -119,6 +127,7 @@
2028DFF61D4275B600227DCD /* SF-UI-Display-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SF-UI-Display-Regular.otf"; sourceTree = "<group>"; };
2028DFF71D4275B600227DCD /* SF-UI-Display-Semibold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SF-UI-Display-Semibold.otf"; sourceTree = "<group>"; };
2028DFF81D4275B600227DCD /* SF-UI-Display-Thin.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SF-UI-Display-Thin.otf"; sourceTree = "<group>"; };
20A5C94B1D927137002C4965 /* imageCropPicker.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = imageCropPicker.xcodeproj; path = "../node_modules/react-native-image-crop-picker/ios/imageCropPicker.xcodeproj"; sourceTree = "<group>"; };
20A5C96C1D92715E002C4965 /* RSKImageCropper.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RSKImageCropper.framework; path = "../node_modules/react-native-image-crop-picker/ios/RSKImageCropper/build/Debug-iphoneos/RSKImageCropper.framework"; sourceTree = "<group>"; };
20A5C96E1D92716C002C4965 /* QBImagePicker.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QBImagePicker.framework; path = "../node_modules/react-native-image-crop-picker/ios/QBImagePicker/build/Debug-iphoneos/QBImagePicker.framework"; sourceTree = "<group>"; };
20B6B6831D92C42600CC5C6A /* RSKImageCropper.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = RSKImageCropper.framework; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -187,6 +196,7 @@
files = (
B24FC7FF1DE7195F00D694FF /* MessageUI.framework in Frameworks */,
B24FC7FD1DE7195700D694FF /* Social.framework in Frameworks */,
9EE89E2D1E03FD9F007D3C25 /* libimageCropPicker.a in Frameworks */,
20B6B6841D92C42600CC5C6A /* RSKImageCropper.framework in Frameworks */,
CE4E31B31D8695250033ED64 /* Statusgo.framework in Frameworks */,
20AB9EC61D47CC0300E7FD9C /* libRCTStatus.a in Frameworks */,
Expand Down Expand Up @@ -288,6 +298,14 @@
name = SF;
sourceTree = "<group>";
};
20A5C94C1D927137002C4965 /* Products */ = {
isa = PBXGroup;
children = (
20A5C9531D927137002C4965 /* libimageCropPicker.a */,
);
name = Products;
sourceTree = "<group>";
};
5C1C8762251D6EF495FB2384 /* Pods */ = {
isa = PBXGroup;
children = (
Expand All @@ -304,6 +322,7 @@
children = (
9EF083381F3B538A00876A8F /* ReactNativeConfig.xcodeproj */,
9EC0135C1E06FB1900155B5C /* RCTWKWebView.xcodeproj */,
20A5C94B1D927137002C4965 /* imageCropPicker.xcodeproj */,
439B6B4B407A4E2AACAFE5BE /* RCTStatus.xcodeproj */,
9AE97A85A3D04DA685251137 /* React-Native-Webview-Bridge.xcodeproj */,
BC4B4CEB05214A76B6150264 /* RCTHttpServer.xcodeproj */,
Expand Down Expand Up @@ -438,7 +457,7 @@
83CBB9F71A601CBA00E9B192 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 940;
LastUpgradeCheck = 0940;
ORGANIZATIONNAME = Facebook;
TargetAttributes = {
00E356ED1AD99517003FC87E = {
Expand Down Expand Up @@ -480,6 +499,14 @@
productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = 20A5C94C1D927137002C4965 /* Products */;
ProjectRef = 20A5C94B1D927137002C4965 /* imageCropPicker.xcodeproj */;
},
{
ProductGroup = CE4E31941D8693090033ED64 /* Products */;
ProjectRef = 5E5A7625B76441D984EA8C0D /* RCTImageResizer.xcodeproj */;
},
{
ProductGroup = 201067BA1D4789F700FA83B6 /* Products */;
ProjectRef = 439B6B4B407A4E2AACAFE5BE /* RCTStatus.xcodeproj */;
Expand Down Expand Up @@ -509,6 +536,13 @@
remoteRef = 201067C31D4789F700FA83B6 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
20A5C9531D927137002C4965 /* libimageCropPicker.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libimageCropPicker.a;
remoteRef = 20A5C9521D927137002C4965 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
9EC013791E06FB1900155B5C /* libRCTWKWebView.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
Expand Down
2 changes: 1 addition & 1 deletion mobile_files/package.json.orig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"react-native-fs": "2.14.1",
"react-native-gesture-handler": "^1.3.0",
"react-native-http-bridge": "git+https://github.com/status-im/react-native-http-bridge.git#0.6.1-status",
"react-native-image-crop-picker": "0.25.0",
"react-native-image-crop-picker": "0.18.1",
"react-native-image-resizer": "git+https://github.com/status-im/react-native-image-resizer.git#1.0.0-1-status",
"react-native-keychain": "git+https://github.com/status-im/react-native-keychain.git#v.3.0.0-status",
"react-native-languages": "^3.0.2",
Expand Down
8 changes: 4 additions & 4 deletions mobile_files/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5544,10 +5544,10 @@ react-native-gesture-handler@^1.3.0:
version "0.6.1"
resolved "git+https://github.com/status-im/react-native-http-bridge.git#74ddf7e277cbd1c7b88e8d3aedeee3a480cddf16"

react-native-image-crop-picker@0.25.0:
version "0.25.0"
resolved "https://registry.yarnpkg.com/react-native-image-crop-picker/-/react-native-image-crop-picker-0.25.0.tgz#858fa6fdc857255fe5250252a38d58db347f9067"
integrity sha512-SpT8/zRUW+d/girR78Rc9FzqCOwuARRTJX91hENKJ8LPzVos1fthNOJO0LGGvVFYggbtLsLugrPRDRP2MiuGlQ==
react-native-image-crop-picker@0.18.1:
version "0.18.1"
resolved "https://registry.yarnpkg.com/react-native-image-crop-picker/-/react-native-image-crop-picker-0.18.1.tgz#ebdbe72def5afb6c69aa6e2ad72fd3a7de8ee408"
integrity sha512-63Yr+Mzl/CzDze1eqMg/GGFOODgGrixSMO+28TVGCX3982f76w/op0JKoL7zuSKz/P/mVsbi9RnHA0z6Ih/RHQ==

"react-native-image-resizer@git+https://github.com/status-im/react-native-image-resizer.git#1.0.0-1-status":
version "1.0.0"
Expand Down
7 changes: 6 additions & 1 deletion react-native.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ module.exports = {
ios: null,
},
},
'react-native-image-crop-picker': {
platforms: {
ios: null,
},
},
'react-native-image-resizer': {
platforms: {
ios: null,
Expand All @@ -23,4 +28,4 @@ module.exports = {
},
},
},
};
};

0 comments on commit 778b5fd

Please sign in to comment.