Skip to content

Commit 23f0ef5

Browse files
jonghen.hanjonghen.han
authored andcommitted
Update the submodule "core"
1 parent 7f3688c commit 23f0ef5

File tree

12 files changed

+158
-5
lines changed

12 files changed

+158
-5
lines changed

.travis.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
language: objective-c
2+
osx_image: xcode6.4
3+
4+
install:
5+
- brew install gcovr
6+
7+
before_script:
8+
- curl -L -ocast.zip https://redirector.gvt1.com/edgedl/chromecast/sdk/ios/GoogleCastSDK-2.7.1-Release-ios-default.zip
9+
- unzip cast.zip 'GoogleCastSDK-2.7.1-Release/GoogleCast.framework/*'
10+
- mv -v GoogleCastSDK-2.7.1-Release/GoogleCast.framework modules/google-cast/
11+
- curl -L -ofling.zip https://s3-us-west-1.amazonaws.com/amazon-fling/AmazonFling-SDK.zip
12+
- unzip fling.zip 'ios-sdk/frameworks/*'
13+
- mv -v ios-sdk/frameworks/{AmazonFling,third_party_framework/Bolts}.framework modules/firetv/Frameworks/
14+
15+
script:
16+
- xctool -scheme ConnectSDK -configuration Debug -sdk iphonesimulator -IDECustomDerivedDataLocation="out/tests_build" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES test
17+
- xctool -scheme ConnectSDKIntegrationTests -configuration Debug -sdk iphonesimulator -IDECustomDerivedDataLocation="out/integration_tests_build" test
18+
19+
after_success:
20+
- gcovr --object-directory="out/tests_build/ConnectSDK/Build/Intermediates/ConnectSDK.build/Debug-iphonesimulator/ConnectSDK.build/Objects-normal/i386/" --root=. --xml-pretty --gcov-exclude='.*#(?:\w*Tests|Frameworks)#.*' --print-summary --output="cobertura.xml"
21+
- bash <(curl -s https://codecov.io/bash) -f "cobertura.xml"
22+
23+
# vim: set sw=2 ts=2 sts=2

ConnectSDK-Lite.podspec

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
# There are two usage options of this podspec:
2+
# * pod "ConnectSDK" will install the full ConnectSDK version (without Amazon
3+
# Fling SDK support; if you need it, please use the source ConnectSDK project
4+
# directly);
5+
# * pod "ConnectSDK/Core" will install the core only (Lite version) without
6+
# external dependencies.
7+
#
8+
# Unfortunately, Amazon Fling SDK is not distributed via CocoaPods, so we
9+
# cannot include its support in a subspec in an automated way.
10+
11+
Pod::Spec.new do |s|
12+
s.name = "ConnectSDK-Lite"
13+
s.version = "1.6.2"
14+
s.summary = "Connect SDK is an open source framework that connects your mobile apps with multiple TV platforms."
15+
16+
s.description = <<-DESC
17+
Connect SDK is an open source framework that connects your mobile apps with multiple TV platforms. Because most TV platforms support a variety of protocols, Connect SDK integrates and abstracts the discovery and connectivity between all supported protocols.
18+
19+
To discover supported platforms and protocols, Connect SDK uses SSDP to discover services such as DIAL, DLNA, UDAP, and Roku's External Control Guide (ECG). Connect SDK also supports ZeroConf to discover devices such as Chromecast and Apple TV. Even while supporting multiple discovery protocols, Connect SDK is able to generate one unified list of discovered devices from the same network.
20+
21+
To communicate with discovered devices, Connect SDK integrates support for protocols such as DLNA, DIAL, SSAP, ECG, AirPlay, Chromecast, UDAP, and webOS second screen protocol. Connect SDK intelligently picks which protocol to use depending on the feature being used.
22+
23+
For example, when connecting to a 2013 LG Smart TV, Connect SDK uses DLNA for media playback, DIAL for YouTube launching, and UDAP for system controls. On Roku, media playback and system controls are made available through ECG, and YouTube launching through DIAL. On Chromecast, media playback occurs through the Cast protocol and YouTube is launched via DIAL.
24+
25+
To support the aforementioned use case without Connect SDK, a developer would need to implement DIAL, ECG, Chromecast, and DLNA in their app. With Connect SDK, discovering the three devices is handled for you. Furthermore, the method calls between each protocol is abstracted. That means you can use one method call to beam a video to Roku, 3 generations of LG Smart TVs, Apple TV, and Chromecast.
26+
DESC
27+
28+
s.homepage = "http://www.connectsdk.com/"
29+
s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" }
30+
s.author = { "Connect SDK" => "[email protected]" }
31+
s.social_media_url = "http://twitter.com/ConnectSDK"
32+
s.platform = :ios, "7.1"
33+
s.ios.deployment_target = "7.1"
34+
s.source = { :git => "https://github.com/ConnectSDK/Connect-SDK-iOS-Lite.git",
35+
:tag => s.version,
36+
:submodules => true }
37+
38+
s.xcconfig = {
39+
"OTHER_LDFLAGS" => "$(inherited) -ObjC"
40+
}
41+
42+
s.requires_arc = true
43+
s.libraries = "z", "icucore"
44+
s.prefix_header_contents = <<-PREFIX
45+
//
46+
// Prefix header
47+
//
48+
// The contents of this file are implicitly included at the beginning of every source file.
49+
//
50+
// Copyright (c) 2015 LG Electronics.
51+
//
52+
// Licensed under the Apache License, Version 2.0 (the "License");
53+
// you may not use this file except in compliance with the License.
54+
// You may obtain a copy of the License at
55+
//
56+
// http://www.apache.org/licenses/LICENSE-2.0
57+
//
58+
// Unless required by applicable law or agreed to in writing, software
59+
// distributed under the License is distributed on an "AS IS" BASIS,
60+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
61+
// See the License for the specific language governing permissions and
62+
// limitations under the License.
63+
//
64+
65+
#define CONNECT_SDK_VERSION @"#{s.version}"
66+
67+
// Uncomment this line to enable SDK logging
68+
//#define CONNECT_SDK_ENABLE_LOG
69+
70+
#ifndef kConnectSDKWirelessSSIDChanged
71+
#define kConnectSDKWirelessSSIDChanged @"Connect_SDK_Wireless_SSID_Changed"
72+
#endif
73+
74+
#ifdef CONNECT_SDK_ENABLE_LOG
75+
// credit: http://stackoverflow.com/a/969291/2715
76+
#ifdef DEBUG
77+
# define DLog(fmt, ...) NSLog((@"%s [Line %d] " fmt), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__);
78+
#else
79+
# define DLog(...)
80+
#endif
81+
#else
82+
# define DLog(...)
83+
#endif
84+
PREFIX
85+
86+
non_arc_files =
87+
"core/Frameworks/asi-http-request/External/Reachability/*.{h,m}",
88+
"core/Frameworks/asi-http-request/Classes/*.{h,m}"
89+
90+
s.subspec 'Core' do |sp|
91+
sp.source_files = "ConnectSDKDefaultPlatforms.h", "core/**/*.{h,m}"
92+
sp.exclude_files = (non_arc_files.dup << "core/ConnectSDK*Tests/**/*")
93+
sp.private_header_files = "core/**/*_Private.h"
94+
sp.requires_arc = true
95+
96+
sp.dependency 'ConnectSDK/no-arc'
97+
end
98+
99+
s.subspec 'no-arc' do |sp|
100+
sp.source_files = non_arc_files
101+
sp.requires_arc = false
102+
# disable all warnings from asi-http-request
103+
sp.compiler_flags = '-w'
104+
end
105+
end
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1636,6 +1636,7 @@
16361636
developmentRegion = English;
16371637
hasScannedForEncodings = 0;
16381638
knownRegions = (
1639+
English,
16391640
en,
16401641
);
16411642
mainGroup = EA61EB0718FE485B00D75696;
@@ -2132,6 +2133,7 @@
21322133
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
21332134
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
21342135
COPY_PHASE_STRIP = NO;
2136+
ENABLE_BITCODE = NO;
21352137
GCC_C_LANGUAGE_STANDARD = gnu99;
21362138
GCC_DYNAMIC_NO_PIC = NO;
21372139
GCC_OPTIMIZATION_LEVEL = 0;
@@ -2170,6 +2172,7 @@
21702172
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
21712173
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
21722174
COPY_PHASE_STRIP = YES;
2175+
ENABLE_BITCODE = NO;
21732176
ENABLE_NS_ASSERTIONS = NO;
21742177
GCC_C_LANGUAGE_STANDARD = gnu99;
21752178
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -2192,6 +2195,7 @@
21922195
COPY_PHASE_STRIP = NO;
21932196
DEAD_CODE_STRIPPING = NO;
21942197
DSTROOT = /tmp/Connect_SDK.dst;
2198+
ENABLE_BITCODE = NO;
21952199
FRAMEWORK_SEARCH_PATHS = (
21962200
"$(inherited)",
21972201
"$(PROJECT_DIR)/modules/**",
@@ -2216,6 +2220,7 @@
22162220
DEAD_CODE_STRIPPING = NO;
22172221
DEPLOYMENT_POSTPROCESSING = YES;
22182222
DSTROOT = /tmp/Connect_SDK.dst;
2223+
ENABLE_BITCODE = NO;
22192224
FRAMEWORK_SEARCH_PATHS = (
22202225
"$(inherited)",
22212226
"$(PROJECT_DIR)/modules/**",
@@ -2236,6 +2241,7 @@
22362241
EECAED54193F611900D31F61 /* Debug */ = {
22372242
isa = XCBuildConfiguration;
22382243
buildSettings = {
2244+
ENABLE_BITCODE = NO;
22392245
ONLY_ACTIVE_ARCH = NO;
22402246
PRODUCT_NAME = "$(TARGET_NAME)";
22412247
VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64";
@@ -2245,6 +2251,7 @@
22452251
EECAED55193F611900D31F61 /* Release */ = {
22462252
isa = XCBuildConfiguration;
22472253
buildSettings = {
2254+
ENABLE_BITCODE = NO;
22482255
ONLY_ACTIVE_ARCH = NO;
22492256
PRODUCT_NAME = "$(TARGET_NAME)";
22502257
VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64";

ConnectSDK.xcodeproj/project.xcworkspace/contents.xcworkspacedata renamed to ConnectSDK-Lite.xcodeproj/project.xcworkspace/contents.xcworkspacedata

File renamed without changes.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
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>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

ConnectSDK.xcodeproj/xcshareddata/xcschemes/ConnectSDK.xcscheme renamed to ConnectSDK-Lite.xcodeproj/xcshareddata/xcschemes/ConnectSDK.xcscheme

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<BuildActionEntry
3838
buildForTesting = "NO"
3939
buildForRunning = "YES"
40-
buildForProfiling = "NO"
40+
buildForProfiling = "YES"
4141
buildForArchiving = "NO"
4242
buildForAnalyzing = "YES">
4343
<BuildableReference
@@ -51,7 +51,7 @@
5151
<BuildActionEntry
5252
buildForTesting = "NO"
5353
buildForRunning = "YES"
54-
buildForProfiling = "NO"
54+
buildForProfiling = "YES"
5555
buildForArchiving = "NO"
5656
buildForAnalyzing = "YES">
5757
<BuildableReference
@@ -117,6 +117,11 @@
117117
</BuildableReference>
118118
</MacroExpansion>
119119
<AdditionalOptions>
120+
<AdditionalOption
121+
key = "NSZombieEnabled"
122+
value = "YES"
123+
isEnabled = "YES">
124+
</AdditionalOption>
120125
</AdditionalOptions>
121126
</LaunchAction>
122127
<ProfileAction

ConnectSDK.xcodeproj/xcshareddata/xcschemes/ConnectSDKAcceptanceTests.xcscheme renamed to ConnectSDK-Lite.xcodeproj/xcshareddata/xcschemes/ConnectSDKAcceptanceTests.xcscheme

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,11 @@
9696
</BuildableReference>
9797
</MacroExpansion>
9898
<AdditionalOptions>
99+
<AdditionalOption
100+
key = "NSZombieEnabled"
101+
value = "YES"
102+
isEnabled = "YES">
103+
</AdditionalOption>
99104
</AdditionalOptions>
100105
</LaunchAction>
101106
<ProfileAction

ConnectSDK.xcodeproj/xcshareddata/xcschemes/ConnectSDKIntegrationTests.xcscheme renamed to ConnectSDK-Lite.xcodeproj/xcshareddata/xcschemes/ConnectSDKIntegrationTests.xcscheme

File renamed without changes.

ConnectSDK.xcodeproj/xcshareddata/xcschemes/ConnectSDKTests.xcscheme renamed to ConnectSDK-Lite.xcodeproj/xcshareddata/xcschemes/ConnectSDKTests.xcscheme

File renamed without changes.

ConnectSDK.xcodeproj/xcshareddata/xcschemes/Framework.xcscheme renamed to ConnectSDK-Lite.xcodeproj/xcshareddata/xcschemes/Framework.xcscheme

File renamed without changes.

0 commit comments

Comments
 (0)