From 93d3e0f6683e19115c72c1bb166c7019b09c50a4 Mon Sep 17 00:00:00 2001 From: Eugene Nikolskyi Date: Tue, 24 Mar 2015 10:51:43 -0700 Subject: [PATCH 01/27] Extract common imports into the precompiled header for tests --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 553fbf89..2255a1b8 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 553fbf89b342d2746c87918ed35adafc16cd9367 +Subproject commit 2255a1b8f649d14923a3986ab983faa1b1f8982d From 2c2f59eafd7625680ba1b6ba13d6f434f25e41b2 Mon Sep 17 00:00:00 2001 From: Eugene Nikolskyi Date: Tue, 24 Mar 2015 12:17:57 -0700 Subject: [PATCH 02/27] NetcastTVService: replace deprecated `entityEncode:` usage with XML writer --- ConnectSDK.xcodeproj/project.pbxproj | 6 ++++++ core | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ConnectSDK.xcodeproj/project.pbxproj b/ConnectSDK.xcodeproj/project.pbxproj index 5cd7098b..6d0c4daf 100644 --- a/ConnectSDK.xcodeproj/project.pbxproj +++ b/ConnectSDK.xcodeproj/project.pbxproj @@ -50,6 +50,7 @@ 4498D9A51A66148F008C0B72 /* upnperror_response_xbox.xml in Resources */ = {isa = PBXBuildFile; fileRef = 4498D9A41A66148F008C0B72 /* upnperror_response_xbox.xml */; }; 4498D9A71A661500008C0B72 /* upnperror_response_sonos.xml in Resources */ = {isa = PBXBuildFile; fileRef = 4498D9A61A661500008C0B72 /* upnperror_response_sonos.xml */; }; 4498D9A91A66F027008C0B72 /* DLNAHTTPServerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4498D9A81A66F027008C0B72 /* DLNAHTTPServerTests.m */; }; + 44A5518F1AC1DF4C001AF783 /* NetcastTVServiceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 44A5518E1AC1DF4C001AF783 /* NetcastTVServiceTests.m */; }; 44BCC3F61AB77F7D001BCDAA /* XMLWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 44BCC3F41AB77F7D001BCDAA /* XMLWriter.h */; }; 44BCC3F71AB77F7D001BCDAA /* XMLWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 44BCC3F51AB77F7D001BCDAA /* XMLWriter.m */; }; 44C2CC941AB7948300B20E46 /* XMLWriter+ConvenienceMethods.h in Headers */ = {isa = PBXBuildFile; fileRef = 44C2CC921AB7948300B20E46 /* XMLWriter+ConvenienceMethods.h */; }; @@ -326,6 +327,8 @@ 4498D9A41A66148F008C0B72 /* upnperror_response_xbox.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = upnperror_response_xbox.xml; sourceTree = ""; }; 4498D9A61A661500008C0B72 /* upnperror_response_sonos.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = upnperror_response_sonos.xml; sourceTree = ""; }; 4498D9A81A66F027008C0B72 /* DLNAHTTPServerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DLNAHTTPServerTests.m; sourceTree = ""; }; + 44A5518B1AC1D924001AF783 /* NetcastTVService_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NetcastTVService_Private.h; sourceTree = ""; }; + 44A5518E1AC1DF4C001AF783 /* NetcastTVServiceTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NetcastTVServiceTests.m; sourceTree = ""; }; 44BCC3F41AB77F7D001BCDAA /* XMLWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLWriter.h; sourceTree = ""; }; 44BCC3F51AB77F7D001BCDAA /* XMLWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XMLWriter.m; sourceTree = ""; }; 44C2CC921AB7948300B20E46 /* XMLWriter+ConvenienceMethods.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "XMLWriter+ConvenienceMethods.h"; sourceTree = ""; }; @@ -592,6 +595,7 @@ children = ( 4433F3DD1A421733008D9A04 /* Helpers */, 4498D9911A65B69F008C0B72 /* DLNAServiceTests.m */, + 44A5518E1AC1DF4C001AF783 /* NetcastTVServiceTests.m */, 4498D9A61A661500008C0B72 /* upnperror_response_sonos.xml */, 4498D9A41A66148F008C0B72 /* upnperror_response_xbox.xml */, 4498D9A21A660EAE008C0B72 /* getmute_response_xbox.xml */, @@ -1001,6 +1005,7 @@ EA5FB83F199AEC550057B4B4 /* DLNAService.m */, EA5FB840199AEC550057B4B4 /* Helpers */, EA5FB849199AEC550057B4B4 /* NetcastTVService.h */, + 44A5518B1AC1D924001AF783 /* NetcastTVService_Private.h */, EA5FB84A199AEC550057B4B4 /* NetcastTVService.m */, EA5FB84B199AEC550057B4B4 /* RokuService.h */, EA5FB84C199AEC550057B4B4 /* RokuService.m */, @@ -1431,6 +1436,7 @@ 448F36C51A1BD64200536649 /* ZeroConfDiscoveryProviderTests.m in Sources */, 4498D9921A65B69F008C0B72 /* DLNAServiceTests.m in Sources */, 440A031D1A854EDE0007E3D3 /* WebOSTVServiceSocketClientTests.m in Sources */, + 44A5518F1AC1DF4C001AF783 /* NetcastTVServiceTests.m in Sources */, 4498D9901A65A1D7008C0B72 /* NSDictionary+KeyPredicateSearchTests.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/core b/core index 2255a1b8..9eaea2f9 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 2255a1b8f649d14923a3986ab983faa1b1f8982d +Subproject commit 9eaea2f9fc67db62315c00274d8f08681132a26b From dc1f6ecebc75c4e9faed3fa5d752a4beb22769bc Mon Sep 17 00:00:00 2001 From: Eugene Nikolskyi Date: Tue, 24 Mar 2015 12:27:08 -0700 Subject: [PATCH 03/27] XMLWriter: fix a warning about missing newline at EOF --- README.md | 2 ++ core | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fb11d83c..33b61b46 100644 --- a/README.md +++ b/README.md @@ -82,6 +82,8 @@ Connect SDK for iOS makes use of the following projects, some of which are open- - properly return an error if XML parsing has failed * [ASIHTTPRequest](https://github.com/pokeb/asi-http-request) (MIT) * [xswi](https://github.com/skjolber/xswi) (MIT) + - modifications: + - compiler warning fix ##License Copyright (c) 2013-2014 LG Electronics. diff --git a/core b/core index 9eaea2f9..74f7c1e9 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 9eaea2f9fc67db62315c00274d8f08681132a26b +Subproject commit 74f7c1e9ce45ea37d6fa3b1d1973d60d11a87f50 From d61eec5c8c43c57c8a79dd121fb33ab77de38773 Mon Sep 17 00:00:00 2001 From: Eugene Nikolskyi Date: Tue, 24 Mar 2015 16:02:56 -0700 Subject: [PATCH 04/27] DLNAServiceTests: silence a false positive `self` capture warning --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 74f7c1e9..86deb611 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 74f7c1e9ce45ea37d6fa3b1d1973d60d11a87f50 +Subproject commit 86deb6114ba9a0d5674f8861a03706fd16402d1e From 993783d0cb14ff09c510a5f049084a8c7555058e Mon Sep 17 00:00:00 2001 From: Eugene Nikolskyi Date: Tue, 24 Mar 2015 17:02:43 -0700 Subject: [PATCH 05/27] LGSRWebSocket: fix a deprecation warning regarding `base64Encoding` --- README.md | 1 + core | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 33b61b46..be40332a 100644 --- a/README.md +++ b/README.md @@ -75,6 +75,7 @@ Connect SDK for iOS makes use of the following projects, some of which are open- - stability - self-signed certificate support - avoid potential namespace collisions + - compiler warning fix * [objc-guid](https://code.google.com/p/objc-guid/) (BSD 3-Clause revised) * [GCDWebServer](https://github.com/swisspol/GCDWebServer) (MIT) * [XMLReader](https://github.com/amarcadet/XMLReader) (MIT) diff --git a/core b/core index 86deb611..cb36a35b 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 86deb6114ba9a0d5674f8861a03706fd16402d1e +Subproject commit cb36a35badbdb8fe97b4fdc0d7b66772b992cb9d From ab4e411d792b0346023e016b6e7165aad6f1c0a8 Mon Sep 17 00:00:00 2001 From: Eugene Nikolskyi Date: Wed, 25 Mar 2015 13:07:46 -0700 Subject: [PATCH 06/27] WebOSTVService: fix a warning about overridden `serviceConfig` property This patch removes the property redefinition (specialization) and adds a new readonly property for the specific `WebOSTVServiceConfig` config if available. --- ConnectSDK.xcodeproj/project.pbxproj | 4 ++++ core | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ConnectSDK.xcodeproj/project.pbxproj b/ConnectSDK.xcodeproj/project.pbxproj index 6d0c4daf..48dd838f 100644 --- a/ConnectSDK.xcodeproj/project.pbxproj +++ b/ConnectSDK.xcodeproj/project.pbxproj @@ -51,6 +51,7 @@ 4498D9A71A661500008C0B72 /* upnperror_response_sonos.xml in Resources */ = {isa = PBXBuildFile; fileRef = 4498D9A61A661500008C0B72 /* upnperror_response_sonos.xml */; }; 4498D9A91A66F027008C0B72 /* DLNAHTTPServerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4498D9A81A66F027008C0B72 /* DLNAHTTPServerTests.m */; }; 44A5518F1AC1DF4C001AF783 /* NetcastTVServiceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 44A5518E1AC1DF4C001AF783 /* NetcastTVServiceTests.m */; }; + 44A551991AC338E0001AF783 /* WebOSTVServiceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 44A551981AC338E0001AF783 /* WebOSTVServiceTests.m */; }; 44BCC3F61AB77F7D001BCDAA /* XMLWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 44BCC3F41AB77F7D001BCDAA /* XMLWriter.h */; }; 44BCC3F71AB77F7D001BCDAA /* XMLWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 44BCC3F51AB77F7D001BCDAA /* XMLWriter.m */; }; 44C2CC941AB7948300B20E46 /* XMLWriter+ConvenienceMethods.h in Headers */ = {isa = PBXBuildFile; fileRef = 44C2CC921AB7948300B20E46 /* XMLWriter+ConvenienceMethods.h */; }; @@ -329,6 +330,7 @@ 4498D9A81A66F027008C0B72 /* DLNAHTTPServerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DLNAHTTPServerTests.m; sourceTree = ""; }; 44A5518B1AC1D924001AF783 /* NetcastTVService_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NetcastTVService_Private.h; sourceTree = ""; }; 44A5518E1AC1DF4C001AF783 /* NetcastTVServiceTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NetcastTVServiceTests.m; sourceTree = ""; }; + 44A551981AC338E0001AF783 /* WebOSTVServiceTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebOSTVServiceTests.m; sourceTree = ""; }; 44BCC3F41AB77F7D001BCDAA /* XMLWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLWriter.h; sourceTree = ""; }; 44BCC3F51AB77F7D001BCDAA /* XMLWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XMLWriter.m; sourceTree = ""; }; 44C2CC921AB7948300B20E46 /* XMLWriter+ConvenienceMethods.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "XMLWriter+ConvenienceMethods.h"; sourceTree = ""; }; @@ -596,6 +598,7 @@ 4433F3DD1A421733008D9A04 /* Helpers */, 4498D9911A65B69F008C0B72 /* DLNAServiceTests.m */, 44A5518E1AC1DF4C001AF783 /* NetcastTVServiceTests.m */, + 44A551981AC338E0001AF783 /* WebOSTVServiceTests.m */, 4498D9A61A661500008C0B72 /* upnperror_response_sonos.xml */, 4498D9A41A66148F008C0B72 /* upnperror_response_xbox.xml */, 4498D9A21A660EAE008C0B72 /* getmute_response_xbox.xml */, @@ -1429,6 +1432,7 @@ files = ( 44EF61A41A12FC8800CF344C /* SSDPDiscoveryProviderTests.m in Sources */, 4433F3DF1A421750008D9A04 /* AirPlayServiceHTTPKeepAliveTests.m in Sources */, + 44A551991AC338E0001AF783 /* WebOSTVServiceTests.m in Sources */, 44D8F7DA1AB27B4800559FE3 /* NSInvocation+ObjectGetter.m in Sources */, 44291C521A68B4C000280E5C /* SSDPDiscoveryProvider_FilteringTests.m in Sources */, 4480857F1A12A7BE00E13938 /* ConnectSDKDefaultPlatformsTests.m in Sources */, diff --git a/core b/core index cb36a35b..de7d39d0 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit cb36a35badbdb8fe97b4fdc0d7b66772b992cb9d +Subproject commit de7d39d00b285def5144f20b2469060e2d0940b9 From d5ee2eb27fb17f3d8e6cfcdd3a1e2e571f7397ed Mon Sep 17 00:00:00 2001 From: Eugene Nikolskyi Date: Wed, 25 Mar 2015 16:01:20 -0700 Subject: [PATCH 07/27] NetcastTVService: fix a warning about overridden `serviceConfig` property This patch removes the property redefinition (specialization) and adds a new readonly property for the specific `NetcastTVServiceConfig` config if available. --- ConnectSDK.xcodeproj/project.pbxproj | 4 ++++ core | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ConnectSDK.xcodeproj/project.pbxproj b/ConnectSDK.xcodeproj/project.pbxproj index 48dd838f..ca6d6f12 100644 --- a/ConnectSDK.xcodeproj/project.pbxproj +++ b/ConnectSDK.xcodeproj/project.pbxproj @@ -52,6 +52,7 @@ 4498D9A91A66F027008C0B72 /* DLNAHTTPServerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4498D9A81A66F027008C0B72 /* DLNAHTTPServerTests.m */; }; 44A5518F1AC1DF4C001AF783 /* NetcastTVServiceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 44A5518E1AC1DF4C001AF783 /* NetcastTVServiceTests.m */; }; 44A551991AC338E0001AF783 /* WebOSTVServiceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 44A551981AC338E0001AF783 /* WebOSTVServiceTests.m */; }; + 44A5519F1AC36672001AF783 /* CommonMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 44A5519D1AC36672001AF783 /* CommonMacros.h */; }; 44BCC3F61AB77F7D001BCDAA /* XMLWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 44BCC3F41AB77F7D001BCDAA /* XMLWriter.h */; }; 44BCC3F71AB77F7D001BCDAA /* XMLWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 44BCC3F51AB77F7D001BCDAA /* XMLWriter.m */; }; 44C2CC941AB7948300B20E46 /* XMLWriter+ConvenienceMethods.h in Headers */ = {isa = PBXBuildFile; fileRef = 44C2CC921AB7948300B20E46 /* XMLWriter+ConvenienceMethods.h */; }; @@ -331,6 +332,7 @@ 44A5518B1AC1D924001AF783 /* NetcastTVService_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NetcastTVService_Private.h; sourceTree = ""; }; 44A5518E1AC1DF4C001AF783 /* NetcastTVServiceTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NetcastTVServiceTests.m; sourceTree = ""; }; 44A551981AC338E0001AF783 /* WebOSTVServiceTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebOSTVServiceTests.m; sourceTree = ""; }; + 44A5519D1AC36672001AF783 /* CommonMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommonMacros.h; sourceTree = ""; }; 44BCC3F41AB77F7D001BCDAA /* XMLWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLWriter.h; sourceTree = ""; }; 44BCC3F51AB77F7D001BCDAA /* XMLWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XMLWriter.m; sourceTree = ""; }; 44C2CC921AB7948300B20E46 /* XMLWriter+ConvenienceMethods.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "XMLWriter+ConvenienceMethods.h"; sourceTree = ""; }; @@ -986,6 +988,7 @@ 4498D98B1A659F43008C0B72 /* NSDictionary+KeyPredicateSearch.m */, 44C2CC9F1AB7A33500B20E46 /* NSString+Common.h */, 44C2CCA01AB7A33500B20E46 /* NSString+Common.m */, + 44A5519D1AC36672001AF783 /* CommonMacros.h */, ); path = Helpers; sourceTree = ""; @@ -1224,6 +1227,7 @@ 44EF618B1A12DC7E00CF344C /* ConnectSDK-Prefix.pch in Headers */, EA5FB8F2199AEC570057B4B4 /* DLNAService.h in Headers */, EA5FB8D3199AEC560057B4B4 /* Launcher.h in Headers */, + 44A5519F1AC36672001AF783 /* CommonMacros.h in Headers */, EA5FB8FA199AEC570057B4B4 /* WebOSTVServiceSocketClient.h in Headers */, EA5FB890199AEC560057B4B4 /* CTASIHTTPRequestConfig.h in Headers */, EA5FB899199AEC560057B4B4 /* GCDWebServer.h in Headers */, diff --git a/core b/core index de7d39d0..cb733c08 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit de7d39d00b285def5144f20b2469060e2d0940b9 +Subproject commit cb733c089e2c2128a45a6bd76b0e4491617a4fe4 From 47a1b9c5af0ae915294d4613cc4300734de99bec Mon Sep 17 00:00:00 2001 From: Eugene Nikolskyi Date: Wed, 25 Mar 2015 16:22:21 -0700 Subject: [PATCH 08/27] Fix warnings in release configuration and with debug logs enabled --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index cb733c08..f9cc7aa5 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit cb733c089e2c2128a45a6bd76b0e4491617a4fe4 +Subproject commit f9cc7aa5157f458e306d145ad2f7c74d8fa4f297 From 3b213acf929d08ddfab0cdd93ed281c4dee9dd73 Mon Sep 17 00:00:00 2001 From: Eugene Nikolskyi Date: Thu, 26 Mar 2015 09:42:10 -0700 Subject: [PATCH 09/27] NetcastTVService: refactor parseCommandResponse:data: method to return error properly --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index f9cc7aa5..ed024a8f 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit f9cc7aa5157f458e306d145ad2f7c74d8fa4f297 +Subproject commit ed024a8f584dda8b8c1f98f681219d7429fff457 From 5d6ee77d7a91aa5dc744e6c7fd73948db55fffa2 Mon Sep 17 00:00:00 2001 From: Eugene Nikolskyi Date: Thu, 26 Mar 2015 10:35:59 -0700 Subject: [PATCH 10/27] Update GCDWebServer library to 3.2.2 that has fixed analyzer warnings --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index ed024a8f..d5c88a6d 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit ed024a8f584dda8b8c1f98f681219d7429fff457 +Subproject commit d5c88a6d65013f60d93a2e34a6129baf7a0c0b23 From d7e6c522f7c5a88403f43a48b2474698a2a37f00 Mon Sep 17 00:00:00 2001 From: Eugene Nikolskyi Date: Thu, 26 Mar 2015 10:41:57 -0700 Subject: [PATCH 11/27] Fix the directory name CGDWebServer => GCDWebServer --- ConnectSDK.xcodeproj/project.pbxproj | 6 +++--- core | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ConnectSDK.xcodeproj/project.pbxproj b/ConnectSDK.xcodeproj/project.pbxproj index ca6d6f12..3b17bd76 100644 --- a/ConnectSDK.xcodeproj/project.pbxproj +++ b/ConnectSDK.xcodeproj/project.pbxproj @@ -806,7 +806,7 @@ isa = PBXGroup; children = ( EA5FB7BA199AEC550057B4B4 /* asi-http-request */, - EA5FB7D5199AEC550057B4B4 /* CGDWebServer */, + EA5FB7D5199AEC550057B4B4 /* GCDWebServer */, EA5FB7F6199AEC550057B4B4 /* objc-guid */, 442B9A471A16F61E0053AE51 /* OCMock */, 442B9A491A16F61E0053AE51 /* OHHTTPStubs */, @@ -870,14 +870,14 @@ path = Reachability; sourceTree = ""; }; - EA5FB7D5199AEC550057B4B4 /* CGDWebServer */ = { + EA5FB7D5199AEC550057B4B4 /* GCDWebServer */ = { isa = PBXGroup; children = ( EA5FB7D6199AEC550057B4B4 /* Core */, EA5FB7E4199AEC550057B4B4 /* Requests */, EA5FB7ED199AEC550057B4B4 /* Responses */, ); - path = CGDWebServer; + path = GCDWebServer; sourceTree = ""; }; EA5FB7D6199AEC550057B4B4 /* Core */ = { diff --git a/core b/core index d5c88a6d..a1b97bdb 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit d5c88a6d65013f60d93a2e34a6129baf7a0c0b23 +Subproject commit a1b97bdb3e2fb874567c71084905dbfb93e19fab From 58e4243c65fbd53ec1f228f33a03b4539d066d4d Mon Sep 17 00:00:00 2001 From: Eugene Nikolskyi Date: Thu, 26 Mar 2015 10:49:17 -0700 Subject: [PATCH 12/27] Remove the unnecessary executable permission from source files --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index a1b97bdb..46a29084 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit a1b97bdb3e2fb874567c71084905dbfb93e19fab +Subproject commit 46a29084c57fca857692d72e03d367d96d4dbab0 From aae9f23a4cd688f04600aa32dd8f3abfaea39c29 Mon Sep 17 00:00:00 2001 From: Eugene Nikolskyi Date: Thu, 26 Mar 2015 11:26:54 -0700 Subject: [PATCH 13/27] CTASIAuthenticationDialog: fix a static analyzer warning --- README.md | 2 ++ core | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index be40332a..309871bf 100644 --- a/README.md +++ b/README.md @@ -82,6 +82,8 @@ Connect SDK for iOS makes use of the following projects, some of which are open- - modifications: - properly return an error if XML parsing has failed * [ASIHTTPRequest](https://github.com/pokeb/asi-http-request) (MIT) + - modifications: + - static analyzer warning fix * [xswi](https://github.com/skjolber/xswi) (MIT) - modifications: - compiler warning fix diff --git a/core b/core index 46a29084..ae0ea303 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 46a29084c57fca857692d72e03d367d96d4dbab0 +Subproject commit ae0ea3036cd21e7f8213e27bf83cf1099acae716 From 92670042e37cc05fd49b2733113ceb5f189f6a03 Mon Sep 17 00:00:00 2001 From: Eugene Nikolskyi Date: Thu, 26 Mar 2015 12:34:34 -0700 Subject: [PATCH 14/27] SSDPDiscoveryProvider: fix a potential memory leak --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index ae0ea303..f3622787 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit ae0ea3036cd21e7f8213e27bf83cf1099acae716 +Subproject commit f3622787f9e9704310c7c804e78f5873ad654df0 From 4894bc3c8b0217645f38e85f418492d1dd08af52 Mon Sep 17 00:00:00 2001 From: Ibrahim Adnan Date: Mon, 13 Apr 2015 16:04:26 -0700 Subject: [PATCH 15/27] Updated core module for webostv pairing type request changes --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 7bef03f1..ddb2a71a 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 7bef03f1e60f2f11d097776ae27a9dcdff7d433f +Subproject commit ddb2a71a39c3017d15929c479ae572cdd10aaac0 From bea9055c7d3293bcf5a401b9f7d5db5ab1a48797 Mon Sep 17 00:00:00 2001 From: Ibrahim Adnan Date: Thu, 16 Apr 2015 16:06:39 -0700 Subject: [PATCH 16/27] Fix for Media icon url broken after upgrading Google cast v2.6 --- modules/google-cast | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/google-cast b/modules/google-cast index 89be4cb7..8cd99cde 160000 --- a/modules/google-cast +++ b/modules/google-cast @@ -1 +1 @@ -Subproject commit 89be4cb795d1173a39c265d7af03ed52279268ce +Subproject commit 8cd99cdeddc0972e79f834d0e5a3cdf401a98107 From 016cb5ef701062eb262c50115601e69bbfa78f0c Mon Sep 17 00:00:00 2001 From: Eugene Nikolskyi Date: Tue, 21 Apr 2015 16:48:45 -0700 Subject: [PATCH 17/27] WebOSTVService: Resubscribe subscriptions after foregrounding Save current subscriptions when the app is entering background, and automagically resubscribe to them when entering foreground. It is important that the `ServiceSubscription` objects are the same, because the app is likely to retain them to be able to unsubscribe. Unfortunately, functional tests for this change are missing, because they would be pretty long and incomprehensible (the architecture is not modularized enough). --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index ddb2a71a..280420f3 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit ddb2a71a39c3017d15929c479ae572cdd10aaac0 +Subproject commit 280420f396af0f3488db83db4b19d56c280cd296 From 1219d34146f07eb2f7b10ae1bc0feb76962fdc86 Mon Sep 17 00:00:00 2001 From: Eugene Nikolskyi Date: Tue, 21 Apr 2015 14:50:25 -0700 Subject: [PATCH 18/27] AirPlayServiceHTTP: more correct parsing implementation for `playState` The `playState` value is inferred primarily from the `rate` property using this specification: * finished iff `rate` property is missing and `readyToPlay == 0`; * paused iff `rate == 0`; * playing iff `rate != 0`; * unknown otherwise. Fixes https://github.com/ConnectSDK/Connect-SDK-iOS/issues/146 --- ConnectSDK.xcodeproj/project.pbxproj | 34 ++++++++++++++++++++++++++++ core | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/ConnectSDK.xcodeproj/project.pbxproj b/ConnectSDK.xcodeproj/project.pbxproj index 3b17bd76..08c8844e 100644 --- a/ConnectSDK.xcodeproj/project.pbxproj +++ b/ConnectSDK.xcodeproj/project.pbxproj @@ -32,6 +32,12 @@ 443063C11A4210F0007779DA /* AirPlayServiceHTTPKeepAlive.h in Headers */ = {isa = PBXBuildFile; fileRef = 443063BF1A4210F0007779DA /* AirPlayServiceHTTPKeepAlive.h */; }; 443063C21A4210F0007779DA /* AirPlayServiceHTTPKeepAlive.m in Sources */ = {isa = PBXBuildFile; fileRef = 443063C01A4210F0007779DA /* AirPlayServiceHTTPKeepAlive.m */; }; 4433F3DF1A421750008D9A04 /* AirPlayServiceHTTPKeepAliveTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4433F3DE1A421750008D9A04 /* AirPlayServiceHTTPKeepAliveTests.m */; }; + 44758BBB1AE6C06200EC43A6 /* AirPlayServiceHTTPTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 44758BBA1AE6C06200EC43A6 /* AirPlayServiceHTTPTests.m */; }; + 44758BCE1AE7070600EC43A6 /* airplay_playbackinfo_ff.json in Resources */ = {isa = PBXBuildFile; fileRef = 44758BC91AE7070500EC43A6 /* airplay_playbackinfo_ff.json */; }; + 44758BCF1AE7070600EC43A6 /* airplay_playbackinfo_finished.json in Resources */ = {isa = PBXBuildFile; fileRef = 44758BCA1AE7070500EC43A6 /* airplay_playbackinfo_finished.json */; }; + 44758BD01AE7070600EC43A6 /* airplay_playbackinfo_paused.json in Resources */ = {isa = PBXBuildFile; fileRef = 44758BCB1AE7070500EC43A6 /* airplay_playbackinfo_paused.json */; }; + 44758BD11AE7070600EC43A6 /* airplay_playbackinfo_playing.json in Resources */ = {isa = PBXBuildFile; fileRef = 44758BCC1AE7070500EC43A6 /* airplay_playbackinfo_playing.json */; }; + 44758BD21AE7070600EC43A6 /* airplay_playbackinfo_rewind.json in Resources */ = {isa = PBXBuildFile; fileRef = 44758BCD1AE7070600EC43A6 /* airplay_playbackinfo_rewind.json */; }; 4480857F1A12A7BE00E13938 /* ConnectSDKDefaultPlatformsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4480857E1A12A7BE00E13938 /* ConnectSDKDefaultPlatformsTests.m */; }; 448085801A12A7BE00E13938 /* libConnectSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA61EB1018FE485B00D75696 /* libConnectSDK.a */; }; 448F36C51A1BD64200536649 /* ZeroConfDiscoveryProviderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 448F36C41A1BD64200536649 /* ZeroConfDiscoveryProviderTests.m */; }; @@ -307,6 +313,13 @@ 443063BF1A4210F0007779DA /* AirPlayServiceHTTPKeepAlive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AirPlayServiceHTTPKeepAlive.h; sourceTree = ""; }; 443063C01A4210F0007779DA /* AirPlayServiceHTTPKeepAlive.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AirPlayServiceHTTPKeepAlive.m; sourceTree = ""; }; 4433F3DE1A421750008D9A04 /* AirPlayServiceHTTPKeepAliveTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AirPlayServiceHTTPKeepAliveTests.m; sourceTree = ""; }; + 44758BBA1AE6C06200EC43A6 /* AirPlayServiceHTTPTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AirPlayServiceHTTPTests.m; sourceTree = ""; }; + 44758BBC1AE6C6E300EC43A6 /* AirPlayServiceHTTP_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AirPlayServiceHTTP_Private.h; sourceTree = ""; }; + 44758BC91AE7070500EC43A6 /* airplay_playbackinfo_ff.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = airplay_playbackinfo_ff.json; sourceTree = ""; }; + 44758BCA1AE7070500EC43A6 /* airplay_playbackinfo_finished.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = airplay_playbackinfo_finished.json; sourceTree = ""; }; + 44758BCB1AE7070500EC43A6 /* airplay_playbackinfo_paused.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = airplay_playbackinfo_paused.json; sourceTree = ""; }; + 44758BCC1AE7070500EC43A6 /* airplay_playbackinfo_playing.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = airplay_playbackinfo_playing.json; sourceTree = ""; }; + 44758BCD1AE7070600EC43A6 /* airplay_playbackinfo_rewind.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = airplay_playbackinfo_rewind.json; sourceTree = ""; }; 4480857A1A12A7BE00E13938 /* ConnectSDKTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ConnectSDKTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 4480857D1A12A7BE00E13938 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 4480857E1A12A7BE00E13938 /* ConnectSDKDefaultPlatformsTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ConnectSDKDefaultPlatformsTests.m; sourceTree = ""; }; @@ -618,13 +631,27 @@ 4433F3DD1A421733008D9A04 /* Helpers */ = { isa = PBXGroup; children = ( + 44758BC01AE6DB7400EC43A6 /* sample_data */, 4433F3DE1A421750008D9A04 /* AirPlayServiceHTTPKeepAliveTests.m */, + 44758BBA1AE6C06200EC43A6 /* AirPlayServiceHTTPTests.m */, 4498D9A81A66F027008C0B72 /* DLNAHTTPServerTests.m */, 440A031C1A854EDE0007E3D3 /* WebOSTVServiceSocketClientTests.m */, ); path = Helpers; sourceTree = ""; }; + 44758BC01AE6DB7400EC43A6 /* sample_data */ = { + isa = PBXGroup; + children = ( + 44758BC91AE7070500EC43A6 /* airplay_playbackinfo_ff.json */, + 44758BCA1AE7070500EC43A6 /* airplay_playbackinfo_finished.json */, + 44758BCB1AE7070500EC43A6 /* airplay_playbackinfo_paused.json */, + 44758BCC1AE7070500EC43A6 /* airplay_playbackinfo_playing.json */, + 44758BCD1AE7070600EC43A6 /* airplay_playbackinfo_rewind.json */, + ); + path = sample_data; + sourceTree = ""; + }; 4480857B1A12A7BE00E13938 /* ConnectSDKTests */ = { isa = PBXGroup; children = ( @@ -1077,6 +1104,7 @@ isa = PBXGroup; children = ( EA5FB841199AEC550057B4B4 /* AirPlayServiceHTTP.h */, + 44758BBC1AE6C6E300EC43A6 /* AirPlayServiceHTTP_Private.h */, EA5FB842199AEC550057B4B4 /* AirPlayServiceHTTP.m */, 443063BF1A4210F0007779DA /* AirPlayServiceHTTPKeepAlive.h */, 443063C01A4210F0007779DA /* AirPlayServiceHTTPKeepAlive.m */, @@ -1375,8 +1403,11 @@ 4498D9991A660147008C0B72 /* gettransportinfo_response_xbox.xml in Resources */, 44D88F901A71C4A8009D9608 /* ssdp_device_description_sonos.xml in Resources */, 44D88F971A71D6AF009D9608 /* ssdp_device_description_dlna_no_required_services.xml in Resources */, + 44758BD01AE7070600EC43A6 /* airplay_playbackinfo_paused.json in Resources */, + 44758BD21AE7070600EC43A6 /* airplay_playbackinfo_rewind.json in Resources */, 44D88F8F1A71C4A8009D9608 /* ssdp_device_description_samsung_tv_dlna.xml in Resources */, 44D88F911A71C4A8009D9608 /* ssdp_device_description_sonos_no_root_services.xml in Resources */, + 44758BCE1AE7070600EC43A6 /* airplay_playbackinfo_ff.json in Resources */, 4498D9941A65CC12008C0B72 /* getpositioninfo_response_xbox.xml in Resources */, 4498D9A11A660E82008C0B72 /* getmute_response_sonos.xml in Resources */, 44D88F891A71C4A8009D9608 /* ssdp_device_description_chromecast.xml in Resources */, @@ -1393,8 +1424,10 @@ 44D88F8B1A71C4A8009D9608 /* ssdp_device_description_roku2.xml in Resources */, 4498D9A71A661500008C0B72 /* upnperror_response_sonos.xml in Resources */, 44D88F951A71C4A8009D9608 /* ssdp_device_description_webos_minor_webos.xml in Resources */, + 44758BD11AE7070600EC43A6 /* airplay_playbackinfo_playing.json in Resources */, 4498D9A51A66148F008C0B72 /* upnperror_response_xbox.xml in Resources */, 44D88F991A71DB15009D9608 /* ssdp_device_description_dlna_root_no_required_services.xml in Resources */, + 44758BCF1AE7070600EC43A6 /* airplay_playbackinfo_finished.json in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1443,6 +1476,7 @@ 4498D9A91A66F027008C0B72 /* DLNAHTTPServerTests.m in Sources */, 448F36C51A1BD64200536649 /* ZeroConfDiscoveryProviderTests.m in Sources */, 4498D9921A65B69F008C0B72 /* DLNAServiceTests.m in Sources */, + 44758BBB1AE6C06200EC43A6 /* AirPlayServiceHTTPTests.m in Sources */, 440A031D1A854EDE0007E3D3 /* WebOSTVServiceSocketClientTests.m in Sources */, 44A5518F1AC1DF4C001AF783 /* NetcastTVServiceTests.m in Sources */, 4498D9901A65A1D7008C0B72 /* NSDictionary+KeyPredicateSearchTests.m in Sources */, diff --git a/core b/core index 280420f3..0da0bb18 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 280420f396af0f3488db83db4b19d56c280cd296 +Subproject commit 0da0bb18f88be6fb26e4840aabbdfe719af40274 From 7e61b727f32e94c563ae83256e4438b59bed437a Mon Sep 17 00:00:00 2001 From: Ibrahim Adnan Date: Wed, 22 Apr 2015 16:40:35 -0700 Subject: [PATCH 19/27] Fixed DLNA service issue for LG Music flow speaker --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 0da0bb18..23b68bc9 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 0da0bb18f88be6fb26e4840aabbdfe719af40274 +Subproject commit 23b68bc9eb55171dd8d2780475e4d5e8772fbad5 From 3960f10717948853a507ea8103d3b5ba42aac392 Mon Sep 17 00:00:00 2001 From: Ibrahim Adnan Date: Wed, 22 Apr 2015 17:18:16 -0700 Subject: [PATCH 20/27] Updated google cast sdk to 2.6.0 --- ConnectSDK.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ConnectSDK.podspec b/ConnectSDK.podspec index bb744673..0a39179c 100644 --- a/ConnectSDK.podspec +++ b/ConnectSDK.podspec @@ -81,7 +81,7 @@ Pod::Spec.new do |s| sp.source_files = "modules/**/*.{h,m}" sp.private_header_files = "modules/**/*_Private.h" - cast_version = "2.5.1" + cast_version = "2.6.0" sp.dependency "google-cast-sdk", cast_version sp.framework = "GoogleCast" sp.xcconfig = { From 27c30d2fd7efe369a87b85c615d59d2e4def5830 Mon Sep 17 00:00:00 2001 From: Eugene Nikolskyi Date: Thu, 23 Apr 2015 10:56:19 -0700 Subject: [PATCH 21/27] ZeroConfDiscoveryProvider: support IPv4 addresses only Fixes https://github.com/ConnectSDK/Connect-SDK-iOS/issues/145 --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 23b68bc9..5f80cf18 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 23b68bc9eb55171dd8d2780475e4d5e8772fbad5 +Subproject commit 5f80cf184323dce881f8ac1fdd1e8c4d991beafb From c3405656d8fde6578a5baef7806ba228364a4d24 Mon Sep 17 00:00:00 2001 From: Ibrahim Adnan Date: Thu, 23 Apr 2015 16:17:24 -0700 Subject: [PATCH 22/27] Fix for removing warning: Auto property synthesize will not synthesize property warning --- core | 2 +- modules/google-cast | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core b/core index 5f80cf18..7066e01c 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 5f80cf184323dce881f8ac1fdd1e8c4d991beafb +Subproject commit 7066e01c48f7c0bc1424f19ff4951c6373f8fd33 diff --git a/modules/google-cast b/modules/google-cast index 8cd99cde..0786d8b2 160000 --- a/modules/google-cast +++ b/modules/google-cast @@ -1 +1 @@ -Subproject commit 8cd99cdeddc0972e79f834d0e5a3cdf401a98107 +Subproject commit 0786d8b24950bfcd01d007ffce39e54e852ad9ac From a5dbe2b0d885fdbafbd8376c0c24130da006e41d Mon Sep 17 00:00:00 2001 From: Eugene Nikolskyi Date: Mon, 27 Apr 2015 14:58:06 -0700 Subject: [PATCH 23/27] DLNA: Fix subscriptions issue for LG Music Flow speaker Fixes https://github.com/ConnectSDK/Connect-SDK-iOS/issues/147 --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 7066e01c..4d2113a5 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 7066e01c48f7c0bc1424f19ff4951c6373f8fd33 +Subproject commit 4d2113a5c92c207e5b33de5ed3d7dcdcf8fc7f33 From 7b814c3f0ccd5cfe5bd7a2d41f1f55c235b90bbc Mon Sep 17 00:00:00 2001 From: Eugene Nikolskyi Date: Fri, 24 Apr 2015 19:12:50 -0700 Subject: [PATCH 24/27] DLNAService: stop the HTTP server on disconnect And unsubscribe from all the subscribed services, because the server is shut down. Fixes https://github.com/ConnectSDK/Connect-SDK-iOS/issues/118 --- ConnectSDK.xcodeproj/project.pbxproj | 6 ++++++ core | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ConnectSDK.xcodeproj/project.pbxproj b/ConnectSDK.xcodeproj/project.pbxproj index 08c8844e..24600898 100644 --- a/ConnectSDK.xcodeproj/project.pbxproj +++ b/ConnectSDK.xcodeproj/project.pbxproj @@ -40,6 +40,7 @@ 44758BD21AE7070600EC43A6 /* airplay_playbackinfo_rewind.json in Resources */ = {isa = PBXBuildFile; fileRef = 44758BCD1AE7070600EC43A6 /* airplay_playbackinfo_rewind.json */; }; 4480857F1A12A7BE00E13938 /* ConnectSDKDefaultPlatformsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4480857E1A12A7BE00E13938 /* ConnectSDKDefaultPlatformsTests.m */; }; 448085801A12A7BE00E13938 /* libConnectSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA61EB1018FE485B00D75696 /* libConnectSDK.a */; }; + 448414F91AEB27F400124EE9 /* OCMStubRecorder+XCTestExpectation.m in Sources */ = {isa = PBXBuildFile; fileRef = 448414F81AEB27F400124EE9 /* OCMStubRecorder+XCTestExpectation.m */; }; 448F36C51A1BD64200536649 /* ZeroConfDiscoveryProviderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 448F36C41A1BD64200536649 /* ZeroConfDiscoveryProviderTests.m */; }; 4498D98C1A659F43008C0B72 /* NSDictionary+KeyPredicateSearch.h in Headers */ = {isa = PBXBuildFile; fileRef = 4498D98A1A659F43008C0B72 /* NSDictionary+KeyPredicateSearch.h */; }; 4498D98D1A659F43008C0B72 /* NSDictionary+KeyPredicateSearch.m in Sources */ = {isa = PBXBuildFile; fileRef = 4498D98B1A659F43008C0B72 /* NSDictionary+KeyPredicateSearch.m */; }; @@ -323,6 +324,8 @@ 4480857A1A12A7BE00E13938 /* ConnectSDKTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ConnectSDKTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 4480857D1A12A7BE00E13938 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 4480857E1A12A7BE00E13938 /* ConnectSDKDefaultPlatformsTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ConnectSDKDefaultPlatformsTests.m; sourceTree = ""; }; + 448414F71AEB27F400124EE9 /* OCMStubRecorder+XCTestExpectation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OCMStubRecorder+XCTestExpectation.h"; sourceTree = ""; }; + 448414F81AEB27F400124EE9 /* OCMStubRecorder+XCTestExpectation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "OCMStubRecorder+XCTestExpectation.m"; sourceTree = ""; }; 4485140C1A02FC3200D66710 /* GoogleCast.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = GoogleCast.framework; sourceTree = ""; }; 448F36C41A1BD64200536649 /* ZeroConfDiscoveryProviderTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZeroConfDiscoveryProviderTests.m; sourceTree = ""; }; 448F36C61A1C16FE00536649 /* ZeroConfDiscoveryProvider_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZeroConfDiscoveryProvider_Private.h; sourceTree = ""; }; @@ -655,6 +658,8 @@ 4480857B1A12A7BE00E13938 /* ConnectSDKTests */ = { isa = PBXGroup; children = ( + 448414F71AEB27F400124EE9 /* OCMStubRecorder+XCTestExpectation.h */, + 448414F81AEB27F400124EE9 /* OCMStubRecorder+XCTestExpectation.m */, 44D8F7D81AB27B4800559FE3 /* NSInvocation+ObjectGetter.h */, 44D8F7D91AB27B4800559FE3 /* NSInvocation+ObjectGetter.m */, 4480857E1A12A7BE00E13938 /* ConnectSDKDefaultPlatformsTests.m */, @@ -1478,6 +1483,7 @@ 4498D9921A65B69F008C0B72 /* DLNAServiceTests.m in Sources */, 44758BBB1AE6C06200EC43A6 /* AirPlayServiceHTTPTests.m in Sources */, 440A031D1A854EDE0007E3D3 /* WebOSTVServiceSocketClientTests.m in Sources */, + 448414F91AEB27F400124EE9 /* OCMStubRecorder+XCTestExpectation.m in Sources */, 44A5518F1AC1DF4C001AF783 /* NetcastTVServiceTests.m in Sources */, 4498D9901A65A1D7008C0B72 /* NSDictionary+KeyPredicateSearchTests.m in Sources */, ); diff --git a/core b/core index 4d2113a5..0ed63d7a 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 4d2113a5c92c207e5b33de5ed3d7dcdcf8fc7f33 +Subproject commit 0ed63d7a1ecc604a8d400982c5c130a094ce7535 From 34e232922b6969f47a441af9f794d897f348e859 Mon Sep 17 00:00:00 2001 From: Eugene Nikolskyi Date: Tue, 28 Apr 2015 10:54:34 -0700 Subject: [PATCH 25/27] DLNAServiceTests: increase SUBSCRIBE response timeout to avoid test failures --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 0ed63d7a..457956bb 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 0ed63d7a1ecc604a8d400982c5c130a094ce7535 +Subproject commit 457956bbcb6558291a5c957c12144049eb07d900 From 4090074c964c749de8cae7d9e5aafbe877f33474 Mon Sep 17 00:00:00 2001 From: Eugene Nikolskyi Date: Tue, 28 Apr 2015 18:12:27 -0700 Subject: [PATCH 26/27] CHANGELOG and podspec: update for version 1.4.4 --- CHANGELOG.md | 13 +++++++++++++ ConnectSDK.podspec | 2 +- core | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94974705..4cf07ad0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Connect SDK iOS Changelog +## 1.4.4 -- 29 Apr 2015 + +- Allow to set pairing type for WebOS TVs +- Added LG Music Flow speaker support (Google Cast for Audio and DLNA) +- Support for Google Cast SDK 2.6.0 +- Fixed a few DLNA issues +- Fixed compiler and static analyzer warnings +- Fixed immediate disconnect if Apple TV has an IPv6 address only +- Miscellaneous bug fixes +- [See commits between 1.4.3 and 1.4.4](https://github.com/ConnectSDK/Connect-SDK-iOS/compare/1.4.3...1.4.4) + +[View files at version 1.4.4](https://github.com/ConnectSDK/Connect-SDK-iOS/tree/1.4.4) + ## 1.4.3 -- 23 Mar 2015 - Reverted Roku 6.1 fix for playing video as Roku has fixed its media player diff --git a/ConnectSDK.podspec b/ConnectSDK.podspec index 0a39179c..400388a1 100644 --- a/ConnectSDK.podspec +++ b/ConnectSDK.podspec @@ -5,7 +5,7 @@ Pod::Spec.new do |s| s.name = "ConnectSDK" - s.version = "1.4.3" + s.version = "1.4.4" s.summary = "Connect SDK is an open source framework that connects your mobile apps with multiple TV platforms." s.description = <<-DESC diff --git a/core b/core index 457956bb..fb9d8408 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 457956bbcb6558291a5c957c12144049eb07d900 +Subproject commit fb9d84082cb34cac18d4cb53ac20eda1a52e30dc From 35caa555b678db942a289d9108b4eb5581a0e16b Mon Sep 17 00:00:00 2001 From: Eugene Nikolskyi Date: Tue, 28 Apr 2015 18:22:08 -0700 Subject: [PATCH 27/27] Get rid of podspec lint warnings in external frameworks --- ConnectSDK.podspec | 2 ++ core | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ConnectSDK.podspec b/ConnectSDK.podspec index 400388a1..a23b2b0a 100644 --- a/ConnectSDK.podspec +++ b/ConnectSDK.podspec @@ -74,6 +74,8 @@ Pod::Spec.new do |s| s.subspec 'no-arc' do |sp| sp.source_files = non_arc_files sp.requires_arc = false + # disable all warnings from asi-http-request + sp.compiler_flags = '-w' end s.subspec 'GoogleCast' do |sp| diff --git a/core b/core index fb9d8408..f9331c27 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit fb9d84082cb34cac18d4cb53ac20eda1a52e30dc +Subproject commit f9331c27f341b1f7d48e8257bccd2e6eb9769185