Skip to content

Commit 2aab785

Browse files
jonghen.hanjonghen.han
jonghen.han
authored and
jonghen.han
committed
Replace android.support to androidX
1 parent 11fa2e4 commit 2aab785

File tree

8 files changed

+41
-11
lines changed

8 files changed

+41
-11
lines changed

AndroidManifest.xml

-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
android:versionCode="8"
44
android:versionName="1.4.2" >
55

6-
<uses-sdk
7-
android:minSdkVersion="16"
8-
android:targetSdkVersion="25" />
9-
106
<application>
117
<receiver android:name=".ScreenOnOffReceiver">
128
<intent-filter>

build.gradle

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
buildscript {
22
repositories {
3-
jcenter()
43
google()
4+
mavenCentral()
55
}
66
dependencies {
77
classpath 'com.android.tools.build:gradle:4.0.1'
@@ -10,15 +10,15 @@ buildscript {
1010

1111
allprojects {
1212
repositories {
13-
jcenter()
13+
google()
14+
mavenCentral()
1415
}
1516
}
1617

1718
apply plugin: 'com.android.library'
1819

1920
android {
2021
compileSdkVersion 21
21-
buildToolsVersion '27.0.3'
2222

2323
packagingOptions {
2424
exclude 'LICENSE.txt'
@@ -53,6 +53,10 @@ android {
5353
minifyEnabled false
5454
}
5555
}
56+
defaultConfig {
57+
minSdkVersion 16
58+
targetSdkVersion 25
59+
}
5660
}
5761

5862
dependencies {
@@ -62,4 +66,7 @@ dependencies {
6266
implementation 'com.android.support:mediarouter-v7:21.0.3'
6367
implementation 'com.android.support:appcompat-v7:21.0.3'
6468
implementation 'com.google.android.gms:play-services-cast:19.0.0'
69+
implementation 'com.googlecode.plist:dd-plist:1.23'
70+
implementation group: 'net.i2p.crypto', name: 'eddsa', version: '0.3.0'
71+
implementation group: 'com.nimbusds', name: 'srp6a', version: '2.1.0'
6572
}

res/values/connect_sdk_strings.xml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<resources>
2+
<string name="connect_sdk_picker_select_device">Select a device</string>
3+
<string name="connect_sdk_pairing_simple_title_tv">Pairing request</string>
4+
<string name="connect_sdk_pairing_simple_prompt_tv">Confirm pairing on the TV</string>
5+
<string name="connect_sdk_pairing_pin_prompt_tv">Enter pairing code displayed on TV</string>
6+
<string name="connect_sdk_connection_failed">Enter pairing code displayed on TV</string>
7+
</resources>
+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package com.connectsdk;
2+
3+
import java.util.HashMap;
4+
5+
public class DefaultPlatform {
6+
public DefaultPlatform() {
7+
}
8+
9+
public static HashMap<String, String> getDeviceServiceMap() {
10+
HashMap<String, String> devicesList = new HashMap<String, String>();
11+
devicesList.put("com.connectsdk.service.WebOSTVService", "com.connectsdk.discovery.provider.SSDPDiscoveryProvider");
12+
devicesList.put("com.connectsdk.service.NetcastTVService", "com.connectsdk.discovery.provider.SSDPDiscoveryProvider");
13+
devicesList.put("com.connectsdk.service.DLNAService", "com.connectsdk.discovery.provider.SSDPDiscoveryProvider");
14+
devicesList.put("com.connectsdk.service.DIALService", "com.connectsdk.discovery.provider.SSDPDiscoveryProvider");
15+
devicesList.put("com.connectsdk.service.RokuService", "com.connectsdk.discovery.provider.SSDPDiscoveryProvider");
16+
devicesList.put("com.connectsdk.service.AirPlayService", "com.connectsdk.discovery.provider.ZeroconfDiscoveryProvider");
17+
return devicesList;
18+
}
19+
20+
}

src/com/connectsdk/core/MediaInfo.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
package com.connectsdk.core;
2222

23-
import android.support.annotation.NonNull;
23+
import androidx.annotation.NonNull;
2424

2525
import java.util.ArrayList;
2626
import java.util.Collections;

src/com/connectsdk/core/SubtitleInfo.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*/
2020
package com.connectsdk.core;
2121

22-
import android.support.annotation.NonNull;
22+
import androidx.annotation.NonNull;
2323

2424
/**
2525
* Normalized reference object for information about a subtitle track. It's used in `MediaInfo` class.

src/com/connectsdk/service/WebOSTVService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import android.annotation.SuppressLint;
2424
import android.graphics.PointF;
25-
import android.support.annotation.NonNull;
25+
import androidx.annotation.NonNull;
2626
import android.util.Log;
2727

2828
import com.connectsdk.core.AppInfo;

src/com/connectsdk/service/sessions/WebOSWebAppSession.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
package com.connectsdk.service.sessions;
2222

23-
import android.support.annotation.NonNull;
23+
import androidx.annotation.NonNull;
2424
import android.util.Log;
2525

2626
import java.util.Enumeration;

0 commit comments

Comments
 (0)