Skip to content

Commit

Permalink
Replace android.support to androidX
Browse files Browse the repository at this point in the history
  • Loading branch information
jonghen.han authored and jonghen.han committed Dec 16, 2021
1 parent 11fa2e4 commit 2aab785
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 11 deletions.
4 changes: 0 additions & 4 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
android:versionCode="8"
android:versionName="1.4.2" >

<uses-sdk
android:minSdkVersion="16"
android:targetSdkVersion="25" />

<application>
<receiver android:name=".ScreenOnOffReceiver">
<intent-filter>
Expand Down
13 changes: 10 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
repositories {
jcenter()
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
Expand All @@ -10,15 +10,15 @@ buildscript {

allprojects {
repositories {
jcenter()
google()
mavenCentral()
}
}

apply plugin: 'com.android.library'

android {
compileSdkVersion 21
buildToolsVersion '27.0.3'

packagingOptions {
exclude 'LICENSE.txt'
Expand Down Expand Up @@ -53,6 +53,10 @@ android {
minifyEnabled false
}
}
defaultConfig {
minSdkVersion 16
targetSdkVersion 25
}
}

dependencies {
Expand All @@ -62,4 +66,7 @@ dependencies {
implementation 'com.android.support:mediarouter-v7:21.0.3'
implementation 'com.android.support:appcompat-v7:21.0.3'
implementation 'com.google.android.gms:play-services-cast:19.0.0'
implementation 'com.googlecode.plist:dd-plist:1.23'
implementation group: 'net.i2p.crypto', name: 'eddsa', version: '0.3.0'
implementation group: 'com.nimbusds', name: 'srp6a', version: '2.1.0'
}
7 changes: 7 additions & 0 deletions res/values/connect_sdk_strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<resources>
<string name="connect_sdk_picker_select_device">Select a device</string>
<string name="connect_sdk_pairing_simple_title_tv">Pairing request</string>
<string name="connect_sdk_pairing_simple_prompt_tv">Confirm pairing on the TV</string>
<string name="connect_sdk_pairing_pin_prompt_tv">Enter pairing code displayed on TV</string>
<string name="connect_sdk_connection_failed">Enter pairing code displayed on TV</string>
</resources>
20 changes: 20 additions & 0 deletions src/com/connectsdk/DefaultPlatform.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.connectsdk;

import java.util.HashMap;

public class DefaultPlatform {
public DefaultPlatform() {
}

public static HashMap<String, String> getDeviceServiceMap() {
HashMap<String, String> devicesList = new HashMap<String, String>();
devicesList.put("com.connectsdk.service.WebOSTVService", "com.connectsdk.discovery.provider.SSDPDiscoveryProvider");
devicesList.put("com.connectsdk.service.NetcastTVService", "com.connectsdk.discovery.provider.SSDPDiscoveryProvider");
devicesList.put("com.connectsdk.service.DLNAService", "com.connectsdk.discovery.provider.SSDPDiscoveryProvider");
devicesList.put("com.connectsdk.service.DIALService", "com.connectsdk.discovery.provider.SSDPDiscoveryProvider");
devicesList.put("com.connectsdk.service.RokuService", "com.connectsdk.discovery.provider.SSDPDiscoveryProvider");
devicesList.put("com.connectsdk.service.AirPlayService", "com.connectsdk.discovery.provider.ZeroconfDiscoveryProvider");
return devicesList;
}

}
2 changes: 1 addition & 1 deletion src/com/connectsdk/core/MediaInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

package com.connectsdk.core;

import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

import java.util.ArrayList;
import java.util.Collections;
Expand Down
2 changes: 1 addition & 1 deletion src/com/connectsdk/core/SubtitleInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*/
package com.connectsdk.core;

import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

/**
* Normalized reference object for information about a subtitle track. It's used in `MediaInfo` class.
Expand Down
2 changes: 1 addition & 1 deletion src/com/connectsdk/service/WebOSTVService.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import android.annotation.SuppressLint;
import android.graphics.PointF;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.util.Log;

import com.connectsdk.core.AppInfo;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

package com.connectsdk.service.sessions;

import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.util.Log;

import java.util.Enumeration;
Expand Down

0 comments on commit 2aab785

Please sign in to comment.