Merge pull request #64 from friederbluemle/androidx

electrode-io · Jan 7, 2023 · 98eb6ca · 98eb6ca
2 parents aeee2f1 + 178f809
commit 98eb6ca
Show file tree

Hide file tree

Showing 51 changed files with 117 additions and 102 deletions.
diff --git a/android/electrode-reactnative-bridge/build.gradle b/android/electrode-reactnative-bridge/build.gradle
@@ -27,7 +27,7 @@ android {
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }
-        testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -43,9 +43,10 @@ android {
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'com.facebook.react:react-native:+'
     androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
diff --git a/...src/androidTest/java/com/walmartlabs/electrode/reactnative/bridge/BaseBridgeTestCase.java b/...src/androidTest/java/com/walmartlabs/electrode/reactnative/bridge/BaseBridgeTestCase.java
@@ -19,9 +19,10 @@
 import android.app.Instrumentation;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.test.InstrumentationRegistry;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.Arguments;

diff --git a/.../src/androidTest/java/com/walmartlabs/electrode/reactnative/bridge/BridgeHolderTests.java b/.../src/androidTest/java/com/walmartlabs/electrode/reactnative/bridge/BridgeHolderTests.java
@@ -1,7 +1,7 @@
 package com.walmartlabs.electrode.reactnative.bridge;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.walmartlabs.electrode.reactnative.bridge.helpers.Logger;
 

diff --git a/...est/java/com/walmartlabs/electrode/reactnative/bridge/ElectrodeBridgeTransceiverTest.java b/...est/java/com/walmartlabs/electrode/reactnative/bridge/ElectrodeBridgeTransceiverTest.java
@@ -17,8 +17,9 @@
 package com.walmartlabs.electrode.reactnative.bridge;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;

diff --git a/...src/androidTest/java/com/walmartlabs/electrode/reactnative/bridge/EventProcessorTest.java b/...src/androidTest/java/com/walmartlabs/electrode/reactnative/bridge/EventProcessorTest.java
@@ -16,7 +16,7 @@
 
 package com.walmartlabs.electrode.reactnative.bridge;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.walmartlabs.electrode.reactnative.sample.api.PersonApi;
 import com.walmartlabs.electrode.reactnative.sample.model.Person;

diff --git a/...src/androidTest/java/com/walmartlabs/electrode/reactnative/bridge/RequestHandleTests.java b/...src/androidTest/java/com/walmartlabs/electrode/reactnative/bridge/RequestHandleTests.java
@@ -1,7 +1,7 @@
 package com.walmartlabs.electrode.reactnative.bridge;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.walmartlabs.electrode.reactnative.sample.api.PersonApi;
 
@@ -166,7 +166,7 @@ public void onSuccess(@Nullable Integer responseData) {
 
             @Override
             public void onFailure(@NonNull FailureMessage failureMessage) {
-               fail();
+                fail();
             }
         });
 

diff --git a/...c/androidTest/java/com/walmartlabs/electrode/reactnative/bridge/RequestProcessorTest.java b/...c/androidTest/java/com/walmartlabs/electrode/reactnative/bridge/RequestProcessorTest.java
@@ -17,8 +17,9 @@
 package com.walmartlabs.electrode.reactnative.bridge;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReadableArray;

diff --git a/...idge/src/androidTest/java/com/walmartlabs/electrode/reactnative/sample/api/PersonApi.java b/...idge/src/androidTest/java/com/walmartlabs/electrode/reactnative/sample/api/PersonApi.java
@@ -16,7 +16,7 @@
 
 package com.walmartlabs.electrode.reactnative.sample.api;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.walmartlabs.electrode.reactnative.bridge.ElectrodeBridgeEventListener;
 import com.walmartlabs.electrode.reactnative.bridge.ElectrodeBridgeRequestHandler;

diff --git a/...e/src/androidTest/java/com/walmartlabs/electrode/reactnative/sample/api/PersonEvents.java b/...e/src/androidTest/java/com/walmartlabs/electrode/reactnative/sample/api/PersonEvents.java
@@ -16,7 +16,7 @@
 
 package com.walmartlabs.electrode.reactnative.sample.api;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.walmartlabs.electrode.reactnative.bridge.ElectrodeBridgeEventListener;
 import com.walmartlabs.electrode.reactnative.bridge.EventListenerProcessor;

diff --git a/...src/androidTest/java/com/walmartlabs/electrode/reactnative/sample/api/PersonRequests.java b/...src/androidTest/java/com/walmartlabs/electrode/reactnative/sample/api/PersonRequests.java
@@ -16,7 +16,7 @@
 
 package com.walmartlabs.electrode.reactnative.sample.api;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.walmartlabs.electrode.reactnative.bridge.ElectrodeBridgeRequestHandler;
 import com.walmartlabs.electrode.reactnative.bridge.ElectrodeBridgeResponseListener;

