Skip to content

Commit a78123d

Browse files
mekyamekya
authored
Merge pull request #62 from ant-media/retain_fix
Retain fix
2 parents 8ba4974 + 47fe0de commit a78123d

18 files changed

+1136
-1157
lines changed

‎.swiftlint.yml

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
disabled_rules:
2+
- trailing_whitespace
3+
- force_cast
4+
- line_length
5+
- identifier_name
6+
- missing_docs
7+
- extension_access_modifier
8+
- type_body_length
9+
- file_length
10+
- function_body_length
11+
- force_try
12+
- attributes
13+
- cyclomatic_complexity
14+
- function_parameter_count
15+
- large_tuple
16+
- empty_count
17+
- type_name
18+
19+
opt_in_rules:
20+
- array_init
21+
- discouraged_object_literal
22+
- fallthrough
23+
- file_name_no_space
24+
- joined_default_parameter
25+
- unused_setter_value
26+
- xct_specific_matcher
27+
- unavailable_function
28+
- last_where
29+
- flatmap_over_map_reduce
30+
- collection_alignment
31+
- untyped_error_in_catch
32+
- yoda_condition
33+
- empty_string
34+
- type_name
35+
- implicit_getter
36+
- pattern_matching_keywords
37+
- unneeded_parentheses_in_closure_argument
38+
- number_separator
39+
- syntactic_sugar
40+
- first_where
41+
- closure_spacing
42+
- contains_over_first_not_nil
43+
- contains_over_filter_count
44+
- contains_over_filter_is_empty
45+
- contains_over_range_nil_comparison
46+
- weak_delegate
47+
- empty_count
48+
- optional_enum_case_matching
49+
- orphaned_doc_comment
50+
- prefer_self_type_over_type_of_self
51+
- explicit_init
52+
- overridden_super_call
53+
- redundant_nil_coalescing
54+
- attributes
55+
- operator_usage_whitespace
56+
- closure_end_indentation
57+
- prohibited_super_call
58+
- fatal_error_message
59+
- vertical_parameter_alignment_on_call
60+
- let_var_whitespace
61+
- literal_expression_end_indentation
62+
- ibinspectable_in_extension
63+
- prefer_zero_over_explicit_init
64+
- notification_center_detachment
65+
66+
reporter: "xcode"

‎ScreenShare/ScreenShare.entitlements

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<dict>
55
<key>com.apple.security.application-groups</key>
66
<array>
7-
<string>group.io.antmedia.ios.webrtc.sample</string>
7+
<string>group.io.antmedia.ios.webrtc-sample.screen.share</string>
88
</array>
99
</dict>
1010
</plist>

‎ScreenShare/ScreenShareDebug.entitlements

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>com.apple.security.application-groups</key>
6+
<array>
7+
<string>group.io.antmedia.ios.webrtc.sample</string>
8+
</array>
9+
</dict>
10+
</plist>

‎WebRTC-Sample-App/ConferenceViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ extension ConferenceViewController: AntMediaClientDelegate
9797
}
9898
public func playStarted(streamId: String) {
9999
print("play started");
100-
AntMediaClient.speakerOn();
100+
conferenceClient?.speakerOn()
101101
}
102102

