Merge pull request flutter-webrtc#58 from aryzhov/androidx

cloudwebrtc · web-flow · commit afb6f2ca68c1 · 2019-02-03T13:19:53.000+08:00
Migrated to AndroidX using Refactoring from Andoid Studio
diff --git a/android/build.gradle b/android/build.gradle
@@ -26,7 +26,7 @@ android {
 
     defaultConfig {
         minSdkVersion 18
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     lintOptions {
@@ -41,5 +41,5 @@ android {
 
 dependencies {
     api 'org.webrtc:google-webrtc:1.0.26131'
-    implementation "com.android.support:support-annotations:22.0.0"
+    implementation "androidx.annotation:annotation:1.1.0-alpha01"
 }
diff --git a/android/src/main/java/com/cloudwebrtc/webrtc/GetUserMediaImpl.java b/android/src/main/java/com/cloudwebrtc/webrtc/GetUserMediaImpl.java
@@ -12,7 +12,7 @@
 import android.os.Looper;
 import android.os.ResultReceiver;
 import android.provider.MediaStore;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.content.Intent;
 import android.app.Activity;
diff --git a/android/src/main/java/com/cloudwebrtc/webrtc/PeerConnectionObserver.java b/android/src/main/java/com/cloudwebrtc/webrtc/PeerConnectionObserver.java
@@ -12,7 +12,7 @@
 import android.util.Base64;
 import android.util.Log;
 import android.util.SparseArray;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.cloudwebrtc.webrtc.utils.ConstraintsArray;
 import com.cloudwebrtc.webrtc.utils.ConstraintsMap;
diff --git a/android/src/main/java/com/cloudwebrtc/webrtc/record/MediaRecorderImpl.java b/android/src/main/java/com/cloudwebrtc/webrtc/record/MediaRecorderImpl.java
@@ -1,6 +1,6 @@
 package com.cloudwebrtc.webrtc.record;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import com.cloudwebrtc.webrtc.utils.EglUtils;
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -28,7 +28,7 @@ android {
         targetSdkVersion 27
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -56,6 +56,6 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    androidTestImplementation 'androidx.test:runner:1.1.2-alpha01'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.2-alpha01'
 }

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ android {`
`26`	`26`
`27`	`27`	`defaultConfig {`
`28`	`28`	`minSdkVersion 18`
`29`		`- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"`
	`29`	`+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`lintOptions {`
`@@ -41,5 +41,5 @@ android {`
`41`	`41`
`42`	`42`	`dependencies {`
`43`	`43`	`api 'org.webrtc:google-webrtc:1.0.26131'`
`44`		`- implementation "com.android.support:support-annotations:22.0.0"`
	`44`	`+ implementation "androidx.annotation:annotation:1.1.0-alpha01"`
`45`	`45`	`}`