diff --git a/...idTest/java/com/walmartlabs/electrode/reactnative/sample/api/UpdatePersonRequestData.java b/...idTest/java/com/walmartlabs/electrode/reactnative/sample/api/UpdatePersonRequestData.java
@@ -17,8 +17,9 @@
 package com.walmartlabs.electrode.reactnative.sample.api;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.walmartlabs.electrode.reactnative.bridge.Bridgeable;
 import com.walmartlabs.electrode.reactnative.sample.model.Status;

diff --git a/...idge/src/androidTest/java/com/walmartlabs/electrode/reactnative/sample/model/Address.java b/...idge/src/androidTest/java/com/walmartlabs/electrode/reactnative/sample/model/Address.java
@@ -19,8 +19,9 @@
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.walmartlabs.electrode.reactnative.bridge.Bridgeable;
 

diff --git a/...ge/src/androidTest/java/com/walmartlabs/electrode/reactnative/sample/model/BirthYear.java b/...ge/src/androidTest/java/com/walmartlabs/electrode/reactnative/sample/model/BirthYear.java
@@ -19,8 +19,8 @@
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
 
 import com.walmartlabs.electrode.reactnative.bridge.Bridgeable;
 

diff --git a/...ridge/src/androidTest/java/com/walmartlabs/electrode/reactnative/sample/model/Person.java b/...ridge/src/androidTest/java/com/walmartlabs/electrode/reactnative/sample/model/Person.java
@@ -19,8 +19,9 @@
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.walmartlabs.electrode.reactnative.bridge.Bridgeable;
 