103103
public func trackAdded(track: RTCMediaStreamTrack, stream: [RTCMediaStream]) {

‎WebRTC-Sample-App/VideoViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ extension VideoViewController: AntMediaClientDelegate {
307307
}
308308

309309
func audioSessionDidStartPlayOrRecord(streamId: String) {
310-
AntMediaClient.speakerOn()
310+
client?.speakerOn()
311311
}
312312

313313
func dataReceivedFromDataChannel(streamId: String, data: Data, binary: Bool) {

‎WebRTC-Sample-App/WebRTC-Sample-App.entitlements

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<dict>
55
<key>com.apple.security.application-groups</key>
66
<array>
7-
<string>group.io.antmedia.ios.webrtc.sample</string>
7+
<string>group.io.antmedia.ios.webrtc-sample</string>
88
</array>
99
</dict>
1010
</plist>

‎WebRTC-Sample-App/WebRTC-Sample-AppDebug.entitlements

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<dict>
55
<key>com.apple.security.application-groups</key>
66
<array>
7-
<string>group.io.antmedia.ios.webrtc.sample</string>
7+
<string>group.io.antmedia.ios.webrtc-sample</string>
88
</array>
99
</dict>
1010
</plist>

‎WebRTCiOSSDK.xcodeproj/project.pbxproj

+33-8
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,7 @@
458458
A8DABFC62A0639D80007CDE7 /* Sources */,
459459
A8DABFC72A0639D80007CDE7 /* Frameworks */,
460460
A8DABFC82A0639D80007CDE7 /* Resources */,
461+
A53238A32D4EDAD000D264DB /* SwiftLint */,
461462
);
462463
buildRules = (
463464
);
@@ -653,6 +654,28 @@
653654
};
654655
/* End PBXResourcesBuildPhase section */
655656

