From df891bc08563da6128fcd0e37d466764dfcb91af Mon Sep 17 00:00:00 2001
From: "jonghen.han" <jonghen.han@jonghenhanui-MacBookAir.local>
Date: Tue, 25 Jan 2022 16:47:03 +0900
Subject: [PATCH] Update conflicting files

Update conflicting files with Connect-SDK-Android and Connect-SDK-Android-Lite
---
 build.gradle                                  |  2 +-
 src/com/connectsdk/DefaultPlatform.java       | 20 -------------------
 .../provider/SSDPDiscoveryProviderTest.java   |  0
 .../sessions/WebOSWebAppSessionTest.java      |  2 +-
 4 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 src/com/connectsdk/DefaultPlatform.java
 mode change 100755 => 100644 test/src/com/connectsdk/discovery/provider/SSDPDiscoveryProviderTest.java

diff --git a/build.gradle b/build.gradle
index 90ad279f..acdc0c56 100644
--- a/build.gradle
+++ b/build.gradle
@@ -59,7 +59,7 @@ android {
         minSdkVersion 24
         targetSdkVersion 31
     }
-
+   
     useLibrary 'org.apache.http.legacy'
 }
 
diff --git a/src/com/connectsdk/DefaultPlatform.java b/src/com/connectsdk/DefaultPlatform.java
deleted file mode 100644
index 7f16d4fd..00000000
--- a/src/com/connectsdk/DefaultPlatform.java
+++ /dev/null
@@ -1,20 +0,0 @@
-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;
-    }
-
-}
diff --git a/test/src/com/connectsdk/discovery/provider/SSDPDiscoveryProviderTest.java b/test/src/com/connectsdk/discovery/provider/SSDPDiscoveryProviderTest.java
old mode 100755
new mode 100644
diff --git a/test/src/com/connectsdk/service/sessions/WebOSWebAppSessionTest.java b/test/src/com/connectsdk/service/sessions/WebOSWebAppSessionTest.java
index 87e5046b..3bc53460 100644
--- a/test/src/com/connectsdk/service/sessions/WebOSWebAppSessionTest.java
+++ b/test/src/com/connectsdk/service/sessions/WebOSWebAppSessionTest.java
@@ -45,7 +45,7 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest=Config.NONE)