From 738242a7c02db756a15c4f2a9d087f69363b7b78 Mon Sep 17 00:00:00 2001 From: manuroe Date: Thu, 12 Oct 2017 15:53:02 +0200 Subject: [PATCH 1/5] Podfile: Factorise the podfile --- Podfile | 159 +++++++++++++++------------------ Riot.xcodeproj/project.pbxproj | 68 ++++++++------ 2 files changed, 113 insertions(+), 114 deletions(-) diff --git a/Podfile b/Podfile index c818caf91..4ecc59529 100644 --- a/Podfile +++ b/Podfile @@ -3,104 +3,85 @@ platform :ios, "8.0" source 'https://github.com/CocoaPods/Specs.git' -target "Riot" do +abstract_target 'RiotPods' do -# Different flavours of pods to MatrixKit -# The tagged version on which this version of Riot has been built -pod 'MatrixKit', '0.6.3' + pod 'GBDeviceInfo', '~> 4.4.0' -# The lastest release available on the CocoaPods repository -#pod 'MatrixKit' + pod 'GoogleAnalytics' -# The develop branch version -#pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop' -#pod 'MatrixKit', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop' + # The Google WebRTC stack + pod 'WebRTC', '58.17.16937' -# The one used for developing both MatrixSDK and MatrixKit -# Note that MatrixSDK must be cloned into a folder called matrix-ios-sdk next to the MatrixKit folder -#pod 'MatrixKit', :path => '../matrix-ios-kit/MatrixKit.podspec' -#pod 'MatrixSDK', :path => '../matrix-ios-sdk/MatrixSDK.podspec' + # OLMKit for crypto + pod 'OLMKit' + #pod 'OLMKit', :path => '../olm/OLMKit.podspec' + pod 'Realm', '~> 2.10.2' -pod 'GBDeviceInfo', '~> 4.4.0' + # Remove warnings from "bad" pods + pod 'OLMKit', :inhibit_warnings => true + pod 'cmark', :inhibit_warnings => true + pod 'DTCoreText', :inhibit_warnings => true -pod 'GoogleAnalytics' -# The Google WebRTC stack -pod 'WebRTC', '58.17.16937' + target "Riot" do -# OLMKit for crypto -pod 'OLMKit' -#pod 'OLMKit', :path => '../olm/OLMKit.podspec' -pod 'Realm', '~> 2.10.2' + # Different flavours of pods to MatrixKit + # The tagged version on which this version of Riot has been built + pod 'MatrixKit', '0.6.3' -# Remove warnings from "bad" pods -pod 'OLMKit', :inhibit_warnings => true -pod 'cmark', :inhibit_warnings => true -pod 'DTCoreText', :inhibit_warnings => true + # The lastest release available on the CocoaPods repository + #pod 'MatrixKit' + + # The develop branch version + #pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop' + #pod 'MatrixKit', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop' + + # The one used for developing both MatrixSDK and MatrixKit + # Note that MatrixSDK must be cloned into a folder called matrix-ios-sdk next to the MatrixKit folder + #pod 'MatrixKit', :path => '../matrix-ios-kit/MatrixKit.podspec' + #pod 'MatrixSDK', :path => '../matrix-ios-sdk/MatrixSDK.podspec' + + end + + + target "RiotShareExtension" do + + # The tagged version on which this version of Riot share extension has been built + pod 'MatrixKit/AppExtension', '0.6.3' + + # The lastest release available on the CocoaPods repository + #pod 'MatrixKit/AppExtension' + + # The develop branch version + #pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop' + #pod 'MatrixKit/AppExtension', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop' + + # The one used for developing both MatrixSDK and MatrixKit + # Note that MatrixSDK must be cloned into a folder called matrix-ios-sdk next to the MatrixKit folder + #pod 'MatrixSDK', :path => '../matrix-ios-sdk/MatrixSDK.podspec' + #pod 'MatrixKit/AppExtension', :path => '../matrix-ios-kit/MatrixKit.podspec' + + end + + + target "SiriIntents" do + + # The tagged version on which this version of Riot share extension has been built + #pod 'MatrixKit/AppExtension', '0.6.3' + + # The lastest release available on the CocoaPods repository + #pod 'MatrixKit/AppExtension' + + # The develop branch version + #pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop' + #pod 'MatrixKit/AppExtension', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop' + + # The one used for developing both MatrixSDK and MatrixKit + # Note that MatrixSDK must be cloned into a folder called matrix-ios-sdk next to the MatrixKit folder + #pod 'MatrixSDK', :path => '../matrix-ios-sdk/MatrixSDK.podspec' + #pod 'MatrixKit/AppExtension', :path => '../matrix-ios-kit/MatrixKit.podspec' + + end end - -target "RiotShareExtension" do - -pod 'GoogleAnalytics' -# The Google WebRTC stack -pod 'WebRTC', '58.17.16937' -# OLMKit for crypto -pod 'OLMKit' -#pod 'OLMKit', :path => '../olm/OLMKit.podspec' -pod 'Realm', '~> 2.10.2' - -# The tagged version on which this version of Riot share extension has been built -pod 'MatrixKit/AppExtension', '0.6.3' - -# The lastest release available on the CocoaPods repository -#pod 'MatrixKit/AppExtension' - -# The develop branch version -#pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop' -#pod 'MatrixKit/AppExtension', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop' - -# The one used for developing both MatrixSDK and MatrixKit -# Note that MatrixSDK must be cloned into a folder called matrix-ios-sdk next to the MatrixKit folder -#pod 'MatrixSDK', :path => '../matrix-ios-sdk/MatrixSDK.podspec' -#pod 'MatrixKit/AppExtension', :path => '../matrix-ios-kit/MatrixKit.podspec' - -# Remove warnings from "bad" pods -pod 'OLMKit', :inhibit_warnings => true -pod 'cmark', :inhibit_warnings => true - -end - - -target "SiriIntents" do - -pod 'GoogleAnalytics' -# The Google WebRTC stack -pod 'WebRTC', '58.17.16937' -# OLMKit for crypto -pod 'OLMKit' -#pod 'OLMKit', :path => '../olm/OLMKit.podspec' -pod 'Realm', '~> 2.10.2' - -# The tagged version on which this version of Riot share extension has been built -pod 'MatrixKit/AppExtension', '0.6.3' - -# The lastest release available on the CocoaPods repository -#pod 'MatrixKit/AppExtension' - -# The develop branch version -#pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop' -#pod 'MatrixKit/AppExtension', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop' - -# The one used for developing both MatrixSDK and MatrixKit -# Note that MatrixSDK must be cloned into a folder called matrix-ios-sdk next to the MatrixKit folder -#pod 'MatrixSDK', :path => '../matrix-ios-sdk/MatrixSDK.podspec' -#pod 'MatrixKit/AppExtension', :path => '../matrix-ios-kit/MatrixKit.podspec' - -# Remove warnings from "bad" pods -pod 'OLMKit', :inhibit_warnings => true -pod 'cmark', :inhibit_warnings => true - -end - diff --git a/Riot.xcodeproj/project.pbxproj b/Riot.xcodeproj/project.pbxproj index 49981a658..ca5b9a63d 100755 --- a/Riot.xcodeproj/project.pbxproj +++ b/Riot.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 05D592A32FF1D1877B89F73C /* libPods-Riot.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD9D0BDE9232898950554DD5 /* libPods-Riot.a */; }; 2435179C1F375B9400D0683E /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 2466B7551F2F80B800AE27B0 /* Info.plist */; }; 2435179F1F375C0F00D0683E /* Vector.strings in Resources */ = {isa = PBXBuildFile; fileRef = 327382C01F276AED00356143 /* Vector.strings */; }; 2439DD621F6BBE760090F42D /* RecentRoomTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2439DD611F6BBE760090F42D /* RecentRoomTableViewCell.m */; }; @@ -36,6 +35,8 @@ 24EEE5AF1F25F0F500B3C705 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F083BBEF1E7009EC00A9B29C /* Images.xcassets */; }; 24EEE5B41F2607C000B3C705 /* SegmentedViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F083BC4E1E7009EC00A9B29C /* SegmentedViewController.m */; }; 24EEE5B51F2607C500B3C705 /* SegmentedViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F083BC4F1E7009EC00A9B29C /* SegmentedViewController.xib */; }; + 268F9A229B0162F9C8AEBE34 /* libPods-RiotPods-Riot.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 714B084D44A5553C13D855BA /* libPods-RiotPods-Riot.a */; }; + 319F86690284AA02FC397A15 /* libPods-RiotPods-SiriIntents.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C1A4A3DCE26410A60959E96 /* libPods-RiotPods-SiriIntents.a */; }; 3205ED7D1E976C8A003D65FA /* DirectoryServerPickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3205ED7C1E976C8A003D65FA /* DirectoryServerPickerViewController.m */; }; 3205ED841E97725E003D65FA /* DirectoryServerTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3205ED821E97725E003D65FA /* DirectoryServerTableViewCell.m */; }; 3205ED851E97725E003D65FA /* DirectoryServerTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3205ED831E97725E003D65FA /* DirectoryServerTableViewCell.xib */; }; @@ -84,7 +85,7 @@ 32F3AE1A1F6FF4E600F0F004 /* WidgetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32F3AE191F6FF4E600F0F004 /* WidgetViewController.m */; }; 32FD0A3D1EB0CD9B0072B066 /* BugReportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FD0A3B1EB0CD9B0072B066 /* BugReportViewController.m */; }; 32FD0A3E1EB0CD9B0072B066 /* BugReportViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 32FD0A3C1EB0CD9B0072B066 /* BugReportViewController.xib */; }; - 714F6391AC0AA86C0AEB3F43 /* libPods-SiriIntents.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5666C1236223F54D4C635C54 /* libPods-SiriIntents.a */; }; + 40D7564A9783FD6C28C157CE /* libPods-RiotPods-RiotShareExtension.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AF0A0746EF74FF15B8B79658 /* libPods-RiotPods-RiotShareExtension.a */; }; 83711A7C1F6F8E7D008F0D4D /* KeyboardGrowingTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 83711A7B1F6F8E7D008F0D4D /* KeyboardGrowingTextView.m */; }; 92324BE31F4F66D3009DE194 /* IncomingCallView.m in Sources */ = {isa = PBXBuildFile; fileRef = 92324BE21F4F66D3009DE194 /* IncomingCallView.m */; }; 92324BE61F4F6A60009DE194 /* CircleButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 92324BE51F4F6A60009DE194 /* CircleButton.m */; }; @@ -92,7 +93,6 @@ 92726A471F58737A004AD26F /* IntentHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 92726A461F58737A004AD26F /* IntentHandler.m */; }; 92726A4B1F58737A004AD26F /* SiriIntents.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 92726A431F58737A004AD26F /* SiriIntents.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 92726A511F587410004AD26F /* Intents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92726A501F587410004AD26F /* Intents.framework */; }; - A27ECCE3FC4971745D2CB78D /* libPods-RiotShareExtension.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7246451C668D6782166E22EC /* libPods-RiotShareExtension.a */; }; F0131DE51F2200D600CBF707 /* RiotSplitViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F0131DE41F2200D600CBF707 /* RiotSplitViewController.m */; }; F02C1A861E8EB04C0045A404 /* PeopleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F02C1A841E8EB04C0045A404 /* PeopleViewController.m */; }; F04AF26A1F83A4C100D20F4D /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F04AF25F1F83A4C000D20F4D /* InfoPlist.strings */; }; @@ -604,6 +604,7 @@ /* Begin PBXFileReference section */ 12AA0005C8B3D8D8162584C5 /* Pods-RiotShareExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RiotShareExtension.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RiotShareExtension/Pods-RiotShareExtension.debug.xcconfig"; sourceTree = ""; }; + 22D76C11C202B6BC5917A049 /* Pods-RiotPods-RiotShareExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RiotPods-RiotShareExtension.release.xcconfig"; path = "Pods/Target Support Files/Pods-RiotPods-RiotShareExtension/Pods-RiotPods-RiotShareExtension.release.xcconfig"; sourceTree = ""; }; 2439DD601F6BBE760090F42D /* RecentRoomTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecentRoomTableViewCell.h; sourceTree = ""; }; 2439DD611F6BBE760090F42D /* RecentRoomTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RecentRoomTableViewCell.m; sourceTree = ""; }; 2439DD631F6BBEA50090F42D /* RecentRoomTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RecentRoomTableViewCell.xib; sourceTree = ""; }; @@ -691,11 +692,15 @@ 32FD0A3A1EB0CD9B0072B066 /* BugReportViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BugReportViewController.h; sourceTree = ""; }; 32FD0A3B1EB0CD9B0072B066 /* BugReportViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BugReportViewController.m; sourceTree = ""; }; 32FD0A3C1EB0CD9B0072B066 /* BugReportViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BugReportViewController.xib; sourceTree = ""; }; + 33F966BE1A83B32A2DFE24CA /* Pods-RiotPods-SiriIntents.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RiotPods-SiriIntents.release.xcconfig"; path = "Pods/Target Support Files/Pods-RiotPods-SiriIntents/Pods-RiotPods-SiriIntents.release.xcconfig"; sourceTree = ""; }; 397BCA987893439918EBF330 /* Pods-SiriIntents.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SiriIntents.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SiriIntents/Pods-SiriIntents.debug.xcconfig"; sourceTree = ""; }; 4D1164C2F07EF74950DCDA7A /* Pods-SiriIntents.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SiriIntents.release.xcconfig"; path = "Pods/Target Support Files/Pods-SiriIntents/Pods-SiriIntents.release.xcconfig"; sourceTree = ""; }; 5666C1236223F54D4C635C54 /* libPods-SiriIntents.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-SiriIntents.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 61BB7CD1741206BEAAA6D4C7 /* Pods-RiotPods-SiriIntents.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RiotPods-SiriIntents.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RiotPods-SiriIntents/Pods-RiotPods-SiriIntents.debug.xcconfig"; sourceTree = ""; }; + 714B084D44A5553C13D855BA /* libPods-RiotPods-Riot.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RiotPods-Riot.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 7246451C668D6782166E22EC /* libPods-RiotShareExtension.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RiotShareExtension.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 765F5104DB3EC39713DEB3A4 /* Pods-RiotShareExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RiotShareExtension.release.xcconfig"; path = "Pods/Target Support Files/Pods-RiotShareExtension/Pods-RiotShareExtension.release.xcconfig"; sourceTree = ""; }; + 7C1A4A3DCE26410A60959E96 /* libPods-RiotPods-SiriIntents.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RiotPods-SiriIntents.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 83711A7B1F6F8E7D008F0D4D /* KeyboardGrowingTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KeyboardGrowingTextView.m; sourceTree = ""; }; 839BB91240D350D5607D55BA /* Pods-Riot.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Riot.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Riot/Pods-Riot.debug.xcconfig"; sourceTree = ""; }; 92324BE11F4F66D3009DE194 /* IncomingCallView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IncomingCallView.h; sourceTree = ""; }; @@ -710,7 +715,10 @@ 92726A481F58737A004AD26F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 92726A4F1F587393004AD26F /* SiriIntents.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = SiriIntents.entitlements; sourceTree = ""; }; 92726A501F587410004AD26F /* Intents.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Intents.framework; path = System/Library/Frameworks/Intents.framework; sourceTree = SDKROOT; }; + A5030B7C3C0B6EB83A9257BD /* Pods-RiotPods-Riot.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RiotPods-Riot.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RiotPods-Riot/Pods-RiotPods-Riot.debug.xcconfig"; sourceTree = ""; }; + AF0A0746EF74FF15B8B79658 /* libPods-RiotPods-RiotShareExtension.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RiotPods-RiotShareExtension.a"; sourceTree = BUILT_PRODUCTS_DIR; }; C195C53961EA28E6900AEB68 /* Pods-Riot.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Riot.release.xcconfig"; path = "Pods/Target Support Files/Pods-Riot/Pods-Riot.release.xcconfig"; sourceTree = ""; }; + C5258DFF261AA3AB228A3F11 /* Pods-RiotPods-RiotShareExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RiotPods-RiotShareExtension.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RiotPods-RiotShareExtension/Pods-RiotPods-RiotShareExtension.debug.xcconfig"; sourceTree = ""; }; F0131DE31F2200D600CBF707 /* RiotSplitViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RiotSplitViewController.h; sourceTree = ""; }; F0131DE41F2200D600CBF707 /* RiotSplitViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RiotSplitViewController.m; sourceTree = ""; }; F02C1A831E8EB04C0045A404 /* PeopleViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PeopleViewController.h; sourceTree = ""; }; @@ -1292,6 +1300,7 @@ F0E05A2D1EA0F9EB004B83FB /* tab_rooms.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tab_rooms.png; sourceTree = ""; }; F0E05A2E1EA0F9EB004B83FB /* tab_rooms@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tab_rooms@2x.png"; sourceTree = ""; }; F0E05A2F1EA0F9EB004B83FB /* tab_rooms@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tab_rooms@3x.png"; sourceTree = ""; }; + F546BCBBB9BBEE67DB28878A /* Pods-RiotPods-Riot.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RiotPods-Riot.release.xcconfig"; path = "Pods/Target Support Files/Pods-RiotPods-Riot/Pods-RiotPods-Riot.release.xcconfig"; sourceTree = ""; }; FD9D0BDE9232898950554DD5 /* libPods-Riot.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Riot.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -1300,7 +1309,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A27ECCE3FC4971745D2CB78D /* libPods-RiotShareExtension.a in Frameworks */, + 40D7564A9783FD6C28C157CE /* libPods-RiotPods-RiotShareExtension.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1309,7 +1318,7 @@ buildActionMask = 2147483647; files = ( 92726A511F587410004AD26F /* Intents.framework in Frameworks */, - 714F6391AC0AA86C0AEB3F43 /* libPods-SiriIntents.a in Frameworks */, + 319F86690284AA02FC397A15 /* libPods-RiotPods-SiriIntents.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1317,8 +1326,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 05D592A32FF1D1877B89F73C /* libPods-Riot.a in Frameworks */, 3233F7461F3497E2006ACA81 /* JitsiMeet.framework in Frameworks */, + 268F9A229B0162F9C8AEBE34 /* libPods-RiotPods-Riot.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1507,6 +1516,9 @@ FD9D0BDE9232898950554DD5 /* libPods-Riot.a */, 7246451C668D6782166E22EC /* libPods-RiotShareExtension.a */, 5666C1236223F54D4C635C54 /* libPods-SiriIntents.a */, + 714B084D44A5553C13D855BA /* libPods-RiotPods-Riot.a */, + AF0A0746EF74FF15B8B79658 /* libPods-RiotPods-RiotShareExtension.a */, + 7C1A4A3DCE26410A60959E96 /* libPods-RiotPods-SiriIntents.a */, ); name = Frameworks; sourceTree = ""; @@ -1520,6 +1532,12 @@ 765F5104DB3EC39713DEB3A4 /* Pods-RiotShareExtension.release.xcconfig */, 397BCA987893439918EBF330 /* Pods-SiriIntents.debug.xcconfig */, 4D1164C2F07EF74950DCDA7A /* Pods-SiriIntents.release.xcconfig */, + A5030B7C3C0B6EB83A9257BD /* Pods-RiotPods-Riot.debug.xcconfig */, + F546BCBBB9BBEE67DB28878A /* Pods-RiotPods-Riot.release.xcconfig */, + C5258DFF261AA3AB228A3F11 /* Pods-RiotPods-RiotShareExtension.debug.xcconfig */, + 22D76C11C202B6BC5917A049 /* Pods-RiotPods-RiotShareExtension.release.xcconfig */, + 61BB7CD1741206BEAAA6D4C7 /* Pods-RiotPods-SiriIntents.debug.xcconfig */, + 33F966BE1A83B32A2DFE24CA /* Pods-RiotPods-SiriIntents.release.xcconfig */, ); name = Pods; sourceTree = ""; @@ -1544,8 +1562,8 @@ 92726A481F58737A004AD26F /* Info.plist */, ); path = SiriIntents; - sourceTree = ""; - }; + sourceTree = ""; + }; F04AF25E1F83A4C000D20F4D /* zh_Hans.lproj */ = { isa = PBXGroup; children = ( @@ -3039,7 +3057,7 @@ ); name = "[CP] Check Pods Manifest.lock"; outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Riot-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-RiotPods-Riot-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -3057,7 +3075,7 @@ ); name = "[CP] Check Pods Manifest.lock"; outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RiotShareExtension-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-RiotPods-RiotShareExtension-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -3070,7 +3088,7 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-Riot/Pods-Riot-resources.sh", + "${SRCROOT}/Pods/Target Support Files/Pods-RiotPods-Riot/Pods-RiotPods-Riot-resources.sh", "${PODS_ROOT}/MatrixKit/MatrixKit/Controllers/MXKAccountDetailsViewController.xib", "${PODS_ROOT}/MatrixKit/MatrixKit/Controllers/MXKAttachmentsViewController.xib", "${PODS_ROOT}/MatrixKit/MatrixKit/Controllers/MXKAuthenticationViewController.xib", @@ -3140,7 +3158,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Riot/Pods-Riot-resources.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RiotPods-Riot/Pods-RiotPods-Riot-resources.sh\"\n"; showEnvVarsInLog = 0; }; 6AA0024D4D5FAE30C2E1F311 /* [CP] Check Pods Manifest.lock */ = { @@ -3154,7 +3172,7 @@ ); name = "[CP] Check Pods Manifest.lock"; outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-SiriIntents-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-RiotPods-SiriIntents-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -3167,7 +3185,7 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-Riot/Pods-Riot-frameworks.sh", + "${SRCROOT}/Pods/Target Support Files/Pods-RiotPods-Riot/Pods-RiotPods-Riot-frameworks.sh", "${PODS_ROOT}/WebRTC/WebRTC.framework", ); name = "[CP] Embed Pods Frameworks"; @@ -3176,7 +3194,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Riot/Pods-Riot-frameworks.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RiotPods-Riot/Pods-RiotPods-Riot-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; 807A0ABF153A23C2FC22F977 /* [CP] Copy Pods Resources */ = { @@ -3185,7 +3203,7 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-SiriIntents/Pods-SiriIntents-resources.sh", + "${SRCROOT}/Pods/Target Support Files/Pods-RiotPods-SiriIntents/Pods-RiotPods-SiriIntents-resources.sh", "${PODS_ROOT}/MatrixSDK/MatrixSDK/Data/Store/MXCoreDataStore/MXCoreDataStore.xcdatamodeld", ); name = "[CP] Copy Pods Resources"; @@ -3194,7 +3212,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SiriIntents/Pods-SiriIntents-resources.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RiotPods-SiriIntents/Pods-RiotPods-SiriIntents-resources.sh\"\n"; showEnvVarsInLog = 0; }; 8EA19F5011654D3BD5EDAC33 /* [CP] Copy Pods Resources */ = { @@ -3203,7 +3221,7 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-RiotShareExtension/Pods-RiotShareExtension-resources.sh", + "${SRCROOT}/Pods/Target Support Files/Pods-RiotPods-RiotShareExtension/Pods-RiotPods-RiotShareExtension-resources.sh", "${PODS_ROOT}/MatrixSDK/MatrixSDK/Data/Store/MXCoreDataStore/MXCoreDataStore.xcdatamodeld", ); name = "[CP] Copy Pods Resources"; @@ -3212,7 +3230,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RiotShareExtension/Pods-RiotShareExtension-resources.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RiotPods-RiotShareExtension/Pods-RiotPods-RiotShareExtension-resources.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -3603,7 +3621,7 @@ /* Begin XCBuildConfiguration section */ 24CBEC5A1F0EAD310093EABB /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 12AA0005C8B3D8D8162584C5 /* Pods-RiotShareExtension.debug.xcconfig */; + baseConfigurationReference = C5258DFF261AA3AB228A3F11 /* Pods-RiotPods-RiotShareExtension.debug.xcconfig */; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -3625,7 +3643,7 @@ }; 24CBEC5B1F0EAD310093EABB /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 765F5104DB3EC39713DEB3A4 /* Pods-RiotShareExtension.release.xcconfig */; + baseConfigurationReference = 22D76C11C202B6BC5917A049 /* Pods-RiotPods-RiotShareExtension.release.xcconfig */; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -3648,7 +3666,7 @@ }; 92726A4C1F58737A004AD26F /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 397BCA987893439918EBF330 /* Pods-SiriIntents.debug.xcconfig */; + baseConfigurationReference = 61BB7CD1741206BEAAA6D4C7 /* Pods-RiotPods-SiriIntents.debug.xcconfig */; buildSettings = { CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -3668,7 +3686,7 @@ }; 92726A4D1F58737A004AD26F /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4D1164C2F07EF74950DCDA7A /* Pods-SiriIntents.release.xcconfig */; + baseConfigurationReference = 33F966BE1A83B32A2DFE24CA /* Pods-RiotPods-SiriIntents.release.xcconfig */; buildSettings = { CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -3774,7 +3792,7 @@ }; F094A9C91B78D8F000B1FBBF /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 839BB91240D350D5607D55BA /* Pods-Riot.debug.xcconfig */; + baseConfigurationReference = A5030B7C3C0B6EB83A9257BD /* Pods-RiotPods-Riot.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = Riot/Riot.entitlements; @@ -3797,7 +3815,7 @@ }; F094A9CA1B78D8F000B1FBBF /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C195C53961EA28E6900AEB68 /* Pods-Riot.release.xcconfig */; + baseConfigurationReference = F546BCBBB9BBEE67DB28878A /* Pods-RiotPods-Riot.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = Riot/Riot.entitlements; From 565be299797e8a63a1f3d2af3a81177d78ea8a23 Mon Sep 17 00:00:00 2001 From: manuroe Date: Tue, 17 Oct 2017 09:02:10 +0200 Subject: [PATCH 2/5] Podfile: "The lastest release available on the CocoaPods repository" is never used --- Podfile | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Podfile b/Podfile index 4ecc59529..df50c8c0f 100644 --- a/Podfile +++ b/Podfile @@ -29,9 +29,6 @@ abstract_target 'RiotPods' do # The tagged version on which this version of Riot has been built pod 'MatrixKit', '0.6.3' - # The lastest release available on the CocoaPods repository - #pod 'MatrixKit' - # The develop branch version #pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop' #pod 'MatrixKit', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop' @@ -49,9 +46,6 @@ abstract_target 'RiotPods' do # The tagged version on which this version of Riot share extension has been built pod 'MatrixKit/AppExtension', '0.6.3' - # The lastest release available on the CocoaPods repository - #pod 'MatrixKit/AppExtension' - # The develop branch version #pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop' #pod 'MatrixKit/AppExtension', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop' @@ -69,9 +63,6 @@ abstract_target 'RiotPods' do # The tagged version on which this version of Riot share extension has been built #pod 'MatrixKit/AppExtension', '0.6.3' - # The lastest release available on the CocoaPods repository - #pod 'MatrixKit/AppExtension' - # The develop branch version #pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop' #pod 'MatrixKit/AppExtension', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop' From ac27ec9be2b1bd6e2b763386125f7d6c2e96149b Mon Sep 17 00:00:00 2001 From: manuroe Date: Tue, 17 Oct 2017 09:44:54 +0200 Subject: [PATCH 3/5] Podfile: Factorise flavors of MatrixKit --- Podfile | 83 ++++++++++++++++++++++++++++++++------------------------- 1 file changed, 47 insertions(+), 36 deletions(-) diff --git a/Podfile b/Podfile index df50c8c0f..451d7ecdf 100644 --- a/Podfile +++ b/Podfile @@ -3,10 +3,23 @@ platform :ios, "8.0" source 'https://github.com/CocoaPods/Specs.git' + +# Different flavours of pods to MatrixKit +# The current MatrixKit pod version +matrixKitPodVersion = '0.6.3' +matrixKitVersion = matrixKitPodVersion + +# The develop branch version +#matrixKitVersion = 'develop' + +# The one used for developing both MatrixSDK and MatrixKit +# Note that MatrixSDK must be cloned into a folder called matrix-ios-sdk next to the MatrixKit folder +#matrixKitVersion = 'local' + + abstract_target 'RiotPods' do pod 'GBDeviceInfo', '~> 4.4.0' - pod 'GoogleAnalytics' # The Google WebRTC stack @@ -25,53 +38,51 @@ abstract_target 'RiotPods' do target "Riot" do - # Different flavours of pods to MatrixKit - # The tagged version on which this version of Riot has been built - pod 'MatrixKit', '0.6.3' - - # The develop branch version - #pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop' - #pod 'MatrixKit', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop' - - # The one used for developing both MatrixSDK and MatrixKit - # Note that MatrixSDK must be cloned into a folder called matrix-ios-sdk next to the MatrixKit folder - #pod 'MatrixKit', :path => '../matrix-ios-kit/MatrixKit.podspec' - #pod 'MatrixSDK', :path => '../matrix-ios-sdk/MatrixSDK.podspec' + if matrixKitVersion == matrixKitPodVersion + pod 'MatrixKit', matrixKitVersion + else + if matrixKitVersion == 'local' + pod 'MatrixSDK', :path => '../matrix-ios-sdk/MatrixSDK.podspec' + pod 'MatrixKit', :path => '../matrix-ios-kit/MatrixKit.podspec' + else + pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop' + pod 'MatrixKit', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop' + end + end end target "RiotShareExtension" do - # The tagged version on which this version of Riot share extension has been built - pod 'MatrixKit/AppExtension', '0.6.3' - - # The develop branch version - #pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop' - #pod 'MatrixKit/AppExtension', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop' - - # The one used for developing both MatrixSDK and MatrixKit - # Note that MatrixSDK must be cloned into a folder called matrix-ios-sdk next to the MatrixKit folder - #pod 'MatrixSDK', :path => '../matrix-ios-sdk/MatrixSDK.podspec' - #pod 'MatrixKit/AppExtension', :path => '../matrix-ios-kit/MatrixKit.podspec' + if matrixKitVersion == matrixKitPodVersion + pod 'MatrixKit/AppExtension', matrixKitVersion + else + if matrixKitVersion == 'local' + pod 'MatrixSDK', :path => '../matrix-ios-sdk/MatrixSDK.podspec' + pod 'MatrixKit/AppExtension', :path => '../matrix-ios-kit/MatrixKit.podspec' + else + pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop' + pod 'MatrixKit/AppExtension', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop' + end + end end target "SiriIntents" do - # The tagged version on which this version of Riot share extension has been built - #pod 'MatrixKit/AppExtension', '0.6.3' - - # The develop branch version - #pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop' - #pod 'MatrixKit/AppExtension', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop' - - # The one used for developing both MatrixSDK and MatrixKit - # Note that MatrixSDK must be cloned into a folder called matrix-ios-sdk next to the MatrixKit folder - #pod 'MatrixSDK', :path => '../matrix-ios-sdk/MatrixSDK.podspec' - #pod 'MatrixKit/AppExtension', :path => '../matrix-ios-kit/MatrixKit.podspec' - + if matrixKitVersion == matrixKitPodVersion + pod 'MatrixKit/AppExtension', matrixKitVersion + else + if matrixKitVersion == 'local' + pod 'MatrixSDK', :path => '../matrix-ios-sdk/MatrixSDK.podspec' + pod 'MatrixKit/AppExtension', :path => '../matrix-ios-kit/MatrixKit.podspec' + else + pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop' + pod 'MatrixKit/AppExtension', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop' + end + end end end From 91b9c217331c47a4403209f7366a3b1d12bb35a1 Mon Sep 17 00:00:00 2001 From: manuroe Date: Tue, 17 Oct 2017 10:02:58 +0200 Subject: [PATCH 4/5] Podfile: More factorisation --- Podfile | 81 ++++++++++++++++++++++++++------------------------------- 1 file changed, 37 insertions(+), 44 deletions(-) diff --git a/Podfile b/Podfile index 451d7ecdf..f90351c0e 100644 --- a/Podfile +++ b/Podfile @@ -6,15 +6,45 @@ source 'https://github.com/CocoaPods/Specs.git' # Different flavours of pods to MatrixKit # The current MatrixKit pod version -matrixKitPodVersion = '0.6.3' -matrixKitVersion = matrixKitPodVersion +$matrixKitVersion = '0.6.3' # The develop branch version -#matrixKitVersion = 'develop' +#$matrixKitVersion = 'develop' # The one used for developing both MatrixSDK and MatrixKit # Note that MatrixSDK must be cloned into a folder called matrix-ios-sdk next to the MatrixKit folder -#matrixKitVersion = 'local' +#$matrixKitVersion = 'local' + + +# Method to import the right MatrixKit flavour +def import_MatrixKit + if $matrixKitVersion == 'local' + pod 'MatrixSDK', :path => '../matrix-ios-sdk/MatrixSDK.podspec' + pod 'MatrixKit', :path => '../matrix-ios-kit/MatrixKit.podspec' + else + if $matrixKitVersion == 'develop' + pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop' + pod 'MatrixKit', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop' + else + pod 'MatrixKit', $matrixKitVersion + end + end +end + +# Method to import the right MatrixKit/AppExtension flavour +def import_MatrixKitAppExtension + if $matrixKitVersion == 'local' + pod 'MatrixSDK', :path => '../matrix-ios-sdk/MatrixSDK.podspec' + pod 'MatrixKit/AppExtension', :path => '../matrix-ios-kit/MatrixKit.podspec' + else + if $matrixKitVersion == 'develop' + pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop' + pod 'MatrixKit/AppExtension', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop' + else + pod 'MatrixKit/AppExtension', $matrixKitVersion + end + end +end abstract_target 'RiotPods' do @@ -37,52 +67,15 @@ abstract_target 'RiotPods' do target "Riot" do - - if matrixKitVersion == matrixKitPodVersion - pod 'MatrixKit', matrixKitVersion - else - if matrixKitVersion == 'local' - pod 'MatrixSDK', :path => '../matrix-ios-sdk/MatrixSDK.podspec' - pod 'MatrixKit', :path => '../matrix-ios-kit/MatrixKit.podspec' - else - pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop' - pod 'MatrixKit', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop' - end - end - + import_MatrixKit end - target "RiotShareExtension" do - - if matrixKitVersion == matrixKitPodVersion - pod 'MatrixKit/AppExtension', matrixKitVersion - else - if matrixKitVersion == 'local' - pod 'MatrixSDK', :path => '../matrix-ios-sdk/MatrixSDK.podspec' - pod 'MatrixKit/AppExtension', :path => '../matrix-ios-kit/MatrixKit.podspec' - else - pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop' - pod 'MatrixKit/AppExtension', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop' - end - end - + import_MatrixKitAppExtension end - target "SiriIntents" do - - if matrixKitVersion == matrixKitPodVersion - pod 'MatrixKit/AppExtension', matrixKitVersion - else - if matrixKitVersion == 'local' - pod 'MatrixSDK', :path => '../matrix-ios-sdk/MatrixSDK.podspec' - pod 'MatrixKit/AppExtension', :path => '../matrix-ios-kit/MatrixKit.podspec' - else - pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop' - pod 'MatrixKit/AppExtension', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop' - end - end + import_MatrixKitAppExtension end end From 4a2ed30bb2abb08a5d15a222583093725d2c703c Mon Sep 17 00:00:00 2001 From: manuroe Date: Tue, 17 Oct 2017 10:20:13 +0200 Subject: [PATCH 5/5] Podfile: Update use-dev-pods.sh --- use-dev-pods.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/use-dev-pods.sh b/use-dev-pods.sh index dd3d75323..c5dfa131f 100755 --- a/use-dev-pods.sh +++ b/use-dev-pods.sh @@ -8,9 +8,5 @@ echo Moving Podfile to develop Matrix pods ***REMOVED***.lock will be obsolete reset it rm -f Podfile.lock -# Disable the active pods -sed -i '' -E "s!^(pod)(.*MatrixSDK)!#\1\2!g" Podfile -sed -i '' -E "s!^(pod)(.*MatrixKit)!#\1\2!g" Podfile -# And enable the develop ones -sed -i '' -E "s!^(#pod)(.*MatrixSDK)(.*develop)!pod\2\3!g" Podfile -sed -i '' -E "s!^(#pod)(.*MatrixKit)(.*develop)!pod\2\3!g" Podfile +# Enable the develop one +sed -i '' -E "s!^(#)(.*'develop')!\2!g" Podfile \ No newline at end of file