diff --git a/...dge/src/androidTest/java/com/walmartlabs/electrode/reactnative/sample/model/Position.java b/...dge/src/androidTest/java/com/walmartlabs/electrode/reactnative/sample/model/Position.java
@@ -19,12 +19,11 @@
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
-import com.walmartlabs.electrode.reactnative.bridge.Bridgeable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
-import static com.walmartlabs.electrode.reactnative.bridge.util.BridgeArguments.getNumberValue;
+import com.walmartlabs.electrode.reactnative.bridge.Bridgeable;
 
 public class Position implements Parcelable, Bridgeable {
 
@@ -88,7 +87,7 @@ public void writeToParcel(Parcel dest, int flags) {
     public Bundle toBundle() {
         Bundle bundle = new Bundle();
         bundle.putDouble("lat", lat);
-        if(lng != null) {
+        if (lng != null) {
             bundle.putDouble("lng", lng);
         }
         return bundle;

diff --git a/...ridge/src/androidTest/java/com/walmartlabs/electrode/reactnative/sample/model/Status.java b/...ridge/src/androidTest/java/com/walmartlabs/electrode/reactnative/sample/model/Status.java
@@ -19,12 +19,11 @@
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
-import com.walmartlabs.electrode.reactnative.bridge.Bridgeable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
-import static com.walmartlabs.electrode.reactnative.bridge.util.BridgeArguments.getNumberValue;
+import com.walmartlabs.electrode.reactnative.bridge.Bridgeable;
 
 public class Status implements Parcelable, Bridgeable {
 
@@ -97,7 +96,7 @@ public void writeToParcel(Parcel dest, int flags) {
     @NonNull
     public Bundle toBundle() {
         Bundle bundle = new Bundle();
-        if(log != null) {
+        if (log != null) {
             bundle.putBoolean("log", log);
         }
         bundle.putBoolean("member", member);

diff --git a/...idge/src/main/java/com/walmartlabs/electrode/reactnative/bridge/BridgeFailureMessage.java b/...idge/src/main/java/com/walmartlabs/electrode/reactnative/bridge/BridgeFailureMessage.java
@@ -16,8 +16,8 @@
 
 package com.walmartlabs.electrode.reactnative.bridge;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 public class BridgeFailureMessage implements FailureMessage {
 

diff --git a/...tive-bridge/src/main/java/com/walmartlabs/electrode/reactnative/bridge/BridgeMessage.java b/...tive-bridge/src/main/java/com/walmartlabs/electrode/reactnative/bridge/BridgeMessage.java
@@ -17,8 +17,9 @@
 package com.walmartlabs.electrode.reactnative.bridge;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReadableMap;

diff --git a/...-bridge/src/main/java/com/walmartlabs/electrode/reactnative/bridge/BridgeTransaction.java b/...-bridge/src/main/java/com/walmartlabs/electrode/reactnative/bridge/BridgeTransaction.java
@@ -16,8 +16,8 @@
 
 package com.walmartlabs.electrode.reactnative.bridge;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 public class BridgeTransaction {
 

diff --git a/...tnative-bridge/src/main/java/com/walmartlabs/electrode/reactnative/bridge/Bridgeable.java b/...tnative-bridge/src/main/java/com/walmartlabs/electrode/reactnative/bridge/Bridgeable.java
@@ -17,7 +17,8 @@
 package com.walmartlabs.electrode.reactnative.bridge;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 /**
  * Indicates that any class that implements this interface can be sent across the ElectrodeNativeBridge.

diff --git a/...-bridge/src/main/java/com/walmartlabs/electrode/reactnative/bridge/ConstantsProvider.java b/...-bridge/src/main/java/com/walmartlabs/electrode/reactnative/bridge/ConstantsProvider.java
@@ -16,7 +16,7 @@
 
 package com.walmartlabs.electrode.reactnative.bridge;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.util.Map;
 

diff --git a/...idge/src/main/java/com/walmartlabs/electrode/reactnative/bridge/ElectrodeBridgeEvent.java b/...idge/src/main/java/com/walmartlabs/electrode/reactnative/bridge/ElectrodeBridgeEvent.java
@@ -17,8 +17,9 @@
 package com.walmartlabs.electrode.reactnative.bridge;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.facebook.react.bridge.ReadableMap;
 import com.walmartlabs.electrode.reactnative.bridge.helpers.Logger;

diff --git a/.../main/java/com/walmartlabs/electrode/reactnative/bridge/ElectrodeBridgeEventListener.java b/.../main/java/com/walmartlabs/electrode/reactnative/bridge/ElectrodeBridgeEventListener.java
@@ -16,7 +16,7 @@
 
 package com.walmartlabs.electrode.reactnative.bridge;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * Provide method to be notified of incoming event

diff --git a/...dge/src/main/java/com/walmartlabs/electrode/reactnative/bridge/ElectrodeBridgeHolder.java b/...dge/src/main/java/com/walmartlabs/electrode/reactnative/bridge/ElectrodeBridgeHolder.java
@@ -16,8 +16,8 @@
 
 package com.walmartlabs.electrode.reactnative.bridge;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.walmartlabs.electrode.reactnative.bridge.helpers.Logger;
 

diff --git a/...ge/src/main/java/com/walmartlabs/electrode/reactnative/bridge/ElectrodeBridgeRequest.java b/...ge/src/main/java/com/walmartlabs/electrode/reactnative/bridge/ElectrodeBridgeRequest.java
@@ -16,8 +16,8 @@
 
 package com.walmartlabs.electrode.reactnative.bridge;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.facebook.react.bridge.ReadableMap;
 import com.walmartlabs.electrode.reactnative.bridge.helpers.Logger;

diff --git a/...main/java/com/walmartlabs/electrode/reactnative/bridge/ElectrodeBridgeRequestHandler.java b/...main/java/com/walmartlabs/electrode/reactnative/bridge/ElectrodeBridgeRequestHandler.java
@@ -16,8 +16,8 @@
 
 package com.walmartlabs.electrode.reactnative.bridge;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 /**
  * Provide method to be notified of incoming request.

diff --git a/...e/src/main/java/com/walmartlabs/electrode/reactnative/bridge/ElectrodeBridgeResponse.java b/...e/src/main/java/com/walmartlabs/electrode/reactnative/bridge/ElectrodeBridgeResponse.java
@@ -17,8 +17,9 @@
 package com.walmartlabs.electrode.reactnative.bridge;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReadableMap;

diff --git a/...in/java/com/walmartlabs/electrode/reactnative/bridge/ElectrodeBridgeResponseListener.java b/...in/java/com/walmartlabs/electrode/reactnative/bridge/ElectrodeBridgeResponseListener.java
@@ -16,8 +16,8 @@
 
 package com.walmartlabs.electrode.reactnative.bridge;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 /**
  * Provide methods to report response for a request.

diff --git a/...rc/main/java/com/walmartlabs/electrode/reactnative/bridge/ElectrodeBridgeTransceiver.java b/...rc/main/java/com/walmartlabs/electrode/reactnative/bridge/ElectrodeBridgeTransceiver.java
@@ -18,9 +18,10 @@
 
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;

diff --git a/...dge/src/main/java/com/walmartlabs/electrode/reactnative/bridge/ElectrodeNativeBridge.java b/...dge/src/main/java/com/walmartlabs/electrode/reactnative/bridge/ElectrodeNativeBridge.java
@@ -16,8 +16,8 @@
 
 package com.walmartlabs.electrode.reactnative.bridge;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.UUID;
 

diff --git a/...idge/src/main/java/com/walmartlabs/electrode/reactnative/bridge/ElectrodeReactBridge.java b/...idge/src/main/java/com/walmartlabs/electrode/reactnative/bridge/ElectrodeReactBridge.java
@@ -16,7 +16,7 @@
 
 package com.walmartlabs.electrode.reactnative.bridge;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.facebook.react.bridge.ReadableMap;
 

diff --git a/...ve-bridge/src/main/java/com/walmartlabs/electrode/reactnative/bridge/EventDispatcher.java b/...ve-bridge/src/main/java/com/walmartlabs/electrode/reactnative/bridge/EventDispatcher.java
@@ -16,7 +16,7 @@
 
 package com.walmartlabs.electrode.reactnative.bridge;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 public interface EventDispatcher {
     void dispatchEvent(@NonNull ElectrodeBridgeEvent event);