From 99c982fbb2af1f59b48406418d3bb03f893c0158 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 15 Mar 2017 18:50:34 -0400 Subject: [PATCH] change ZXing to framework for faster incremental compiles in xcode // FREEBIE --- Cartfile | 2 + Cartfile.resolved | 1 + Carthage | 2 +- Makefile | 2 +- Podfile | 1 - Podfile.lock | 9 +-- Signal.xcodeproj/project.pbxproj | 2 + .../xcshareddata/Signal.xcscmblueprint | 56 ++++++++++++------- 8 files changed, 45 insertions(+), 30 deletions(-) diff --git a/Cartfile b/Cartfile index e404e9ffc..543e2fd94 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1,3 @@ github "mxcl/PromiseKit" +github "TheLevelUp/ZXingObjC" + diff --git a/Cartfile.resolved b/Cartfile.resolved index 9aad8b6e3..fad392f6d 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1,2 @@ github "mxcl/PromiseKit" "4.1.8" +github "TheLevelUp/ZXingObjC" "3.2.1" diff --git a/Carthage b/Carthage index b2af6a2b0..3b6c9805d 160000 --- a/Carthage +++ b/Carthage @@ -1 +1 @@ -Subproject commit b2af6a2b0e114a00e24ba412ea255f51f4cac9e0 +Subproject commit 3b6c9805dc594bb7a0b77b6f451594011af67ea2 diff --git a/Makefile b/Makefile index e863e5306..a7ee23774 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ ci: dependencies test update_dependencies: pod update - carthage update + carthage update --platform iOS dependencies: cd $(WORKING_DIR) && \ diff --git a/Podfile b/Podfile index 8fd239f14..fafad1d4a 100644 --- a/Podfile +++ b/Podfile @@ -11,7 +11,6 @@ target 'Signal' do pod 'PastelogKit', '~> 1.3' pod 'FFCircularProgressView', '~> 0.5' pod 'SCWaveformView', '~> 1.0' - pod 'ZXingObjC' pod 'JSQMessagesViewController' pod 'PureLayout' target 'SignalTests' do diff --git a/Podfile.lock b/Podfile.lock index 54c562c3f..a2fea2274 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -111,9 +111,6 @@ PODS: - YapDatabase/SQLCipher/Core - YapDatabase/SQLCipher/Extensions/Views (2.9.2): - YapDatabase/SQLCipher/Core - - ZXingObjC (3.2.1): - - ZXingObjC/All (= 3.2.1) - - ZXingObjC/All (3.2.1) DEPENDENCIES: - AxolotlKit (from `https://github.com/WhisperSystems/SignalProtocolKit.git`) @@ -125,7 +122,6 @@ DEPENDENCIES: - SCWaveformView (~> 1.0) - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`) - SocketRocket (from `https://github.com/facebook/SocketRocket.git`) - - ZXingObjC EXTERNAL SOURCES: AxolotlKit: @@ -170,8 +166,7 @@ SPEC CHECKSUMS: TwistedOakCollapsingFutures: f359b90f203e9ab13dfb92c9ff41842a7fe1cd0c UnionFind: c33be5adb12983981d6e827ea94fc7f9e370f52d YapDatabase: b1e43555a34a5298e23a045be96817a5ef0da58f - ZXingObjC: bbf7b8f0cf8933fdd33eb4f9f46e22308552869b -PODFILE CHECKSUM: 48dbf2fb380d626bb799a782dd41b6bf1e466506 +PODFILE CHECKSUM: 7088298933b189805c955880c8d1be86da3078af -COCOAPODS: 1.1.1 +COCOAPODS: 1.2.0 diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index f29eac74d..e63c7e673 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -3011,6 +3011,7 @@ inputPaths = ( "$(SRCROOT)/Carthage/Build/iOS/PromiseKit.framework", "$(SRCROOT)/Carthage/Build/iOS/WebRTC.framework", + "$(SRCROOT)/Carthage/Build/iOS/ZXingObjC.framework", ); name = "[Carthage] Copy Frameworks"; outputPaths = ( @@ -3027,6 +3028,7 @@ inputPaths = ( "$(SRCROOT)/Carthage/Build/iOS/PromiseKit.framework", "$(SRCROOT)/Carthage/Build/iOS/WebRTC.framework", + "$(SRCROOT)/Carthage/Build/iOS/ZXingObjC.framework", ); name = "[Carthage] Copy Frameworks"; outputPaths = ( diff --git a/Signal.xcworkspace/xcshareddata/Signal.xcscmblueprint b/Signal.xcworkspace/xcshareddata/Signal.xcscmblueprint index 31fe8d4ab..280502694 100644 --- a/Signal.xcworkspace/xcshareddata/Signal.xcscmblueprint +++ b/Signal.xcworkspace/xcshareddata/Signal.xcscmblueprint @@ -1,24 +1,30 @@ { - "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "5D79A077E31B3FE97A3C6613CBFFDD71C314D14C", + "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "5D79A077E31B3FE97A3C6613CBFFDD71C314D14C+++ED4C31A", "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : { }, "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : { - "90530B99EB0008E7A50951FDFBE02169118FA649" : 0, - "5D79A077E31B3FE97A3C6613CBFFDD71C314D14C" : 0, - "37054CE35CE656680D6FFFA9EE19249E0D149C5E" : 0, - "ABB939127996C66F7E852A780552ADEEF03C6B13" : 0, - "8176314449001F06FB0E5B588C62133EAA2FE911" : 9223372036854775807, - "D74FB800F048CB516BB4BC70047F7CC676D291B9" : 0 + "5D79A077E31B3FE97A3C6613CBFFDD71C314D14C+++ED4C31A" : 0, + "37054CE35CE656680D6FFFA9EE19249E0D149C5E+++901E7D4" : 0, + "8176314449001F06FB0E5B588C62133EAA2FE911+++31C7255" : 9223372036854775807, + "D74FB800F048CB516BB4BC70047F7CC676D291B9+++375B249" : 0, + "5D79A077E31B3FE97A3C6613CBFFDD71C314D14C+++03D0758" : 0, + "ABB939127996C66F7E852A780552ADEEF03C6B13+++69179A3" : 0, + "37054CE35CE656680D6FFFA9EE19249E0D149C5E+++E57A04A" : 0, + "8176314449001F06FB0E5B588C62133EAA2FE911+++E19D6E3" : 9223372036854775807, + "90530B99EB0008E7A50951FDFBE02169118FA649+++EF2C0B3" : 0 }, "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "D0F297E7-A82D-4657-A941-96B268F80ABC", "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : { - "90530B99EB0008E7A50951FDFBE02169118FA649" : "JSQMessagesViewController\/", - "5D79A077E31B3FE97A3C6613CBFFDD71C314D14C" : "Signal-iOS-5\/", - "37054CE35CE656680D6FFFA9EE19249E0D149C5E" : "SignalServiceKit\/", - "ABB939127996C66F7E852A780552ADEEF03C6B13" : "SocketRocket\/", - "8176314449001F06FB0E5B588C62133EAA2FE911" : "Signal-iOS-5\/Carthage\/", - "D74FB800F048CB516BB4BC70047F7CC676D291B9" : "Signal-iOS\/Pods\/" + "5D79A077E31B3FE97A3C6613CBFFDD71C314D14C+++ED4C31A" : "Signal-iOS\/", + "37054CE35CE656680D6FFFA9EE19249E0D149C5E+++901E7D4" : "SignalServiceKit\/", + "8176314449001F06FB0E5B588C62133EAA2FE911+++31C7255" : "Signal-iOS-5\/Carthage\/", + "D74FB800F048CB516BB4BC70047F7CC676D291B9+++375B249" : "Signal-iOS\/Pods\/", + "5D79A077E31B3FE97A3C6613CBFFDD71C314D14C+++03D0758" : "Signal-iOS-5\/", + "ABB939127996C66F7E852A780552ADEEF03C6B13+++69179A3" : "SocketRocket\/", + "37054CE35CE656680D6FFFA9EE19249E0D149C5E+++E57A04A" : "SignalServiceKit\/", + "8176314449001F06FB0E5B588C62133EAA2FE911+++E19D6E3" : "Signal-iOS\/Carthage\/", + "90530B99EB0008E7A50951FDFBE02169118FA649+++EF2C0B3" : "JSQMessagesViewController\/" }, "DVTSourceControlWorkspaceBlueprintNameKey" : "Signal", "DVTSourceControlWorkspaceBlueprintVersion" : 204, @@ -27,37 +33,47 @@ { "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:WhisperSystems\/SignalProtocolKit.git", "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "37054CE35CE656680D6FFFA9EE19249E0D149C5E" + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "37054CE35CE656680D6FFFA9EE19249E0D149C5E+++901E7D4" }, { "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:FredericJacobs\/TextSecureKit.git", "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "37054CE35CE656680D6FFFA9EE19249E0D149C5E" + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "37054CE35CE656680D6FFFA9EE19249E0D149C5E+++E57A04A" }, { "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:WhisperSystems\/Signal-iOS.git", "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "5D79A077E31B3FE97A3C6613CBFFDD71C314D14C" + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "5D79A077E31B3FE97A3C6613CBFFDD71C314D14C+++03D0758" + }, + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:WhisperSystems\/Signal-iOS.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "5D79A077E31B3FE97A3C6613CBFFDD71C314D14C+++ED4C31A" }, { "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:michaelkirk\/Signal-Carthage.git", "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "8176314449001F06FB0E5B588C62133EAA2FE911" + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "8176314449001F06FB0E5B588C62133EAA2FE911+++31C7255" + }, + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:WhisperSystems\/Signal-Carthage.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "8176314449001F06FB0E5B588C62133EAA2FE911+++E19D6E3" }, { "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:WhisperSystems\/JSQMessagesViewController.git", "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "90530B99EB0008E7A50951FDFBE02169118FA649" + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "90530B99EB0008E7A50951FDFBE02169118FA649+++EF2C0B3" }, { "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:WhisperSystems\/SocketRocket.git", "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "ABB939127996C66F7E852A780552ADEEF03C6B13" + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "ABB939127996C66F7E852A780552ADEEF03C6B13+++69179A3" }, { "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/FredericJacobs\/Precompiled-Signal-Dependencies.git", "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "D74FB800F048CB516BB4BC70047F7CC676D291B9" + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "D74FB800F048CB516BB4BC70047F7CC676D291B9+++375B249" } ] } \ No newline at end of file