From aaf617e41c9eb5dae45c831a349ed0a83feec42a Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Mon, 8 Jan 2018 18:26:30 +0100 Subject: [PATCH] iOS v0.10.9 --- .../ios/Joplin.xcodeproj/project.pbxproj | 54 ++++++++++++++----- ReactNativeClient/ios/Joplin/Info.plist | 4 +- Tools/tool-utils.js | 2 +- 3 files changed, 44 insertions(+), 16 deletions(-) diff --git a/ReactNativeClient/ios/Joplin.xcodeproj/project.pbxproj b/ReactNativeClient/ios/Joplin.xcodeproj/project.pbxproj index 82cc0998fc..224d4a8709 100644 --- a/ReactNativeClient/ios/Joplin.xcodeproj/project.pbxproj +++ b/ReactNativeClient/ios/Joplin.xcodeproj/project.pbxproj @@ -5,6 +5,7 @@ }; objectVersion = 46; objects = { + /* Begin PBXBuildFile section */ 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; }; 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; }; @@ -41,8 +42,8 @@ E8DD8252C0DD4CF1B53590E9 /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 69B8EE98BFBC4AABA4885BB0 /* SimpleLineIcons.ttf */; }; EA501DCDCF4745E9B63ECE98 /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7D46CBDF8846409890AD7A84 /* Octicons.ttf */; }; EC11356C90E9419799A2626F /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 51BCEC3BC28046C8BB19531F /* EvilIcons.ttf */; }; - FBF57CE2F0F448FA9A8985E2 /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0EB8BCAEA9AA41CAAE460443 /* libsqlite3.0.tbd */; }; F3D0BB525E6C490294D73075 /* libRNSecureRandom.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22647ACF9A4C45918C44C599 /* libRNSecureRandom.a */; }; + FBF57CE2F0F448FA9A8985E2 /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0EB8BCAEA9AA41CAAE460443 /* libsqlite3.0.tbd */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -123,6 +124,13 @@ remoteGlobalIDString = 3D3CD90B1DE5FBD600167DC4; remoteInfo = jschelpers; }; + 4D2A44E7200015A2001CA388 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 252BD7B86BF7435B960DA901 /* RNSecureRandom.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 134814201AA4EA6300B7C361; + remoteInfo = RNSecureRandom; + }; 4D2A85A91FBCE3AC0028537D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */; @@ -370,6 +378,8 @@ 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = ""; }; 15FD7D2C8F0A445BBA807A9D /* MaterialIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = ""; }; 1F79F2CD7CED446B986A6252 /* Entypo.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Entypo.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = ""; }; + 22647ACF9A4C45918C44C599 /* libRNSecureRandom.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNSecureRandom.a; sourceTree = ""; }; + 252BD7B86BF7435B960DA901 /* RNSecureRandom.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNSecureRandom.xcodeproj; path = "../node_modules/react-native-securerandom/ios/RNSecureRandom.xcodeproj"; sourceTree = ""; }; 381C047F2739439CB3E6452A /* libRNVectorIcons.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNVectorIcons.a; sourceTree = ""; }; 3FFC0F5EFDC54862B1F998DD /* Foundation.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Foundation.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = ""; }; 44A39642217548C8ADA91CBA /* libRNImagePicker.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNImagePicker.a; sourceTree = ""; }; @@ -398,8 +408,6 @@ F5E37D05726A4A08B2EE323A /* libRNFetchBlob.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNFetchBlob.a; sourceTree = ""; }; FD370E24D76E461D960DD85D /* Feather.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Feather.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Feather.ttf"; sourceTree = ""; }; FF411B45E68B4A8CBCC35777 /* Ionicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Ionicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = ""; }; - 252BD7B86BF7435B960DA901 /* RNSecureRandom.xcodeproj */ = {isa = PBXFileReference; name = "RNSecureRandom.xcodeproj"; path = "../node_modules/react-native-securerandom/ios/RNSecureRandom.xcodeproj"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; }; - 22647ACF9A4C45918C44C599 /* libRNSecureRandom.a */ = {isa = PBXFileReference; name = "libRNSecureRandom.a"; path = "libRNSecureRandom.a"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -540,6 +548,14 @@ name = Products; sourceTree = ""; }; + 4D2A44E4200015A2001CA388 /* Products */ = { + isa = PBXGroup; + children = ( + 4D2A44E8200015A2001CA388 /* libRNSecureRandom.a */, + ); + name = Products; + sourceTree = ""; + }; 4D2A85911FBCE3950028537D /* Recovered References */ = { isa = PBXGroup; children = ( @@ -550,6 +566,7 @@ 87BABCF4ED0A406B9546CCE9 /* libSQLite.a */, 381C047F2739439CB3E6452A /* libRNVectorIcons.a */, 44A39642217548C8ADA91CBA /* libRNImagePicker.a */, + 22647ACF9A4C45918C44C599 /* libRNSecureRandom.a */, ); name = "Recovered References"; sourceTree = ""; @@ -853,6 +870,10 @@ ProductGroup = 4DA7F8091FC1DA9C00353191 /* Products */; ProjectRef = A4716DB8654B431D894F89E1 /* RNImagePicker.xcodeproj */; }, + { + ProductGroup = 4D2A44E4200015A2001CA388 /* Products */; + ProjectRef = 252BD7B86BF7435B960DA901 /* RNSecureRandom.xcodeproj */; + }, { ProductGroup = 4D2A85B71FBCE3AC0028537D /* Products */; ProjectRef = 711CBD21F0894B83A2D8E234 /* RNVectorIcons.xcodeproj */; @@ -947,6 +968,13 @@ remoteRef = 3DAD3EAC1DF850E9000B6D8A /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 4D2A44E8200015A2001CA388 /* libRNSecureRandom.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libRNSecureRandom.a; + remoteRef = 4D2A44E7200015A2001CA388 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 4D2A85AA1FBCE3AC0028537D /* libfishhook.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1257,10 +1285,14 @@ "$(SRCROOT)/../node_modules/react-native-sqlite-storage/src/ios", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)..\node_modules\neact-native-image-pickerios", - "$(SRCROOT)\..\node_modules\react-native-securerandom\ios", + "$(SRCROOT)..\node_modules\neact-native-securerandomios", ); INFOPLIST_FILE = Joplin/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/Joplin\"", + ); OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1272,10 +1304,6 @@ PROVISIONING_PROFILE_SPECIFIER = ""; TARGETED_DEVICE_FAMILY = 1; VERSIONING_SYSTEM = "apple-generic"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/Joplin\"", - ); }; name = Debug; }; @@ -1297,10 +1325,14 @@ "$(SRCROOT)/../node_modules/react-native-sqlite-storage/src/ios", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)..\node_modules\neact-native-image-pickerios", - "$(SRCROOT)\..\node_modules\react-native-securerandom\ios", + "$(SRCROOT)..\node_modules\neact-native-securerandomios", ); INFOPLIST_FILE = Joplin/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/Joplin\"", + ); OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1312,10 +1344,6 @@ PROVISIONING_PROFILE_SPECIFIER = ""; TARGETED_DEVICE_FAMILY = 1; VERSIONING_SYSTEM = "apple-generic"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/Joplin\"", - ); }; name = Release; }; diff --git a/ReactNativeClient/ios/Joplin/Info.plist b/ReactNativeClient/ios/Joplin/Info.plist index 3278677cb2..fc213d9d9f 100644 --- a/ReactNativeClient/ios/Joplin/Info.plist +++ b/ReactNativeClient/ios/Joplin/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.10.6 + 0.10.9 CFBundleSignature ???? CFBundleVersion - 6 + 9 LSRequiresIPhoneOS NSAppTransportSecurity diff --git a/Tools/tool-utils.js b/Tools/tool-utils.js index d1a02931b0..bf66da2f41 100644 --- a/Tools/tool-utils.js +++ b/Tools/tool-utils.js @@ -28,7 +28,7 @@ toolUtils.downloadFile = function(url, targetPath) { if (response.statusCode !== 200) reject(new Error('HTTP error ' + response.statusCode)); response.pipe(file); file.on('finish', function() { - file.close(); + //file.close(); resolve(); }); }).on('error', (error) => {