657+
/* Begin PBXShellScriptBuildPhase section */
658+
A53238A32D4EDAD000D264DB /* SwiftLint */ = {
659+
isa = PBXShellScriptBuildPhase;
660+
alwaysOutOfDate = 1;
661+
buildActionMask = 2147483647;
662+
files = (
663+
);
664+
inputFileListPaths = (
665+
);
666+
inputPaths = (
667+
);
668+
name = SwiftLint;
669+
outputFileListPaths = (
670+
);
671+
outputPaths = (
672+
);
673+
runOnlyForDeploymentPostprocessing = 0;
674+
shellPath = /bin/sh;
675+
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nexport PATH=\"$PATH:/opt/homebrew/bin\"\nif which swiftlint > /dev/null; then\n swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
676+
};
677+
/* End PBXShellScriptBuildPhase section */
678+
656679
/* Begin PBXSourcesBuildPhase section */
657680
A8B965F02A06969900D67CA1 /* Sources */ = {
658681
isa = PBXSourcesBuildPhase;
@@ -785,7 +808,7 @@
785808
CODE_SIGN_ENTITLEMENTS = ScreenShare/ScreenShare.entitlements;
786809
CODE_SIGN_STYLE = Automatic;
787810
CURRENT_PROJECT_VERSION = 1;
788-
DEVELOPMENT_TEAM = MJU7KX4L7S;
811+
DEVELOPMENT_TEAM = 2YK9J8G25K;
789812
GENERATE_INFOPLIST_FILE = YES;
790813
INFOPLIST_FILE = ScreenShare/Info.plist;
791814
INFOPLIST_KEY_CFBundleDisplayName = ScreenShare;
@@ -797,7 +820,7 @@
797820
"@executable_path/../../Frameworks",
798821
);
799822
MARKETING_VERSION = 1.0;
800-
PRODUCT_BUNDLE_IDENTIFIER = io.antmedia.ios.webrtc.sample.screen.share;
823+
PRODUCT_BUNDLE_IDENTIFIER = "io.antmedia.ios.webrtc-sample.screen.share";
801824
PRODUCT_NAME = "$(TARGET_NAME)";
802825
SKIP_INSTALL = YES;
803826
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -812,7 +835,7 @@
812835
CODE_SIGN_ENTITLEMENTS = ScreenShare/ScreenShare.entitlements;
813836
CODE_SIGN_STYLE = Automatic;
814837
CURRENT_PROJECT_VERSION = 1;
815-
DEVELOPMENT_TEAM = MJU7KX4L7S;
838+
DEVELOPMENT_TEAM = 2YK9J8G25K;
816839
GENERATE_INFOPLIST_FILE = YES;
817840
INFOPLIST_FILE = ScreenShare/Info.plist;
818841
INFOPLIST_KEY_CFBundleDisplayName = ScreenShare;
@@ -824,7 +847,7 @@
824847
"@executable_path/../../Frameworks",
825848
);
826849
MARKETING_VERSION = 1.0;
827-
PRODUCT_BUNDLE_IDENTIFIER = io.antmedia.ios.webrtc.sample.screen.share;
850+
PRODUCT_BUNDLE_IDENTIFIER = "io.antmedia.ios.webrtc-sample.screen.share";
828851
PRODUCT_NAME = "$(TARGET_NAME)";
829852
SKIP_INSTALL = YES;
830853
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -967,6 +990,7 @@
967990
DYLIB_CURRENT_VERSION = 1;
968991
DYLIB_INSTALL_NAME_BASE = "@rpath";
969992
ENABLE_MODULE_VERIFIER = YES;
993+
ENABLE_USER_SCRIPT_SANDBOXING = NO;
970994
GENERATE_INFOPLIST_FILE = YES;
971995
INFOPLIST_KEY_NSHumanReadableCopyright = "";
972996
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1002,6 +1026,7 @@
10021026
DYLIB_CURRENT_VERSION = 1;
10031027
DYLIB_INSTALL_NAME_BASE = "@rpath";
10041028
ENABLE_MODULE_VERIFIER = YES;
1029+
ENABLE_USER_SCRIPT_SANDBOXING = NO;
10051030
GENERATE_INFOPLIST_FILE = YES;
10061031
INFOPLIST_KEY_NSHumanReadableCopyright = "";
10071032
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1071,7 +1096,7 @@
10711096
CODE_SIGN_IDENTITY = "Apple Development";
10721097
CODE_SIGN_STYLE = Automatic;
10731098
CURRENT_PROJECT_VERSION = 1;
1074-
DEVELOPMENT_TEAM = MJU7KX4L7S;
1099+
DEVELOPMENT_TEAM = 2YK9J8G25K;
10751100
GENERATE_INFOPLIST_FILE = YES;
10761101
INFOPLIST_FILE = "WebRTC-Sample-App/Info.plist";
10771102
INFOPLIST_KEY_CFBundleDisplayName = "WebRTC Sample";
@@ -1088,7 +1113,7 @@
10881113
"@executable_path/Frameworks",
10891114
);
10901115
MARKETING_VERSION = 1.0;
1091-
PRODUCT_BUNDLE_IDENTIFIER = io.antmedia.ios.webrtc.sample;
1116+
PRODUCT_BUNDLE_IDENTIFIER = "io.antmedia.ios.webrtc-sample";
10921117
PRODUCT_NAME = "$(TARGET_NAME)";
10931118
PROVISIONING_PROFILE_SPECIFIER = "";
10941119
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1110,7 +1135,7 @@
11101135
CODE_SIGN_IDENTITY = "Apple Development";
11111136
CODE_SIGN_STYLE = Automatic;
11121137
CURRENT_PROJECT_VERSION = 1;
1113-
DEVELOPMENT_TEAM = MJU7KX4L7S;
1138+
DEVELOPMENT_TEAM = 2YK9J8G25K;
11141139
GENERATE_INFOPLIST_FILE = YES;
11151140
INFOPLIST_FILE = "WebRTC-Sample-App/Info.plist";
11161141
INFOPLIST_KEY_CFBundleDisplayName = "WebRTC Sample";
@@ -1127,7 +1152,7 @@
11271152
"@executable_path/Frameworks",
11281153
);
11291154
MARKETING_VERSION = 1.0;
1130-
PRODUCT_BUNDLE_IDENTIFIER = io.antmedia.ios.webrtc.sample;
1155+
PRODUCT_BUNDLE_IDENTIFIER = "io.antmedia.ios.webrtc-sample";
11311156
PRODUCT_NAME = "$(TARGET_NAME)";
11321157
PROVISIONING_PROFILE_SPECIFIER = "";
11331158
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

0 commit comments

Comments
 (0)