mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-28 15:22:39 +00:00
Using the App Extension compaitable versions of the MatrixSDK and MatrioxKit for the Share Extension.
This commit is contained in:
Aram Sargsyan
parent
e26300f84e
commit
b005f8c455
5 changed files with 184 additions and 89 deletions
27
Podfile
27
Podfile
|
|
@ -8,9 +8,9 @@ target "Riot" do
|
|||
|
||||
# Different flavours of pods to MatrixKit
|
||||
# The tagged version on which this version of Riot has been built
|
||||
pod 'MatrixKit', '0.5.2'
|
||||
#pod 'MatrixKit', '0.5.2'
|
||||
|
||||
# The lastest release available on the CocoaPods repository
|
||||
# The lastest release available on the CocoaPods repository
|
||||
#pod 'MatrixKit'
|
||||
|
||||
# The develop branch version
|
||||
|
|
@ -19,8 +19,8 @@ pod 'MatrixKit', '0.5.2'
|
|||
|
||||
# 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'
|
||||
pod 'MatrixKit', :path => '../matrix-ios-kit/MatrixKit.podspec'
|
||||
pod 'MatrixSDK', :path => '../matrix-ios-sdk/MatrixSDK.podspec'
|
||||
|
||||
pod 'GBDeviceInfo', '~> 4.3.0'
|
||||
|
||||
|
|
@ -38,6 +38,25 @@ pod 'Realm', '~> 2.8.1'
|
|||
pod 'OLMKit', :inhibit_warnings => true
|
||||
pod 'cmark', :inhibit_warnings => true
|
||||
pod 'DTCoreText', :inhibit_warnings => true
|
||||
|
||||
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.8.1'
|
||||
|
||||
pod 'MatrixSDK/AppExtension', :path => '../matrix-ios-sdk/MatrixSDK.podspec'
|
||||
pod 'MatrixKit/AppExtension', :path => '../matrix-ios-kitMatrixKit.podspec'
|
||||
|
||||
end
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
46
Podfile.lock
46
Podfile.lock
|
|
@ -26,6 +26,11 @@ PODS:
|
|||
- DTFoundation/DTAnimatedGIF (~> 1.7.5)
|
||||
- DTFoundation/DTHTMLParser (~> 1.7.5)
|
||||
- DTFoundation/UIKit (~> 1.7.5)
|
||||
- DTCoreText/Extension (1.6.20):
|
||||
- DTFoundation/Core (~> 1.7.5)
|
||||
- DTFoundation/DTAnimatedGIF (~> 1.7.5)
|
||||
- DTFoundation/DTHTMLParser (~> 1.7.5)
|
||||
- DTFoundation/UIKit (~> 1.7.5)
|
||||
- DTFoundation/Core (1.7.12)
|
||||
- DTFoundation/DTAnimatedGIF (1.7.12)
|
||||
- DTFoundation/DTHTMLParser (1.7.12):
|
||||
|
|
@ -41,13 +46,33 @@ PODS:
|
|||
- libPhoneNumber-iOS (0.9.10)
|
||||
- MatrixKit (0.5.2):
|
||||
- cmark (~> 0.24.1)
|
||||
- DTCoreText (~> 1.6.17)
|
||||
- HPGrowingTextView (~> 1.1)
|
||||
- libPhoneNumber-iOS (~> 0.9.10)
|
||||
- MatrixSDK (= 0.8.2)
|
||||
- MatrixKit/Core (= 0.5.2)
|
||||
- MatrixKit/AppExtension (0.5.2):
|
||||
- cmark (~> 0.24.1)
|
||||
- DTCoreText/Extension
|
||||
- HPGrowingTextView (~> 1.1)
|
||||
- libPhoneNumber-iOS (~> 0.9.10)
|
||||
- MatrixKit/Core
|
||||
- MatrixSDK/AppExtension
|
||||
- MatrixKit/Core (0.5.2):
|
||||
- cmark (~> 0.24.1)
|
||||
- DTCoreText
|
||||
- HPGrowingTextView (~> 1.1)
|
||||
- libPhoneNumber-iOS (~> 0.9.10)
|
||||
- MatrixSDK/Core
|
||||
- MatrixSDK (0.8.2):
|
||||
- AFNetworking (~> 3.1.0)
|
||||
- GZIP (~> 1.1.1)
|
||||
- MatrixSDK/Core (= 0.8.2)
|
||||
- MatrixSDK/AppExtension (0.8.2):
|
||||
- AFNetworking (~> 3.1.0)
|
||||
- GZIP (~> 1.1.1)
|
||||
- MatrixSDK/Core
|
||||
- MatrixSDK/Core (0.8.2):
|
||||
- AFNetworking (~> 3.1.0)
|
||||
- GZIP (~> 1.1.1)
|
||||
- OLMKit (2.2.2):
|
||||
- OLMKit/olmc (= 2.2.2)
|
||||
- OLMKit/olmcpp (= 2.2.2)
|
||||
|
|
@ -63,11 +88,20 @@ DEPENDENCIES:
|
|||
- DTCoreText
|
||||
- GBDeviceInfo (~> 4.3.0)
|
||||
- GoogleAnalytics
|
||||
- MatrixKit (= 0.5.2)
|
||||
- MatrixKit (from `../matrix-ios-kit/MatrixKit.podspec`)
|
||||
- MatrixKit/AppExtension (from `../matrix-ios-kit/MatrixKit.podspec`)
|
||||
- MatrixSDK (from `../matrix-ios-sdk/MatrixSDK.podspec`)
|
||||
- MatrixSDK/AppExtension (from `../matrix-ios-sdk/MatrixSDK.podspec`)
|
||||
- OLMKit
|
||||
- Realm (~> 2.8.1)
|
||||
- WebRTC (= 58.17.16937)
|
||||
|
||||
EXTERNAL SOURCES:
|
||||
MatrixKit:
|
||||
:path: ../matrix-ios-kit/MatrixKit.podspec
|
||||
MatrixSDK:
|
||||
:path: ../matrix-ios-sdk/MatrixSDK.podspec
|
||||
|
||||
SPEC CHECKSUMS:
|
||||
AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
|
||||
cmark: ec0275215b504780287b6fca360224e384368af8
|
||||
|
|
@ -78,12 +112,12 @@ SPEC CHECKSUMS:
|
|||
GZIP: f8beb59597f651e6970a45b816508a9c6d700b77
|
||||
HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19
|
||||
libPhoneNumber-iOS: f721ae4d5854bce60934f9fb9b0b28e8e68913cb
|
||||
MatrixKit: daad23e5724d8f26a44a322f4d259a26b614ddc6
|
||||
MatrixSDK: 1f9b5fa6334485c431884d2d2ea9ac5f65557528
|
||||
MatrixKit: ca0494158f6acaf725e31ef94b7a481c5280b6ae
|
||||
MatrixSDK: 3210d156fee0d4628dbe9180bb1709cfb155cf31
|
||||
OLMKit: b9d8c0ffee9ea8c45bc0aaa9afb47f93fba7efbd
|
||||
Realm: 3601ef091c8c499a31101d8563b991e75546cdce
|
||||
WebRTC: 1e9a85bf75509eec44be6478c64e9de65ac82332
|
||||
|
||||
PODFILE CHECKSUM: ba9311a74b4af32f75db5053d87c9f7181a42d17
|
||||
PODFILE CHECKSUM: 72052e939c3aeb10e1f729ff8e934cc1f3dc7d72
|
||||
|
||||
COCOAPODS: 1.2.1
|
||||
|
|
|
|||
|
|
@ -1,10 +1,18 @@
|
|||
//
|
||||
// ShareViewController.h
|
||||
// Riot Share Extension
|
||||
//
|
||||
// Created by Aram Sargsyan on 7/6/17.
|
||||
// Copyright © 2017 matrix.org. All rights reserved.
|
||||
//
|
||||
/*
|
||||
Copyright 2017 Aram Sargsyan
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
#import <UIKit/UIKit.h>
|
||||
#import <Social/Social.h>
|
||||
|
|
|
|||
|
|
@ -1,21 +1,24 @@
|
|||
//
|
||||
// ShareViewController.m
|
||||
// Riot Share Extension
|
||||
//
|
||||
// Created by Aram Sargsyan on 7/6/17.
|
||||
// Copyright © 2017 matrix.org. All rights reserved.
|
||||
//
|
||||
/*
|
||||
Copyright 2017 Aram Sargsyan
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
#import "ShareViewController.h"
|
||||
|
||||
//#import "ReadReceiptsViewController.h"
|
||||
#import <MatrixSDK/MatrixSDK.h>
|
||||
#import <MatrixKit/MatrixKit.h>
|
||||
|
||||
//#import <MatrixSDK/MatrixSDK.h>
|
||||
|
||||
|
||||
@interface ShareViewController ()
|
||||
|
||||
@end
|
||||
|
||||
@implementation ShareViewController
|
||||
|
||||
|
|
@ -26,26 +29,21 @@
|
|||
[super viewDidLoad];
|
||||
|
||||
//UI configuration
|
||||
self.view.opaque = YES;
|
||||
|
||||
[self.view setBackgroundColor:[UIColor yellowColor]];
|
||||
self.view.alpha = 0.5;
|
||||
|
||||
//MatrixSDK test
|
||||
//NSLog(@"SDK VERSION ====== %@", MatrixSDKVersion);
|
||||
NSLog(@"SDK VERSION ====== %@", MatrixSDKVersion);
|
||||
|
||||
//MatrixKit test
|
||||
NSLog(@"KIT VERSION ====== %@", MatrixKitVersion);
|
||||
|
||||
//UserDefaults test
|
||||
//NSUserDefaults *sharedUserDefaults = [[NSUserDefaults alloc] initWithSuiteName:@"group.org.matrix.riot"];
|
||||
}
|
||||
|
||||
- (void)viewDidAppear:(BOOL)animated {
|
||||
[super viewDidAppear:animated];
|
||||
|
||||
//[ReadReceiptsViewController openInViewController:self fromContainer:nil withSession:nil];
|
||||
}
|
||||
|
||||
|
||||
#pragma mark - SLComposeServiceViewController
|
||||
/*#pragma mark - SLComposeServiceViewController
|
||||
|
||||
- (BOOL)isContentValid
|
||||
{
|
||||
|
|
@ -65,6 +63,6 @@
|
|||
{
|
||||
// To add configuration options via table cells at the bottom of the sheet, return an array of SLComposeSheetConfigurationItem here.
|
||||
return @[];
|
||||
}
|
||||
}*/
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -7,11 +7,12 @@
|
|||
objects = {
|
||||
|
||||
/* Begin PBXBuildFile section */
|
||||
05D592A32FF1D1877B89F73C /* libPods-Riot.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD9D0BDE9232898950554DD5 /* libPods-Riot.a */; };
|
||||
24B5103E1EFA7083004C6AD2 /* ReadReceiptsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 24B5103D1EFA7083004C6AD2 /* ReadReceiptsViewController.m */; };
|
||||
24B510401EFA88CC004C6AD2 /* ReadReceiptsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 24B5103F1EFA88CC004C6AD2 /* ReadReceiptsViewController.xib */; };
|
||||
24CBEC521F0EAD310093EABB /* ShareViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 24CBEC511F0EAD310093EABB /* ShareViewController.m */; };
|
||||
24CBEC551F0EAD310093EABB /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 24CBEC531F0EAD310093EABB /* MainInterface.storyboard */; };
|
||||
24CBEC591F0EAD310093EABB /* Riot Share Extension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 24CBEC4E1F0EAD310093EABB /* Riot Share Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
|
||||
24CBEC591F0EAD310093EABB /* RiotShareExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 24CBEC4E1F0EAD310093EABB /* RiotShareExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
|
||||
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 */; };
|
||||
|
|
@ -28,7 +29,7 @@
|
|||
32D392191EB9B7AB009A2BAF /* DirectoryServerDetailTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 32D392171EB9B7AB009A2BAF /* DirectoryServerDetailTableViewCell.xib */; };
|
||||
32FD0A3D1EB0CD9B0072B066 /* BugReportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FD0A3B1EB0CD9B0072B066 /* BugReportViewController.m */; };
|
||||
32FD0A3E1EB0CD9B0072B066 /* BugReportViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 32FD0A3C1EB0CD9B0072B066 /* BugReportViewController.xib */; };
|
||||
E2EAC1A4FBD6FE5228584591 /* libPods-Riot.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D8737F782E108CFD6908691 /* libPods-Riot.a */; };
|
||||
A27ECCE3FC4971745D2CB78D /* libPods-RiotShareExtension.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7246451C668D6782166E22EC /* libPods-RiotShareExtension.a */; };
|
||||
F02C1A861E8EB04C0045A404 /* PeopleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F02C1A841E8EB04C0045A404 /* PeopleViewController.m */; };
|
||||
F05BD79E1E7AEBF800C69941 /* UnifiedSearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F05BD79D1E7AEBF800C69941 /* UnifiedSearchViewController.m */; };
|
||||
F05BD7A11E7C0E4500C69941 /* MasterTabBarController.m in Sources */ = {isa = PBXBuildFile; fileRef = F05BD7A01E7C0E4500C69941 /* MasterTabBarController.m */; };
|
||||
|
|
@ -472,7 +473,7 @@
|
|||
/* End PBXBuildFile section */
|
||||
|
||||
/* Begin PBXContainerItemProxy section */
|
||||
24CBEC571F0EAD310093EABB /* PBXContainerItemProxy */ = {
|
||||
242661F51F12B1BA00D3FC08 /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = F094A99A1B78D8F000B1FBBF /* Project object */;
|
||||
proxyType = 1;
|
||||
|
|
@ -495,7 +496,7 @@
|
|||
dstPath = "";
|
||||
dstSubfolderSpec = 13;
|
||||
files = (
|
||||
24CBEC591F0EAD310093EABB /* Riot Share Extension.appex in Embed App Extensions */,
|
||||
24CBEC591F0EAD310093EABB /* RiotShareExtension.appex in Embed App Extensions */,
|
||||
);
|
||||
name = "Embed App Extensions";
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
|
|
@ -503,11 +504,11 @@
|
|||
/* End PBXCopyFilesBuildPhase section */
|
||||
|
||||
/* Begin PBXFileReference section */
|
||||
1129C74A281B080432B1A1A1 /* 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 = "<group>"; };
|
||||
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 = "<group>"; };
|
||||
24B5103C1EFA7083004C6AD2 /* ReadReceiptsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadReceiptsViewController.h; sourceTree = "<group>"; };
|
||||
24B5103D1EFA7083004C6AD2 /* ReadReceiptsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReadReceiptsViewController.m; sourceTree = "<group>"; };
|
||||
24B5103F1EFA88CC004C6AD2 /* ReadReceiptsViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ReadReceiptsViewController.xib; sourceTree = "<group>"; };
|
||||
24CBEC4E1F0EAD310093EABB /* Riot Share Extension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "Riot Share Extension.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
24CBEC4E1F0EAD310093EABB /* RiotShareExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = RiotShareExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
24CBEC501F0EAD310093EABB /* ShareViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShareViewController.h; sourceTree = "<group>"; };
|
||||
24CBEC511F0EAD310093EABB /* ShareViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShareViewController.m; sourceTree = "<group>"; };
|
||||
24CBEC541F0EAD310093EABB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/MainInterface.storyboard; sourceTree = "<group>"; };
|
||||
|
|
@ -535,11 +536,10 @@
|
|||
32FD0A3A1EB0CD9B0072B066 /* BugReportViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BugReportViewController.h; sourceTree = "<group>"; };
|
||||
32FD0A3B1EB0CD9B0072B066 /* BugReportViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BugReportViewController.m; sourceTree = "<group>"; };
|
||||
32FD0A3C1EB0CD9B0072B066 /* BugReportViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BugReportViewController.xib; sourceTree = "<group>"; };
|
||||
4AB8072E21D9EC377EDB0ED5 /* Pods-Riot-Riot Share Extension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Riot-Riot Share Extension.release.xcconfig"; path = "Pods/Target Support Files/Pods-Riot-Riot Share Extension/Pods-Riot-Riot Share Extension.release.xcconfig"; sourceTree = "<group>"; };
|
||||
6B58373020E541A6BF349B58 /* Pods-Riot-Riot Share Extension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Riot-Riot Share Extension.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Riot-Riot Share Extension/Pods-Riot-Riot Share Extension.debug.xcconfig"; sourceTree = "<group>"; };
|
||||
7D8737F782E108CFD6908691 /* libPods-Riot.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Riot.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
819E16C311F0444E87E41D61 /* libPods-Riot-Riot Share Extension.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Riot-Riot Share Extension.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
C6EEF4817F530E6D3263CE0B /* libPods-Riot Share Extension.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Riot Share Extension.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 = "<group>"; };
|
||||
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 = "<group>"; };
|
||||
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 = "<group>"; };
|
||||
F02C1A831E8EB04C0045A404 /* PeopleViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PeopleViewController.h; sourceTree = "<group>"; };
|
||||
F02C1A841E8EB04C0045A404 /* PeopleViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PeopleViewController.m; sourceTree = "<group>"; };
|
||||
F05BD79C1E7AEBF800C69941 /* UnifiedSearchViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnifiedSearchViewController.h; sourceTree = "<group>"; };
|
||||
|
|
@ -1103,7 +1103,7 @@
|
|||
F0E05A2D1EA0F9EB004B83FB /* tab_rooms.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tab_rooms.png; sourceTree = "<group>"; };
|
||||
F0E05A2E1EA0F9EB004B83FB /* tab_rooms@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tab_rooms@2x.png"; sourceTree = "<group>"; };
|
||||
F0E05A2F1EA0F9EB004B83FB /* tab_rooms@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tab_rooms@3x.png"; sourceTree = "<group>"; };
|
||||
F9D678EF54918C036FDEDBF9 /* 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 = "<group>"; };
|
||||
FD9D0BDE9232898950554DD5 /* libPods-Riot.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Riot.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
/* End PBXFileReference section */
|
||||
|
||||
/* Begin PBXFrameworksBuildPhase section */
|
||||
|
|
@ -1111,6 +1111,7 @@
|
|||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
A27ECCE3FC4971745D2CB78D /* libPods-RiotShareExtension.a in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
@ -1118,7 +1119,7 @@
|
|||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
E2EAC1A4FBD6FE5228584591 /* libPods-Riot.a in Frameworks */,
|
||||
05D592A32FF1D1877B89F73C /* libPods-Riot.a in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
@ -1167,23 +1168,22 @@
|
|||
path = nl.lproj;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
6567B0BBF3C05D7F7A7F79CC /* Frameworks */ = {
|
||||
5FC42FA41F5186AFFB6A2404 /* Frameworks */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
7D8737F782E108CFD6908691 /* libPods-Riot.a */,
|
||||
C6EEF4817F530E6D3263CE0B /* libPods-Riot Share Extension.a */,
|
||||
819E16C311F0444E87E41D61 /* libPods-Riot-Riot Share Extension.a */,
|
||||
FD9D0BDE9232898950554DD5 /* libPods-Riot.a */,
|
||||
7246451C668D6782166E22EC /* libPods-RiotShareExtension.a */,
|
||||
);
|
||||
name = Frameworks;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
E1451F540F8BC02A7FB7AA31 /* Pods */ = {
|
||||
7471DF3720D498384A068DA7 /* Pods */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
1129C74A281B080432B1A1A1 /* Pods-Riot.debug.xcconfig */,
|
||||
F9D678EF54918C036FDEDBF9 /* Pods-Riot.release.xcconfig */,
|
||||
6B58373020E541A6BF349B58 /* Pods-Riot-Riot Share Extension.debug.xcconfig */,
|
||||
4AB8072E21D9EC377EDB0ED5 /* Pods-Riot-Riot Share Extension.release.xcconfig */,
|
||||
839BB91240D350D5607D55BA /* Pods-Riot.debug.xcconfig */,
|
||||
C195C53961EA28E6900AEB68 /* Pods-Riot.release.xcconfig */,
|
||||
12AA0005C8B3D8D8162584C5 /* Pods-RiotShareExtension.debug.xcconfig */,
|
||||
765F5104DB3EC39713DEB3A4 /* Pods-RiotShareExtension.release.xcconfig */,
|
||||
);
|
||||
name = Pods;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -2020,8 +2020,8 @@
|
|||
F083BB021E7005FD00A9B29C /* RiotTests */,
|
||||
24CBEC4F1F0EAD310093EABB /* Riot Share Extension */,
|
||||
F094A9A31B78D8F000B1FBBF /* Products */,
|
||||
E1451F540F8BC02A7FB7AA31 /* Pods */,
|
||||
6567B0BBF3C05D7F7A7F79CC /* Frameworks */,
|
||||
7471DF3720D498384A068DA7 /* Pods */,
|
||||
5FC42FA41F5186AFFB6A2404 /* Frameworks */,
|
||||
);
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
|
|
@ -2030,7 +2030,7 @@
|
|||
children = (
|
||||
F094A9A21B78D8F000B1FBBF /* Riot.app */,
|
||||
F094A9BE1B78D8F000B1FBBF /* RiotTests.xctest */,
|
||||
24CBEC4E1F0EAD310093EABB /* Riot Share Extension.appex */,
|
||||
24CBEC4E1F0EAD310093EABB /* RiotShareExtension.appex */,
|
||||
);
|
||||
name = Products;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -2038,39 +2038,41 @@
|
|||
/* End PBXGroup section */
|
||||
|
||||
/* Begin PBXNativeTarget section */
|
||||
24CBEC4D1F0EAD310093EABB /* Riot Share Extension */ = {
|
||||
24CBEC4D1F0EAD310093EABB /* RiotShareExtension */ = {
|
||||
isa = PBXNativeTarget;
|
||||
buildConfigurationList = 24CBEC5C1F0EAD310093EABB /* Build configuration list for PBXNativeTarget "Riot Share Extension" */;
|
||||
buildConfigurationList = 24CBEC5C1F0EAD310093EABB /* Build configuration list for PBXNativeTarget "RiotShareExtension" */;
|
||||
buildPhases = (
|
||||
3051A9ED306E05F8AE91C906 /* [CP] Check Pods Manifest.lock */,
|
||||
24CBEC4A1F0EAD310093EABB /* Sources */,
|
||||
24CBEC4B1F0EAD310093EABB /* Frameworks */,
|
||||
24CBEC4C1F0EAD310093EABB /* Resources */,
|
||||
8EA19F5011654D3BD5EDAC33 /* [CP] Copy Pods Resources */,
|
||||
);
|
||||
buildRules = (
|
||||
);
|
||||
dependencies = (
|
||||
);
|
||||
name = "Riot Share Extension";
|
||||
name = RiotShareExtension;
|
||||
productName = "Riot Share Extension";
|
||||
productReference = 24CBEC4E1F0EAD310093EABB /* Riot Share Extension.appex */;
|
||||
productReference = 24CBEC4E1F0EAD310093EABB /* RiotShareExtension.appex */;
|
||||
productType = "com.apple.product-type.app-extension";
|
||||
};
|
||||
F094A9A11B78D8F000B1FBBF /* Riot */ = {
|
||||
isa = PBXNativeTarget;
|
||||
buildConfigurationList = F094A9C81B78D8F000B1FBBF /* Build configuration list for PBXNativeTarget "Riot" */;
|
||||
buildPhases = (
|
||||
9131C24971B46D743282FCF6 /* [CP] Check Pods Manifest.lock */,
|
||||
2372F8E1A49557FE0072BC56 /* [CP] Check Pods Manifest.lock */,
|
||||
F094A99E1B78D8F000B1FBBF /* Sources */,
|
||||
F094A99F1B78D8F000B1FBBF /* Frameworks */,
|
||||
F094A9A01B78D8F000B1FBBF /* Resources */,
|
||||
44C35695CFA4F9799C449367 /* [CP] Copy Pods Resources */,
|
||||
381DA4CC07D2104BFA23E45A /* [CP] Embed Pods Frameworks */,
|
||||
24CBEC5D1F0EAD310093EABB /* Embed App Extensions */,
|
||||
7FFD40AA75DB32D83350D225 /* [CP] Embed Pods Frameworks */,
|
||||
68D6013FA64A4507DC9DB95B /* [CP] Copy Pods Resources */,
|
||||
);
|
||||
buildRules = (
|
||||
);
|
||||
dependencies = (
|
||||
24CBEC581F0EAD310093EABB /* PBXTargetDependency */,
|
||||
242661F61F12B1BA00D3FC08 /* PBXTargetDependency */,
|
||||
);
|
||||
name = Riot;
|
||||
productName = Vector;
|
||||
|
|
@ -2150,7 +2152,7 @@
|
|||
targets = (
|
||||
F094A9A11B78D8F000B1FBBF /* Riot */,
|
||||
F094A9BD1B78D8F000B1FBBF /* RiotTests */,
|
||||
24CBEC4D1F0EAD310093EABB /* Riot Share Extension */,
|
||||
24CBEC4D1F0EAD310093EABB /* RiotShareExtension */,
|
||||
);
|
||||
};
|
||||
/* End PBXProject section */
|
||||
|
|
@ -2511,22 +2513,37 @@
|
|||
/* End PBXResourcesBuildPhase section */
|
||||
|
||||
/* Begin PBXShellScriptBuildPhase section */
|
||||
381DA4CC07D2104BFA23E45A /* [CP] Embed Pods Frameworks */ = {
|
||||
2372F8E1A49557FE0072BC56 /* [CP] Check Pods Manifest.lock */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
);
|
||||
name = "[CP] Embed Pods Frameworks";
|
||||
name = "[CP] Check Pods Manifest.lock";
|
||||
outputPaths = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Riot/Pods-Riot-frameworks.sh\"\n";
|
||||
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
44C35695CFA4F9799C449367 /* [CP] Copy Pods Resources */ = {
|
||||
3051A9ED306E05F8AE91C906 /* [CP] Check Pods Manifest.lock */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
);
|
||||
name = "[CP] Check Pods Manifest.lock";
|
||||
outputPaths = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
68D6013FA64A4507DC9DB95B /* [CP] Copy Pods Resources */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
|
|
@ -2541,19 +2558,34 @@
|
|||
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Riot/Pods-Riot-resources.sh\"\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
9131C24971B46D743282FCF6 /* [CP] Check Pods Manifest.lock */ = {
|
||||
7FFD40AA75DB32D83350D225 /* [CP] Embed Pods Frameworks */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
);
|
||||
name = "[CP] Check Pods Manifest.lock";
|
||||
name = "[CP] Embed Pods Frameworks";
|
||||
outputPaths = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
|
||||
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Riot/Pods-Riot-frameworks.sh\"\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
8EA19F5011654D3BD5EDAC33 /* [CP] Copy Pods Resources */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
);
|
||||
name = "[CP] Copy Pods Resources";
|
||||
outputPaths = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RiotShareExtension/Pods-RiotShareExtension-resources.sh\"\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
/* End PBXShellScriptBuildPhase section */
|
||||
|
|
@ -2712,10 +2744,10 @@
|
|||
/* End PBXSourcesBuildPhase section */
|
||||
|
||||
/* Begin PBXTargetDependency section */
|
||||
24CBEC581F0EAD310093EABB /* PBXTargetDependency */ = {
|
||||
242661F61F12B1BA00D3FC08 /* PBXTargetDependency */ = {
|
||||
isa = PBXTargetDependency;
|
||||
target = 24CBEC4D1F0EAD310093EABB /* Riot Share Extension */;
|
||||
targetProxy = 24CBEC571F0EAD310093EABB /* PBXContainerItemProxy */;
|
||||
target = 24CBEC4D1F0EAD310093EABB /* RiotShareExtension */;
|
||||
targetProxy = 242661F51F12B1BA00D3FC08 /* PBXContainerItemProxy */;
|
||||
};
|
||||
F094A9C01B78D8F000B1FBBF /* PBXTargetDependency */ = {
|
||||
isa = PBXTargetDependency;
|
||||
|
|
@ -2802,6 +2834,7 @@
|
|||
/* Begin XCBuildConfiguration section */
|
||||
24CBEC5A1F0EAD310093EABB /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = 12AA0005C8B3D8D8162584C5 /* Pods-RiotShareExtension.debug.xcconfig */;
|
||||
buildSettings = {
|
||||
APPLICATION_EXTENSION_API_ONLY = YES;
|
||||
CLANG_ANALYZER_NONNULL = YES;
|
||||
|
|
@ -2810,6 +2843,7 @@
|
|||
CODE_SIGN_ENTITLEMENTS = "Riot Share Extension/Riot Share Extension.entitlements";
|
||||
DEBUG_INFORMATION_FORMAT = dwarf;
|
||||
DEVELOPMENT_TEAM = 7J4U792NQT;
|
||||
ENABLE_BITCODE = NO;
|
||||
INFOPLIST_FILE = "Riot Share Extension/Info.plist";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
|
||||
|
|
@ -2821,6 +2855,7 @@
|
|||
};
|
||||
24CBEC5B1F0EAD310093EABB /* Release */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = 765F5104DB3EC39713DEB3A4 /* Pods-RiotShareExtension.release.xcconfig */;
|
||||
buildSettings = {
|
||||
APPLICATION_EXTENSION_API_ONLY = YES;
|
||||
CLANG_ANALYZER_NONNULL = YES;
|
||||
|
|
@ -2830,6 +2865,7 @@
|
|||
COPY_PHASE_STRIP = NO;
|
||||
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
||||
DEVELOPMENT_TEAM = 7J4U792NQT;
|
||||
ENABLE_BITCODE = NO;
|
||||
INFOPLIST_FILE = "Riot Share Extension/Info.plist";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
|
||||
|
|
@ -2926,7 +2962,7 @@
|
|||
};
|
||||
F094A9C91B78D8F000B1FBBF /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = 1129C74A281B080432B1A1A1 /* Pods-Riot.debug.xcconfig */;
|
||||
baseConfigurationReference = 839BB91240D350D5607D55BA /* Pods-Riot.debug.xcconfig */;
|
||||
buildSettings = {
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
CODE_SIGN_ENTITLEMENTS = Riot/Riot.entitlements;
|
||||
|
|
@ -2944,7 +2980,7 @@
|
|||
};
|
||||
F094A9CA1B78D8F000B1FBBF /* Release */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = F9D678EF54918C036FDEDBF9 /* Pods-Riot.release.xcconfig */;
|
||||
baseConfigurationReference = C195C53961EA28E6900AEB68 /* Pods-Riot.release.xcconfig */;
|
||||
buildSettings = {
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
CODE_SIGN_ENTITLEMENTS = Riot/Riot.entitlements;
|
||||
|
|
@ -3000,7 +3036,7 @@
|
|||
/* End XCBuildConfiguration section */
|
||||
|
||||
/* Begin XCConfigurationList section */
|
||||
24CBEC5C1F0EAD310093EABB /* Build configuration list for PBXNativeTarget "Riot Share Extension" */ = {
|
||||
24CBEC5C1F0EAD310093EABB /* Build configuration list for PBXNativeTarget "RiotShareExtension" */ = {
|
||||
isa = XCConfigurationList;
|
||||
buildConfigurations = (
|
||||
24CBEC5A1F0EAD310093EABB /* Debug */,
|
||||
|
|
|
|||
Loading…
Reference in a new issue