From 9fd47214878fbb17a6f9d7e8ac88c16609f8b154 Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Fri, 17 Jul 2015 12:27:41 -0700 Subject: [PATCH 01/30] Update core submodule --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 238d5e70..8ce6207c 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 238d5e701e162b4433945581f1a17dc101620163 +Subproject commit 8ce6207cfbf614910a8f96d7f9dbaae88a203e6b From 5af76868f5bc707d01eac9f974fc5f2008c1a949 Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Tue, 28 Jul 2015 10:49:14 -0700 Subject: [PATCH 02/30] Add subtitles support: update readme and submodules --- README.md | 9 +++++++++ build.gradle | 3 ++- core | 2 +- modules/firetv | 2 +- modules/google_cast | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 321deb80..cb975131 100644 --- a/README.md +++ b/README.md @@ -108,6 +108,15 @@ gradle jacocoTestReport ``` The test coverage report will be in this folder `Connect-SDK-Android/build/reports/jacoco/jacocoTestReport/html`. +##Limitations/Caveats + +###Subtitles + +- DLNA service support only `SRT` subtitles format. Since there is no official specification for them, subtitles may not work on all DLNA-compatible devices. This feature has been tested and works on LG WebOS and Netcast TVs. +- Netcast service support `SRT` subtitles format. It uses DLNA and has the same restrictions as DLNA service. +- Google Cast service supports only `WebVTT` subtitles format. The server providing subtitles should support CORS headers, otherwise they are not displayed. The simplest change is to send this HTTP response header for your subtitles: `Access-Control-Allow-Origin: *`. More information is here: [https://developers.google.com/cast/docs/android_sender#cors-requirements](https://developers.google.com/cast/docs/android_sender#cors-requirements). +- FireTV service supports only `WebVTT` subtitles format. Subtitles on Fire TV are off by default. To display them, the user should manually pick one in the media player (click the "Options" button on the remote). The Fling SDK doesn't provide any way to display them remotely. + ##Contact * Twitter [@ConnectSDK](https://www.twitter.com/ConnectSDK) * Ask a question on Stack Overflow with the [Connect-SDK tag](https://stackoverflow.com/tags/connect-sdk) (or [TV tag](https://stackoverflow.com/tags/tv)) diff --git a/build.gradle b/build.gradle index f9c0027d..10909d7a 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ allprojects { apply plugin: 'com.android.library' apply plugin: 'org.robolectric' -apply plugin: "jacoco" +apply plugin: 'jacoco' jacoco { @@ -119,6 +119,7 @@ dependencies { testCompile 'org.robolectric:robolectric:2.4' testCompile 'org.mockito:mockito-all:1.10.19' testCompile 'org.powermock:powermock-api-mockito:1.6.2' + testCompile 'xmlunit:xmlunit:1.4' } apply from: 'maven-push.gradle' diff --git a/core b/core index 8ce6207c..bcadee4b 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 8ce6207cfbf614910a8f96d7f9dbaae88a203e6b +Subproject commit bcadee4b0032740c44311dccd350b5c66439f896 diff --git a/modules/firetv b/modules/firetv index de203e34..788eff9b 160000 --- a/modules/firetv +++ b/modules/firetv @@ -1 +1 @@ -Subproject commit de203e34719e465588bf6c2c3bb1b6c97cc6c725 +Subproject commit 788eff9bf95e88ef81c9276694cb82f71eef748d diff --git a/modules/google_cast b/modules/google_cast index 64795d73..7f698934 160000 --- a/modules/google_cast +++ b/modules/google_cast @@ -1 +1 @@ -Subproject commit 64795d7363767dbf0220327f0469460388ea9ed7 +Subproject commit 7f698934e3084d6252ea26f0e6ba87538213e4be From 253d40d07bb90279d98a8bae3d6c5073145589bf Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Tue, 28 Jul 2015 11:31:45 -0700 Subject: [PATCH 03/30] Update README limitations section and core submodule --- README.md | 8 ++++---- core | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index cb975131..914fd72e 100644 --- a/README.md +++ b/README.md @@ -112,10 +112,10 @@ The test coverage report will be in this folder `Connect-SDK-Android/build/repor ###Subtitles -- DLNA service support only `SRT` subtitles format. Since there is no official specification for them, subtitles may not work on all DLNA-compatible devices. This feature has been tested and works on LG WebOS and Netcast TVs. -- Netcast service support `SRT` subtitles format. It uses DLNA and has the same restrictions as DLNA service. -- Google Cast service supports only `WebVTT` subtitles format. The server providing subtitles should support CORS headers, otherwise they are not displayed. The simplest change is to send this HTTP response header for your subtitles: `Access-Control-Allow-Origin: *`. More information is here: [https://developers.google.com/cast/docs/android_sender#cors-requirements](https://developers.google.com/cast/docs/android_sender#cors-requirements). -- FireTV service supports only `WebVTT` subtitles format. Subtitles on Fire TV are off by default. To display them, the user should manually pick one in the media player (click the "Options" button on the remote). The Fling SDK doesn't provide any way to display them remotely. +- DLNA service support `SRT` format only. Since there is no official specification for them, subtitles may not work on all DLNA-compatible devices. This feature has been tested and works on LG WebOS and Netcast TVs. +- Netcast service support `SRT` format only. It uses DLNA and has the same restrictions as DLNA service. +- Google Cast service supports `WebVTT` format only. The server providing subtitles should support CORS headers, otherwise they are not displayed. The simplest change is to send this HTTP response header for your subtitles: `Access-Control-Allow-Origin: *`. More information is here: [https://developers.google.com/cast/docs/android_sender#cors-requirements](https://developers.google.com/cast/docs/android_sender#cors-requirements). +- FireTV service supports `WebVTT` format only. Subtitles on Fire TV are hidden by default. To display them, the user should manually pick one in the media player (click the "Options" button on the remote). The Fling SDK doesn't provide any way to make them appear remotely. ##Contact * Twitter [@ConnectSDK](https://www.twitter.com/ConnectSDK) diff --git a/core b/core index bcadee4b..0380ade9 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit bcadee4b0032740c44311dccd350b5c66439f896 +Subproject commit 0380ade9a7200e9f0bb6cccb26cad16099fd68aa From 10d8a77e36cfdffad95f7d431a49a5c1ed2ff0ea Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Thu, 30 Jul 2015 14:17:15 -0700 Subject: [PATCH 04/30] Update core and google_cast submodules --- core | 2 +- modules/google_cast | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core b/core index 7eeffc6f..92968f36 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 7eeffc6f9ad4c0612d8c8aa9bd1a726588ba7d78 +Subproject commit 92968f36e532597b59da4dbfeda200d61bdd1d8b diff --git a/modules/google_cast b/modules/google_cast index 53113c53..a915c122 160000 --- a/modules/google_cast +++ b/modules/google_cast @@ -1 +1 @@ -Subproject commit 53113c536ffba5e4736a7513fc1939fca0577b1e +Subproject commit a915c12239aa8c840d37f862a8e174b49e3ebffd From 7bdf6cd1e521ac45acc6af3008951bf395cb28d2 Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Thu, 30 Jul 2015 14:19:12 -0700 Subject: [PATCH 05/30] Update core submodule --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 92968f36..7eeffc6f 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 92968f36e532597b59da4dbfeda200d61bdd1d8b +Subproject commit 7eeffc6f9ad4c0612d8c8aa9bd1a726588ba7d78 From 9004351a52a9396090df0d2f4801665e6fcab54e Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Wed, 5 Aug 2015 12:25:24 -0700 Subject: [PATCH 06/30] Add subtitle support for WebOS --- README.md | 7 +++++-- core | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 914fd72e..f0d564fb 100644 --- a/README.md +++ b/README.md @@ -113,9 +113,12 @@ The test coverage report will be in this folder `Connect-SDK-Android/build/repor ###Subtitles - DLNA service support `SRT` format only. Since there is no official specification for them, subtitles may not work on all DLNA-compatible devices. This feature has been tested and works on LG WebOS and Netcast TVs. -- Netcast service support `SRT` format only. It uses DLNA and has the same restrictions as DLNA service. -- Google Cast service supports `WebVTT` format only. The server providing subtitles should support CORS headers, otherwise they are not displayed. The simplest change is to send this HTTP response header for your subtitles: `Access-Control-Allow-Origin: *`. More information is here: [https://developers.google.com/cast/docs/android_sender#cors-requirements](https://developers.google.com/cast/docs/android_sender#cors-requirements). - FireTV service supports `WebVTT` format only. Subtitles on Fire TV are hidden by default. To display them, the user should manually pick one in the media player (click the "Options" button on the remote). The Fling SDK doesn't provide any way to make them appear remotely. +- Google Cast service supports `WebVTT` format only. The server providing subtitles should support CORS headers, otherwise they are not displayed. The simplest change is to send this HTTP response header for your subtitles: `Access-Control-Allow-Origin: *`. More information is here: [https://developers.google.com/cast/docs/android_sender#cors-requirements](https://developers.google.com/cast/docs/android_sender#cors-requirements). +- Netcast service support `SRT` format only. It uses DLNA and has the same restrictions as DLNA service. +- WebOS service supports `WebVTT` format only. The server providing subtitles should support CORS headers, similarly to Cast service's requirements. + + ##Contact * Twitter [@ConnectSDK](https://www.twitter.com/ConnectSDK) diff --git a/core b/core index 7eeffc6f..7942ca4e 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 7eeffc6f9ad4c0612d8c8aa9bd1a726588ba7d78 +Subproject commit 7942ca4eabd58cfcd8e9d041d08cd4f5302eba74 From 12eb9b95b08f854b5ef106e66649197e1ccac58a Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Wed, 12 Aug 2015 10:48:32 -0700 Subject: [PATCH 07/30] Update build.gradle: use newer libraries --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 10909d7a..cf946888 100644 --- a/build.gradle +++ b/build.gradle @@ -109,9 +109,9 @@ dependencies { compile fileTree(dir: 'modules/firetv/libs', include: '*.jar') - compile 'com.android.support:support-v4:22.2.0' - compile 'com.android.support:appcompat-v7:22.2.0' - compile 'com.android.support:mediarouter-v7:21.0.0' + compile 'com.android.support:support-v4:22.2.1' + compile 'com.android.support:appcompat-v7:22.2.1' + compile 'com.android.support:mediarouter-v7:22.2.1' compile 'com.google.android.gms:play-services-cast:7.5.0' testCompile 'org.apache.maven:maven-ant-tasks:2.1.3' From 43cc15bdffb6cc9bd8e1d8da6dca74ff0a43f936 Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Mon, 17 Aug 2015 10:48:26 -0700 Subject: [PATCH 08/30] Update play-services-cast library --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index cf946888..26881923 100644 --- a/build.gradle +++ b/build.gradle @@ -112,7 +112,7 @@ dependencies { compile 'com.android.support:support-v4:22.2.1' compile 'com.android.support:appcompat-v7:22.2.1' compile 'com.android.support:mediarouter-v7:22.2.1' - compile 'com.google.android.gms:play-services-cast:7.5.0' + compile 'com.google.android.gms:play-services-cast:7.8.0' testCompile 'org.apache.maven:maven-ant-tasks:2.1.3' testCompile 'junit:junit:4.12' From b5bb7a089ff1125f84fcf89e79bfeae3a4633f2b Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Mon, 17 Aug 2015 11:28:31 -0700 Subject: [PATCH 09/30] Update submodules --- core | 2 +- modules/google_cast | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core b/core index 7942ca4e..0863c0d3 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 7942ca4eabd58cfcd8e9d041d08cd4f5302eba74 +Subproject commit 0863c0d3f4860cc040e5bd09cd4df8d2d900942c diff --git a/modules/google_cast b/modules/google_cast index a915c122..33d12afd 160000 --- a/modules/google_cast +++ b/modules/google_cast @@ -1 +1 @@ -Subproject commit a915c12239aa8c840d37f862a8e174b49e3ebffd +Subproject commit 33d12afd536c5e24d3ed512e296c905cb0d6f59d From 7e762dc37284f9ddeed3985bf0e6200000c11a72 Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Tue, 18 Aug 2015 09:03:41 -0700 Subject: [PATCH 10/30] Update core submodule --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 0863c0d3..d8038781 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 0863c0d3f4860cc040e5bd09cd4df8d2d900942c +Subproject commit d803878116686b8cbcc632cbf33ae1280031e5c7 From 646da7d21752373fa1b207ef44e4bd5ba8061001 Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Thu, 20 Aug 2015 14:16:10 -0700 Subject: [PATCH 11/30] Update core submodule --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index d8038781..8051d8cb 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit d803878116686b8cbcc632cbf33ae1280031e5c7 +Subproject commit 8051d8cb90c1724cff51fe5d4174a680e1f46142 From e3eff30f68d658bef9ebf7ee46c6aa6f0e4a5404 Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Thu, 20 Aug 2015 17:47:48 -0700 Subject: [PATCH 12/30] Update core submodule --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 8051d8cb..8cd00fdb 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 8051d8cb90c1724cff51fe5d4174a680e1f46142 +Subproject commit 8cd00fdbed6deb0d152c2e6ac8255f16f030dca8 From 809f11c0b498b4790d130dfb1bf0f8ca2c8d60b1 Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Fri, 21 Aug 2015 11:47:08 -0700 Subject: [PATCH 13/30] Update core submodule: add PairingType.MIXED --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 8cd00fdb..864c9d18 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 8cd00fdbed6deb0d152c2e6ac8255f16f030dca8 +Subproject commit 864c9d18beee092be8bf44a88677f0b84a58fa5f From a0923636fa899f39fbc666a1adc5b0efe3687eb5 Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Mon, 24 Aug 2015 11:32:25 -0700 Subject: [PATCH 14/30] Update core submodule --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 864c9d18..19150be0 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 864c9d18beee092be8bf44a88677f0b84a58fa5f +Subproject commit 19150be005609acbdc7f89a28bf7c4b4415502b3 From f9e5b1fb540b791747cc6e06b41fc9e8d8bd35b1 Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Mon, 24 Aug 2015 12:51:02 -0700 Subject: [PATCH 15/30] Update core submodule --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 19150be0..71a4d688 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 19150be005609acbdc7f89a28bf7c4b4415502b3 +Subproject commit 71a4d688e6c4c08b814bb89269dcaf6cbe3716d7 From af73c9ac6de2bcc190ad0a07a19a500423fa0d30 Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Tue, 25 Aug 2015 16:31:13 -0700 Subject: [PATCH 16/30] Update core submodule --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 71a4d688..8d31569a 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 71a4d688e6c4c08b814bb89269dcaf6cbe3716d7 +Subproject commit 8d31569a224c5029c588a34885fd4b6abfcb6d9f From c2a7f35244e7acaf8f237668ce17e73d4f8d8ff8 Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Fri, 28 Aug 2015 14:23:36 -0700 Subject: [PATCH 17/30] Update submodules --- core | 2 +- modules/firetv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core b/core index 8d31569a..5a938b38 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 8d31569a224c5029c588a34885fd4b6abfcb6d9f +Subproject commit 5a938b382b1c5a95aafc95ad3e77d3b13f306c3d diff --git a/modules/firetv b/modules/firetv index fb8265ba..fd968719 160000 --- a/modules/firetv +++ b/modules/firetv @@ -1 +1 @@ -Subproject commit fb8265baa3c48fbb6e7b48e03cd7a1b9da64b0e0 +Subproject commit fd9687198492127900e7dc623970f75a9eaca0ae From 7b5e93f45503954601eed2ece034fe0f1cd2c519 Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Fri, 28 Aug 2015 14:22:08 -0700 Subject: [PATCH 18/30] Add badges and travis build system support --- .travis.yml | 23 +++++++++++++++++++++++ README.md | 7 +++++++ 2 files changed, 30 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..316885fe --- /dev/null +++ b/.travis.yml @@ -0,0 +1,23 @@ +language: android +jdk: oraclejdk7 + +android: + components: + - android-22 + - build-tools-22.0.1 + - extra-google-google_play_services + - extra-google-m2repository + - extra-android-m2repository + +before_script: + - curl -L -ofling.zip https://s3-us-west-1.amazonaws.com/amazon-fling/AmazonFling-SDK.zip + - unzip fling.zip 'android-sdk/lib/*' + - mv -v android-sdk/lib/AmazonFling.jar modules/firetv/libs + - mv -v android-sdk/lib/android/WhisperPlay.jar modules/firetv/libs + +after_success: + - bash <(curl -s https://codecov.io/bash) + +script: + - gradle build + diff --git a/README.md b/README.md index f0d564fb..e75d8f3b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,11 @@ #Connect SDK Android + +[![Build Status](https://travis-ci.org/ConnectSDK/Connect-SDK-Android.svg)](https://travis-ci.org/ConnectSDK/Connect-SDK-Android) +[![Code Coverage](https://img.shields.io/codecov/c/github/ConnectSDK/Connect-SDK-Android/dev.svg)](https://codecov.io/github/ConnectSDK/Connect-SDK-Android) +[![Maven Central](http://img.shields.io/maven-central/v/com.connectsdk/connect-sdk-android.svg)](http://search.maven.org/#artifactdetails|com.connectsdk|connect-sdk-android|1.5.0|aar) +[![Apache License, 2.0](https://img.shields.io/cocoapods/l/ConnectSDK.svg)](https://github.com/ConnectSDK/Connect-SDK-Android/blob/master/LICENSE) +[![Twitter](https://img.shields.io/badge/twitter-@ConnectSDK-blue.svg)](https://twitter.com/connectsdk) + 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. This project can be built in Android Studio or directly with Gradle. Eclipse IDE is not supported since 1.5.0 version. From f62e1693adb954fc044b646d1d52de6679d82143 Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Mon, 31 Aug 2015 17:20:54 -0700 Subject: [PATCH 19/30] Update readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e75d8f3b..15e33f2b 100644 --- a/README.md +++ b/README.md @@ -121,7 +121,7 @@ The test coverage report will be in this folder `Connect-SDK-Android/build/repor - DLNA service support `SRT` format only. Since there is no official specification for them, subtitles may not work on all DLNA-compatible devices. This feature has been tested and works on LG WebOS and Netcast TVs. - FireTV service supports `WebVTT` format only. Subtitles on Fire TV are hidden by default. To display them, the user should manually pick one in the media player (click the "Options" button on the remote). The Fling SDK doesn't provide any way to make them appear remotely. -- Google Cast service supports `WebVTT` format only. The server providing subtitles should support CORS headers, otherwise they are not displayed. The simplest change is to send this HTTP response header for your subtitles: `Access-Control-Allow-Origin: *`. More information is here: [https://developers.google.com/cast/docs/android_sender#cors-requirements](https://developers.google.com/cast/docs/android_sender#cors-requirements). +- Google Cast service supports `WebVTT` format only. Servers providing subtitles and media files should support CORS headers, otherwise they are not displayed. The simplest change is to send this HTTP response header for your subtitles: `Access-Control-Allow-Origin: *`. More information is here: [https://developers.google.com/cast/docs/android_sender#cors-requirements](https://developers.google.com/cast/docs/android_sender#cors-requirements). - Netcast service support `SRT` format only. It uses DLNA and has the same restrictions as DLNA service. - WebOS service supports `WebVTT` format only. The server providing subtitles should support CORS headers, similarly to Cast service's requirements. @@ -150,6 +150,7 @@ These projects are used in tests: * [Mockito](http://mockito.org/) (MIT) * [Robolectric](http://robolectric.org) (MIT) * [PowerMock](https://github.com/jayway/powermock) (Apache License, Version 2.0) +* [XMLUnit](http://www.xmlunit.org/) (Apache License, Version 2.0) ##License Copyright (c) 2013-2015 LG Electronics. From a465a07ab61a6c336f0b54dd474376eb5c2e7c95 Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Tue, 1 Sep 2015 13:19:12 -0700 Subject: [PATCH 20/30] Update version badge in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 15e33f2b..d1147675 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Build Status](https://travis-ci.org/ConnectSDK/Connect-SDK-Android.svg)](https://travis-ci.org/ConnectSDK/Connect-SDK-Android) [![Code Coverage](https://img.shields.io/codecov/c/github/ConnectSDK/Connect-SDK-Android/dev.svg)](https://codecov.io/github/ConnectSDK/Connect-SDK-Android) [![Maven Central](http://img.shields.io/maven-central/v/com.connectsdk/connect-sdk-android.svg)](http://search.maven.org/#artifactdetails|com.connectsdk|connect-sdk-android|1.5.0|aar) -[![Apache License, 2.0](https://img.shields.io/cocoapods/l/ConnectSDK.svg)](https://github.com/ConnectSDK/Connect-SDK-Android/blob/master/LICENSE) +[![Apache License, 2.0](https://img.shields.io/github/license/ConnectSDK/Connect-SDK-Android.svg)](https://github.com/ConnectSDK/Connect-SDK-Android/blob/master/LICENSE) [![Twitter](https://img.shields.io/badge/twitter-@ConnectSDK-blue.svg)](https://twitter.com/connectsdk) 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. From ff0be7bef36a3e38ab1ebd31d60dd73ed7b49d1a Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Tue, 1 Sep 2015 13:19:39 -0700 Subject: [PATCH 21/30] Update core submodule --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 5a938b38..294f9b85 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 5a938b382b1c5a95aafc95ad3e77d3b13f306c3d +Subproject commit 294f9b85b8f59b55d85204827fb772e5453b5ab4 From 46f9fe57efef79cf48dca6a55cd6fb9a9fa0fa6d Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Tue, 1 Sep 2015 15:37:07 -0700 Subject: [PATCH 22/30] Update core submodule --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 294f9b85..c874b2e9 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 294f9b85b8f59b55d85204827fb772e5453b5ab4 +Subproject commit c874b2e9d75e4cf55f2728b54bf5beeefc276d61 From afcf3f2e65fb7e4d9d4c53e438ffe2049a3e1000 Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Wed, 2 Sep 2015 17:25:02 -0700 Subject: [PATCH 23/30] Remove Ant support since Eclipse is not supported now --- build.xml | 92 --------------------------------------------- core | 2 +- modules/google_cast | 2 +- 3 files changed, 2 insertions(+), 94 deletions(-) delete mode 100644 build.xml diff --git a/build.xml b/build.xml deleted file mode 100644 index 0d0580dd..00000000 --- a/build.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core b/core index c874b2e9..b75effa2 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit c874b2e9d75e4cf55f2728b54bf5beeefc276d61 +Subproject commit b75effa2917b9f06ee895bbe223780265fb306e5 diff --git a/modules/google_cast b/modules/google_cast index 33d12afd..69283a0b 160000 --- a/modules/google_cast +++ b/modules/google_cast @@ -1 +1 @@ -Subproject commit 33d12afd536c5e24d3ed512e296c905cb0d6f59d +Subproject commit 69283a0b5d5bf281085d8752f09d6b01200f1d01 From 39a699877f71d320e0c86dd9ac0055d458b557ec Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Wed, 2 Sep 2015 18:28:29 -0700 Subject: [PATCH 24/30] Update travis configuration --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 316885fe..5d9144b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,7 @@ android: before_script: - curl -L -ofling.zip https://s3-us-west-1.amazonaws.com/amazon-fling/AmazonFling-SDK.zip - unzip fling.zip 'android-sdk/lib/*' - - mv -v android-sdk/lib/AmazonFling.jar modules/firetv/libs - - mv -v android-sdk/lib/android/WhisperPlay.jar modules/firetv/libs + - mv -v android-sdk/lib/{AmazonFling,android/WhisperPlay}.jar modules/firetv/libs after_success: - bash <(curl -s https://codecov.io/bash) From 7e307c85b1cfe713f226a291497329c16c66bf6a Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Fri, 4 Sep 2015 17:45:10 -0700 Subject: [PATCH 25/30] Update core submodule --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index b75effa2..e56156dc 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit b75effa2917b9f06ee895bbe223780265fb306e5 +Subproject commit e56156dc61c6a2a8975721cfacd29eac6bbd68d2 From 1cb1108ce653bb9672c317a493279988efbb4465 Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Tue, 8 Sep 2015 12:54:12 -0700 Subject: [PATCH 26/30] Update core submodule --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index e56156dc..9d9fcb5b 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit e56156dc61c6a2a8975721cfacd29eac6bbd68d2 +Subproject commit 9d9fcb5b02e333a2a63a78fad5850da097585f18 From 79622d5d5cae65a0355287fed39593d5a844fcee Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Tue, 8 Sep 2015 16:51:15 -0700 Subject: [PATCH 27/30] Update core submodule --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 9d9fcb5b..7e8d47f9 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 9d9fcb5b02e333a2a63a78fad5850da097585f18 +Subproject commit 7e8d47f9038645697223c5285398fef3b2afb196 From 832bd13724e26d2e75d0326751197286081bbeee Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Wed, 2 Sep 2015 14:48:50 -0700 Subject: [PATCH 28/30] Update CHANGELOG --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1968501..a54deb7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Connect SDK Android Changelog +## 1.6.0 -- 09 Sep 2015 + +- Added subtitles support for WebOS, Netcast, DLNA, Chromecast and FireTV +- Added PairingType.MIXED for WebOS +- Fixed playing media on Roku 6.2 +- Removed Rewind and FastForward capabilities from Netcast service because they are not supported +- Supports Android TV devices +- Miscellaneous bug fixes +- [See commits between 1.5.0 and 1.6.0](https://github.com/ConnectSDK/Connect-SDK-Android/compare/1.5.0...1.6.0) + +[View files at version 1.6.0](https://github.com/ConnectSDK/Connect-SDK-Android/tree/1.6.0) + ## 1.5.0 -- 09 Jul 2015 - Added Amazon Fling SDK support to play and control media on Fire TV devices From 2d20245f311bb5a5aec8e15940b34f9fa56b023a Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Thu, 3 Sep 2015 11:58:58 -0700 Subject: [PATCH 29/30] Add required permissions to the manifest --- AndroidManifest.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index bc346516..76d4581c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -7,5 +7,7 @@ android:minSdkVersion="10" android:targetSdkVersion="22" /> + + From 3dc230d42de72b51ff03ee592af8a3c987c4ffc9 Mon Sep 17 00:00:00 2001 From: Oleksii Frolov Date: Thu, 3 Sep 2015 12:06:24 -0700 Subject: [PATCH 30/30] Update version number --- AndroidManifest.xml | 4 ++-- README.md | 4 ++-- gradle.properties | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 76d4581c..dba65c45 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ + android:versionCode="12" + android:versionName="1.6.0" >