Skip to content

Update submodules #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

Update submodules #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2fa097
Update submodules with fix and new features
GoMino Dec 23, 2015
21928b3
Update submodules with fix and new features
GoMino Dec 23, 2015
403fdad
Merge branch 'dev' of https://github.com/GoMino/Connect-SDK-Android i…
GoMino Dec 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[submodule "modules/google_cast"]
path = modules/google_cast
url = https://github.com/ConnectSDK/Connect-SDK-Android-Google-Cast.git
branch = master
url=https://github.com/GoMino/Connect-SDK-Android-Google-Cast.git
branch = dev
[submodule "core"]
path = core
url = https://github.com/ConnectSDK/Connect-SDK-Android-Core.git
branch = master
url=https://github.com/GoMino/Connect-SDK-Android-Core.git
branch = dev
[submodule "modules/firetv"]
path = modules/firetv
url = https://github.com/ConnectSDK/Connect-SDK-Android-FireTV.git
branch = master
url=https://github.com/GoMino/Connect-SDK-Android-FireTV.git
branch = dev
2 changes: 1 addition & 1 deletion core
Open in desktop
Submodule core updated 14 files
+18 −0 src/com/connectsdk/core/MediaInfo.java
+22 −0 src/com/connectsdk/device/ConnectableDevice.java
+7 −7 src/com/connectsdk/discovery/DiscoveryManager.java
+10 −0 src/com/connectsdk/service/AirPlayService.java
+11 −2 src/com/connectsdk/service/DLNAService.java
+10 −0 src/com/connectsdk/service/NetcastTVService.java
+11 −2 src/com/connectsdk/service/RokuService.java
+16 −2 src/com/connectsdk/service/WebOSTVService.java
+6 −0 src/com/connectsdk/service/capability/MediaPlayer.java
+1 −0 src/com/connectsdk/service/capability/WebAppLauncher.java
+11 −2 src/com/connectsdk/service/sessions/WebAppSession.java
+12 −0 test/src/com/connectsdk/core/MediaInfoTest.java
+70 −2 test/src/com/connectsdk/device/ConnectableDeviceTest.java
+3 −0 test/src/com/connectsdk/service/DLNAServiceSendCommandTest.java
2 changes: 1 addition & 1 deletion modules/firetv
Open in desktop
Submodule firetv updated 1 files
+10 −0 src/com/connectsdk/service/FireTVService.java
2 changes: 1 addition & 1 deletion modules/google_cast
Open in desktop
Submodule google_cast updated 3 files
+4 −4 src/com/connectsdk/discovery/provider/CastDiscoveryProvider.java
+50 −23 src/com/connectsdk/service/CastService.java
+2 −1 test/src/com/connectsdk/service/CastServiceTest.java