Skip to content

Commit 8180ca6

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

8 files changed

Lines changed: 220 additions & 17 deletions

File tree

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'

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
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

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)