-
Notifications
You must be signed in to change notification settings - Fork 141
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
17 changed files
with
1,260 additions
and
104 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
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 |
|---|---|---|
|
|
@@ -2,10 +2,10 @@ | |
|
|
||
| ##General Questions | ||
|
|
||
| Please do not use GitHub issues for general questions about the SDK. Instead, use any of the following services to reach out to the development team. | ||
| Please do not use GitHub issues for general questions about the SDK. Instead, use any of the following services to reach out to the development team: | ||
|
|
||
| - [@ConnectSDK](https://twitter.com/ConnectSDK) | ||
| - [Stack Overflow TV Tag](http://www.stackoverflow.com/tags/tv) | ||
| - Twitter: [@ConnectSDK](https://twitter.com/ConnectSDK) | ||
| - Stack Overflow: [Connect-SDK tag](https://stackoverflow.com/tags/connect-sdk) (or [TV tag](https://stackoverflow.com/tags/tv)) | ||
| - [[email protected]](mailto:[email protected]) | ||
|
|
||
| ##Versioning | ||
|
|
@@ -14,39 +14,32 @@ We use [semantic versioning](http://semver.org/) in our tagged releases. | |
|
|
||
| ##Branching Strategy | ||
|
|
||
| - master | ||
| + latest stable, QA'd, tagged release of the SDK | ||
| + assume that this is safe for production use | ||
| + each tagged release will be made available as a CocoaPod | ||
| - sdk_MAJOR.MINOR | ||
| + stable branch working towards the next major/minor/patch release | ||
| + safe for checking out new features, but do not use in any production apps | ||
| - sdk_MAJOR.MINOR-dev | ||
| + unstable development branch working towards the next major/minor/patch release | ||
| + may not compile/run without errors | ||
| + for development only | ||
| + submit pull requests against this branch | ||
| We use the [successful git branching model](http://nvie.com/posts/a-successful-git-branching-model/), except without release branches, and the `develop` branch is named `dev`. | ||
|
|
||
| ##Bug Reports & Feature Requests | ||
| ##Bug Reports & Feature Requests | ||
|
|
||
| We use GitHub's issues system for managing bug reports and some upcoming features. Just open an issue and a member of the team will set the appropriate assignee, label, & milestone. | ||
| We use [GitHub's issues](https://github.com/ConnectSDK/Connect-SDK-iOS/issues) system for managing bug reports and some upcoming features. Just open an issue and a member of the team will set the appropriate assignee, label, & milestone. | ||
|
|
||
| ###Crash Reports | ||
|
|
||
| If you experience a crash, please attach your symbolicated crash log or stack trace to an issue in GitHub. | ||
|
|
||
| ##Pull Requests | ||
|
|
||
| If you would like to submit code, please fork the repository on GitHub and develop on the latest sdk-X.Y-dev branch. We do not accept pull requests on the master branch, as we only merge QA'd & tagged code into the master branch. See the description of our branching strategy above. | ||
| If you would like to submit code, please fork the repository on GitHub and develop in a feature branch, created from the latest `dev` commit. We do not accept pull requests on the `master` branch, as we only merge QA'd and tagged code into the `master` branch. | ||
|
|
||
| ###Tests | ||
|
|
||
| Please include unit/integration tests for the new/changed functionality with your pull request. It will help to verify the code is working as designed and make sure there are no regressions in future releases. Read more about our tests here: [README.md#tests](https://github.com/ConnectSDK/Connect-SDK-iOS/blob/dev/README.md#tests). | ||
|
|
||
| ###Use of third party libraries | ||
|
|
||
| Connect SDK does include some third party libraries, but we try to avoid using them. If you'd like to integrate a library with a pull request, make sure that library has an open source license (MIT, Apache 2.0, etc). | ||
| Connect SDK includes some third party libraries. If you'd like to integrate a library with a pull request, make sure that library has an open source license (MIT, Apache 2.0, etc). | ||
|
|
||
| ###Licensing | ||
|
|
||
| If you submit a pull request, you acknowledge that your code will be released to the public under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html). Make sure that you have the rights to the code you are submitting in the pull request. | ||
|
|
||
| ##Testing Lab | ||
|
|
||
| In the development of Connect SDK, we have gathered a number of devices for testing purposes. If you are contributing to and/or integrating Connect SDK & would like something tested in our lab, you may contact [[email protected]](mailto:[email protected]) with your request. | ||
| In the development of Connect SDK, we have gathered a number of devices for testing purposes. If you are contributing to and/or integrating Connect SDK and would like something tested in our lab, you may contact [[email protected]](mailto:[email protected]) with your request. | ||
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 |
|---|---|---|
| @@ -1,11 +1,16 @@ | ||
| # There are two usage options of this podspec: | ||
| # * pod "ConnectSDK" will install the full ConnectSDK version; | ||
| # * pod "ConnectSDK" will install the full ConnectSDK version (without Amazon | ||
| # Fling SDK support; if you need it, please use the source ConnectSDK project | ||
| # directly); | ||
| # * pod "ConnectSDK/Core" will install the core only (Lite version) without | ||
| # external dependencies. | ||
| # | ||
| # Unfortunately, Amazon Fling SDK is not distributed via CocoaPods, so we | ||
| # cannot include its support in a subspec in an automated way. | ||
|
|
||
| Pod::Spec.new do |s| | ||
| s.name = "ConnectSDK" | ||
| s.version = "1.4.4" | ||
| s.version = "1.5.0" | ||
| s.summary = "Connect SDK is an open source framework that connects your mobile apps with multiple TV platforms." | ||
|
|
||
| s.description = <<-DESC | ||
|
|
@@ -24,8 +29,8 @@ Pod::Spec.new do |s| | |
| s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" } | ||
| s.author = { "Connect SDK" => "[email protected]" } | ||
| s.social_media_url = "http://twitter.com/ConnectSDK" | ||
| s.platform = :ios, "6.0" | ||
| s.ios.deployment_target = "6.0" | ||
| s.platform = :ios, "7.1" | ||
| s.ios.deployment_target = "7.1" | ||
| s.source = { :git => "https://github.com/ConnectSDK/Connect-SDK-iOS.git", | ||
| :tag => s.version, | ||
| :submodules => true } | ||
|
|
@@ -37,6 +42,26 @@ Pod::Spec.new do |s| | |
| s.requires_arc = true | ||
| s.libraries = "z", "icucore" | ||
| s.prefix_header_contents = <<-PREFIX | ||
| // | ||
| // Prefix header | ||
| // | ||
| // The contents of this file are implicitly included at the beginning of every source file. | ||
| // | ||
| // Copyright (c) 2015 LG Electronics. | ||
| // | ||
| // 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. | ||
| // | ||
| #define CONNECT_SDK_VERSION @"#{s.version}" | ||
| // Uncomment this line to enable SDK logging | ||
|
|
@@ -64,7 +89,7 @@ Pod::Spec.new do |s| | |
|
|
||
| s.subspec 'Core' do |sp| | ||
| sp.source_files = "ConnectSDKDefaultPlatforms.h", "core/**/*.{h,m}" | ||
| sp.exclude_files = (non_arc_files.dup << "core/ConnectSDKTests") | ||
| sp.exclude_files = (non_arc_files.dup << "core/ConnectSDK*Tests/**/*") | ||
| sp.private_header_files = "core/**/*_Private.h" | ||
| sp.requires_arc = true | ||
|
|
||
|
|
@@ -80,8 +105,8 @@ Pod::Spec.new do |s| | |
|
|
||
| s.subspec 'GoogleCast' do |sp| | ||
| sp.dependency 'ConnectSDK/Core' | ||
| sp.source_files = "modules/**/*.{h,m}" | ||
| sp.private_header_files = "modules/**/*_Private.h" | ||
| sp.source_files = "modules/google-cast/**/*.{h,m}" | ||
| sp.private_header_files = "modules/google-cast/**/*_Private.h" | ||
|
|
||
| cast_version = "2.6.0" | ||
| sp.dependency "google-cast-sdk", cast_version | ||
|
|
||
Oops, something went wrong.