remove androidx

GeekBugs · Apr 19, 2020 · eed5110 · eed5110
1 parent bdda4ae
commit eed5110
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 83 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Oct 31 14:06:03 CST 2019
+#Sun Apr 19 16:13:52 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/serialportlib/build.gradle b/serialportlib/build.gradle
@@ -10,7 +10,6 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
     }
 
@@ -31,9 +30,5 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
 apply from: '../jitpack.gradle'
diff --git a/serialportlib/src/androidTest/java/me/f1reking/serialportlib/ExampleInstrumentedTest.java b/serialportlib/src/androidTest/java/me/f1reking/serialportlib/ExampleInstrumentedTest.java
diff --git a/serialportlib/src/main/java/me/f1reking/serialportlib/SerialPortHelper.java b/serialportlib/src/main/java/me/f1reking/serialportlib/SerialPortHelper.java
@@ -19,7 +19,6 @@
 import android.os.HandlerThread;
 import android.os.Message;
 import android.util.Log;
-import androidx.annotation.NonNull;
 import me.f1reking.serialportlib.entity.BAUDRATE;
 import me.f1reking.serialportlib.entity.DATAB;
 import me.f1reking.serialportlib.entity.Device;
@@ -331,7 +330,7 @@ private void startSendThread() {
 
         mSendingHandler = new Handler(mSendingHandlerThread.getLooper()) {
             @Override
-            public void handleMessage(@NonNull Message msg) {
+            public void handleMessage(Message msg) {
                 byte[] sendBytes = (byte[]) msg.obj;
                 if (null != mFileOutputStream && null != sendBytes && sendBytes.length > 0) {
                     try {

diff --git a/serialportlib/src/test/java/me/f1reking/serialportlib/ExampleUnitTest.java b/serialportlib/src/test/java/me/f1reking/serialportlib/ExampleUnitTest.java