Skip to content

Commit

Permalink
Release 1.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
oleksii-frolov committed Sep 9, 2015
2 parents 7fc7030 + 3dc230d commit f6e76e6
Show file tree
Hide file tree
Showing 10 changed files with 70 additions and 105 deletions.
22 changes: 22 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
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,android/WhisperPlay}.jar modules/firetv/libs

after_success:
- bash <(curl -s https://codecov.io/bash)

script:
- gradle build

6 changes: 4 additions & 2 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.connectsdk"
android:versionCode="11"
android:versionName="1.5.0" >
android:versionCode="12"
android:versionName="1.6.0" >

<uses-sdk
android:minSdkVersion="10"
android:targetSdkVersion="22" />

<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
<application />
</manifest>
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
22 changes: 21 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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.6.0|aar)
[![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/[email protected])](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.

Expand All @@ -25,7 +32,7 @@ Edit your project's build.gradle to add this in the "dependencies" section
```groovy
dependencies {
//...
compile 'com.connectsdk:connect-sdk-android:1.5.0'
compile 'com.connectsdk:connect-sdk-android:1.6.0'
}
```
This prebuilt library doesn't have Amazon Fling SDK support, because it’s not available on maven. You need to set the project up from sources
Expand Down Expand Up @@ -108,6 +115,18 @@ 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 `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. 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.



##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))
Expand All @@ -131,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.
Expand Down
11 changes: 6 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ allprojects {

apply plugin: 'com.android.library'
apply plugin: 'org.robolectric'
apply plugin: "jacoco"
apply plugin: 'jacoco'


jacoco {
Expand Down Expand Up @@ -109,16 +109,17 @@ 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.google.android.gms:play-services-cast:7.5.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.8.0'

testCompile 'org.apache.maven:maven-ant-tasks:2.1.3'
testCompile 'junit:junit:4.12'
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'
92 changes: 0 additions & 92 deletions build.xml

This file was deleted.

2 changes: 1 addition & 1 deletion core
Submodule core updated 38 files
+0 −92 build.xml
+19 −0 src/com/connectsdk/core/ImageInfo.java
+131 −55 src/com/connectsdk/core/MediaInfo.java
+122 −0 src/com/connectsdk/core/SubtitleInfo.java
+13 −4 src/com/connectsdk/device/SimpleDevicePicker.java
+1 −1 src/com/connectsdk/discovery/DiscoveryManager.java
+4 −4 src/com/connectsdk/discovery/provider/ssdp/SSDPPacket.java
+5 −0 src/com/connectsdk/service/AirPlayService.java
+18 −10 src/com/connectsdk/service/DIALService.java
+56 −7 src/com/connectsdk/service/DLNAService.java
+17 −1 src/com/connectsdk/service/DeviceService.java
+16 −32 src/com/connectsdk/service/NetcastTVService.java
+22 −53 src/com/connectsdk/service/RokuService.java
+110 −71 src/com/connectsdk/service/WebOSTVService.java
+55 −31 src/com/connectsdk/service/airplay/PListParser.java
+12 −1 src/com/connectsdk/service/capability/KeyControl.java
+2 −0 src/com/connectsdk/service/capability/MediaPlayer.java
+64 −44 src/com/connectsdk/service/sessions/WebOSWebAppSession.java
+44 −14 src/com/connectsdk/service/webos/WebOSTVServiceSocketClient.java
+0 −92 test/build.xml
+ test/libs/junit-4.10.jar
+ test/libs/mockito-all-1.9.5.jar
+ test/libs/powermock-mockito-1.5.6-full.jar
+ test/libs/robolectric-2.4-jar-with-dependencies.jar
+90 −0 test/src/com/connectsdk/core/MediaInfoTest.java
+63 −0 test/src/com/connectsdk/core/SubtitleInfoTest.java
+44 −0 test/src/com/connectsdk/core/TestUtil.java
+0 −22 test/src/com/connectsdk/discovery/provider/SSDPDiscoveryProviderTest.java
+18 −1 test/src/com/connectsdk/service/DIALServiceSendCommandTest.java
+99 −0 test/src/com/connectsdk/service/DIALServiceTest.java
+175 −25 test/src/com/connectsdk/service/DLNAServiceTest.java
+86 −0 test/src/com/connectsdk/service/NetCastTVServiceTest.java
+124 −0 test/src/com/connectsdk/service/RokuServiceTest.java
+340 −28 test/src/com/connectsdk/service/WebOSTVServiceTest.java
+79 −5 test/src/com/connectsdk/service/airplay/PListParserTest.java
+92 −0 test/src/com/connectsdk/service/capability/KeyCodeParameterizedTest.java
+89 −0 test/src/com/connectsdk/service/roku/RokuApplicationListParserTest.java
+136 −0 test/src/com/connectsdk/service/sessions/WebOSWebAppSessionTest.java
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ POM_NAME=Connect SDK Android
POM_ARTIFACT_ID=connect-sdk-android

POM_PACKAGING=aar
VERSION_NAME=1.5.0
VERSION_CODE=11
VERSION_NAME=1.6.0
VERSION_CODE=12
GROUP=com.connectsdk

POM_DESCRIPTION=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.
Expand Down

0 comments on commit f6e76e6

Please sign in to comment.