-
Notifications
You must be signed in to change notification settings - Fork 497
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1972 from vector-im/disable_MatrixSDK_SwiftSupport
Disable 'MatrixSDK/SwiftSupport' pod
- Loading branch information
Showing
6 changed files
with
138 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| Copyright 2018 New Vector Ltd | ||
| 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 <MatrixSDK/MatrixSDK.h> | ||
|
|
||
| /** | ||
| IMPORTANT: This file must be removed once the pod 'MatrixSDK/SwiftSupport' can | ||
| be pushed. | ||
| Methods are redefined here to skip NS_REFINED_FOR_SWIFT defined in their declaration. | ||
| */ | ||
|
|
||
| @interface MXSession (Swift) | ||
|
|
||
| - (MXHTTPOperation*)createRoomFromSwift:(NSString*)name | ||
| visibility:(MXRoomDirectoryVisibility)visibility | ||
| roomAlias:(NSString*)roomAlias | ||
| topic:(NSString*)topic | ||
| invite:(NSArray<NSString*>*)inviteArray | ||
| invite3PID:(NSArray<MXInvite3PID*>*)invite3PIDArray | ||
| isDirect:(BOOL)isDirect | ||
| preset:(MXRoomPreset)preset | ||
| success:(void (^)(void))success | ||
| failure:(void (^)(NSError *error))failure; | ||
|
|
||
| @end | ||
|
|
||
|
|
||
| @interface MXRoomSummary (Swift) | ||
|
|
||
| @property (nonatomic, readonly) MXMembership membershipFromSwift; | ||
|
|
||
| @end | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| /* | ||
| Copyright 2018 New Vector Ltd | ||
| 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 <Foundation/Foundation.h> | ||
|
|
||
| #import "MatrixSDK+Swift.h" | ||
|
|
||
| @implementation MXSession (Swift) | ||
|
|
||
| - (MXHTTPOperation*)createRoomFromSwift:(NSString*)name | ||
| visibility:(MXRoomDirectoryVisibility)visibility | ||
| roomAlias:(NSString*)roomAlias | ||
| topic:(NSString*)topic | ||
| invite:(NSArray<NSString*>*)inviteArray | ||
| invite3PID:(NSArray<MXInvite3PID*>*)invite3PIDArray | ||
| isDirect:(BOOL)isDirect | ||
| preset:(MXRoomPreset)preset | ||
| success:(void (^)(void))success | ||
| failure:(void (^)(NSError *error))failure | ||
| { | ||
| return [self createRoom:name visibility:visibility roomAlias:roomAlias topic:topic invite:inviteArray invite3PID:invite3PIDArray isDirect:isDirect preset:preset success:^(MXRoom *room) { | ||
|
|
||
| if (success) | ||
| { | ||
| success(); | ||
| } | ||
| } failure:failure]; | ||
| } | ||
|
|
||
| @end | ||
|
|
||
| @implementation MXRoomSummary (Swift) | ||
|
|
||
| - (MXMembership)membershipFromSwift | ||
| { | ||
| return self.membership; | ||
| } | ||
|
|
||
| @end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,3 +4,4 @@ | |
|
|
||
| @import MatrixSDK; | ||
| #import "WebViewViewController.h" | ||
| #import "MatrixSDK+Swift.h" | ||