Skip to content

Commit 8180ca6

Browse files
jonghen.hanjonghen.han
jonghen.han
authored and
jonghen.han
committed
Update submodules
1 parent 8636c64 commit 8180ca6

File tree

8 files changed

+220
-17
lines changed

8 files changed

+220
-17
lines changed

‎AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
22
package="com.connectsdk"
3-
android:versionCode="12"
4-
android:versionName="1.6.0" >
3+
android:versionCode="13"
4+
android:versionName="1.6.2" >
55

66
<uses-sdk
77
android:minSdkVersion="10"

‎build.gradle

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,26 @@ buildscript {
55
}
66
dependencies {
77
classpath 'com.android.tools.build:gradle:4.0.1'
8+
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
89
}
910
}
1011

1112
allprojects {
1213
repositories {
1314
google()
1415
jcenter()
16+
maven { url "https://jitpack.io" }
1517
}
1618
}
1719

1820
apply plugin: 'com.android.library'
1921
apply plugin: 'jacoco'
2022

23+
apply plugin: 'com.github.dcendents.android-maven'
24+
group='com.github.ConnectSDK'
2125

2226
jacoco {
23-
toolVersion = "0.8.5"
27+
toolVersion = "0.7.1.201405082137"
2428
}
2529

2630
task jacocoTestReport(type:JacocoReport, dependsOn: "check") {
@@ -51,8 +55,8 @@ task jacocoTestReport(type:JacocoReport, dependsOn: "check") {
5155
build.dependsOn jacocoTestReport
5256

5357
android {
54-
compileSdkVersion 22
55-
buildToolsVersion '22.0.1'
58+
compileSdkVersion 31
59+
buildToolsVersion '30.0.3'
5660

5761
packagingOptions {
5862
exclude 'LICENSE.txt'
@@ -97,29 +101,38 @@ android {
97101
abortOnError false
98102
}
99103
}
104+
105+
compileOptions {
106+
sourceCompatibility JavaVersion.VERSION_1_8
107+
targetCompatibility JavaVersion.VERSION_1_8
108+
}
109+
useLibrary 'org.apache.http.legacy'
100110
}
101111

102112
android.testOptions.unitTests.all {
103113
include '**/*Test.class'
104114
}
105115

106116
dependencies {
107-
compile files('core/libs/Java-WebSocket-1.3.7.jar')
108-
compile files('core/libs/javax.jmdns_3.4.1-patch2.jar')
109-
110-
api 'com.android.support:appcompat-v7:22.2.1'
117+
implementation files('core/libs/Java-WebSocket-1.3.7.jar')
118+
implementation files('core/libs/javax.jmdns_3.4.1-patch2.jar')
119+
compileOnly files('core/libs/lgcast-sdk-2.1.2.aar')
111120

112121
implementation fileTree(dir: 'modules/firetv/libs', include: '*.jar')
113122

114-
implementation 'com.android.support:support-v4:22.2.1'
115-
implementation 'com.android.support:mediarouter-v7:22.2.1'
116-
implementation 'com.google.android.gms:play-services-cast:7.8.0'
123+
124+
implementation "androidx.mediarouter:mediarouter:1.2.0"
125+
implementation "androidx.annotation:annotation:1.0.0"
126+
implementation 'androidx.preference:preference:1.1.1'
127+
implementation 'androidx.appcompat:appcompat:1.4.0'
117128
implementation 'com.googlecode.plist:dd-plist:1.23'
118129
implementation 'com.nimbusds:srp6a-android:2.0.2'
119130
implementation 'net.i2p.crypto:eddsa:0.2.0'
131+
implementation 'com.google.android.gms:play-services-cast-framework:9.4.0'
120132

121133
testImplementation 'org.apache.maven:maven-ant-tasks:2.1.3'
122134
testImplementation 'junit:junit:4.12'
135+
testImplementation 'org.robolectric:robolectric:2.4'
123136
testImplementation 'org.mockito:mockito-all:1.10.19'
124137
testImplementation 'org.powermock:powermock-api-mockito:1.6.2'
125138
testImplementation 'xmlunit:xmlunit:1.4'

‎core

Submodule core updated 24 files

‎gradle.properties

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ POM_NAME=Connect SDK Android
33
POM_ARTIFACT_ID=connect-sdk-android
44

55
POM_PACKAGING=aar
6-
VERSION_NAME=1.6.0
7-
VERSION_CODE=12
6+
VERSION_NAME=1.6.2
7+
VERSION_CODE=13
88
GROUP=com.connectsdk
99

1010
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.
@@ -24,4 +24,6 @@ POM_DEVELOPER_NAME=change
2424
SNAPSHOT_REPOSITORY_URL=https://oss.sonatype.org/content/repositories/snapshots
2525
RELEASE_REPOSITORY_URL=https://oss.sonatype.org/service/local/staging/deploy/maven2
2626

27-
27+
android.useAndroidX=true
28+
# Automatically convert third-party libraries to use AndroidX
29+
android.enableJetifier=true

‎gradlew

Lines changed: 172 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,172 @@
1+
#!/usr/bin/env sh
2+
3+
##############################################################################
4+
##
5+
## Gradle start up script for UN*X
6+
##
7+
##############################################################################
8+
9+
# Attempt to set APP_HOME
10+
# Resolve links: $0 may be a link
11+
PRG="$0"
12+
# Need this for relative symlinks.
13+
while [ -h "$PRG" ] ; do
14+
ls=`ls -ld "$PRG"`
15+
link=`expr "$ls" : '.*-> \(.*\)$'`
16+
if expr "$link" : '/.*' > /dev/null; then
17+
PRG="$link"
18+
else
19+
PRG=`dirname "$PRG"`"/$link"
20+
fi
21+
done
22+
SAVED="`pwd`"
23+
cd "`dirname \"$PRG\"`/" >/dev/null
24+
APP_HOME="`pwd -P`"
25+
cd "$SAVED" >/dev/null
26+
27+
APP_NAME="Gradle"
28+
APP_BASE_NAME=`basename "$0"`
29+
30+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31+
DEFAULT_JVM_OPTS=""
32+
33+
# Use the maximum available, or set MAX_FD != -1 to use that value.
34+
MAX_FD="maximum"
35+
36+
warn () {
37+
echo "$*"
38+
}
39+
40+
die () {
41+
echo
42+
echo "$*"
43+
echo
44+
exit 1
45+
}
46+
47+
# OS specific support (must be 'true' or 'false').
48+
cygwin=false
49+
msys=false
50+
darwin=false
51+
nonstop=false
52+
case "`uname`" in
53+
CYGWIN* )
54+
cygwin=true
55+
;;
56+
Darwin* )
57+
darwin=true
58+
;;
59+
MINGW* )
60+
msys=true
61+
;;
62+
NONSTOP* )
63+
nonstop=true
64+
;;
65+
esac
66+
67+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
68+
69+
# Determine the Java command to use to start the JVM.
70+
if [ -n "$JAVA_HOME" ] ; then
71+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
72+
# IBM's JDK on AIX uses strange locations for the executables
73+
JAVACMD="$JAVA_HOME/jre/sh/java"
74+
else
75+
JAVACMD="$JAVA_HOME/bin/java"
76+
fi
77+
if [ ! -x "$JAVACMD" ] ; then
78+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
79+
80+
Please set the JAVA_HOME variable in your environment to match the
81+
location of your Java installation."
82+
fi
83+
else
84+
JAVACMD="java"
85+
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
86+
87+
Please set the JAVA_HOME variable in your environment to match the
88+
location of your Java installation."
89+
fi
90+
91+
# Increase the maximum file descriptors if we can.
92+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
93+
MAX_FD_LIMIT=`ulimit -H -n`
94+
if [ $? -eq 0 ] ; then
95+
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
96+
MAX_FD="$MAX_FD_LIMIT"
97+
fi
98+
ulimit -n $MAX_FD
99+
if [ $? -ne 0 ] ; then
100+
warn "Could not set maximum file descriptor limit: $MAX_FD"
101+
fi
102+
else
103+
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
104+
fi
105+
fi
106+
107+
# For Darwin, add options to specify how the application appears in the dock
108+
if $darwin; then
109+
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
110+
fi
111+
112+
# For Cygwin, switch paths to Windows format before running java
113+
if $cygwin ; then
114+
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
115+
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
116+
JAVACMD=`cygpath --unix "$JAVACMD"`
117+
118+
# We build the pattern for arguments to be converted via cygpath
119+
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
120+
SEP=""
121+
for dir in $ROOTDIRSRAW ; do
122+
ROOTDIRS="$ROOTDIRS$SEP$dir"
123+
SEP="|"
124+
done
125+
OURCYGPATTERN="(^($ROOTDIRS))"
126+
# Add a user-defined pattern to the cygpath arguments
127+
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
128+
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
129+
fi
130+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
131+
i=0
132+
for arg in "$@" ; do
133+
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
134+
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
135+
136+
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
137+
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
138+
else
139+
eval `echo args$i`="\"$arg\""
140+
fi
141+
i=$((i+1))
142+
done
143+
case $i in
144+
(0) set -- ;;
145+
(1) set -- "$args0" ;;
146+
(2) set -- "$args0" "$args1" ;;
147+
(3) set -- "$args0" "$args1" "$args2" ;;
148+
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149+
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150+
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151+
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152+
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153+
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
154+
esac
155+
fi
156+
157+
# Escape application args
158+
save () {
159+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160+
echo " "
161+
}
162+
APP_ARGS=$(save "$@")
163+
164+
# Collect all arguments for the java command, following the shell quoting and substitution rules
165+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166+
167+
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168+
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169+
cd "$(dirname "$0")"
170+
fi
171+
172+
exec "$JAVACMD" "$@"

‎jitpack.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
jdk:
2+
- openjdk11
3+
before_install:
4+
- ./gradlew clean publishToMavenLocal
5+
install:
6+
- ./gradlew clean install

‎modules/google_cast

‎pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>com.github.ConnectSDK</groupId>
5+
<artifactId>connect-sdk-android</artifactId>
6+
<version>1.6.2</version>
7+
<build>
8+
<sourceDirectory>core/src</sourceDirectory>
9+
</build>
10+
</project>

0 commit comments

Comments
 (0)