Update conflicting files

Update conflicting files with Connect-SDK-Android and Connect-SDK-Android-Lite
ConnectSDK · Jan 26, 2022 · df891bc · df891bc
1 parent 520e72d
commit df891bc
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 22 deletions.
diff --git 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
diff --git a/test/src/com/connectsdk/discovery/provider/SSDPDiscoveryProviderTest.java b/test/src/com/connectsdk/discovery/provider/SSDPDiscoveryProviderTest.java
diff --git 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)
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,7 +59,7 @@ android { @@
             minSdkVersion 24
             targetSdkVersion 31
         }
         useLibrary 'org.apache.http.legacy'
     }
@@ Expand Down @@