diff --git a/android/build.gradle b/android/build.gradle index 639d0753ef5c505600862981f1a0919f19a97f83..f87e9ed3bcf1d69885b98b8128e69b3e23bc3023 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -30,5 +30,7 @@ repositories { } dependencies { - compile "com.facebook.react:react-native:+" // From node_modules + implementation "com.facebook.react:react-native:+" // From node_modules + implementation 'androidx.appcompat:appcompat:1.1.0-rc01' + implementation 'androidx.annotation:annotation:1.0.2' } diff --git a/android/src/main/java/com/projectseptember/RNGL/GLCanvasManager.java b/android/src/main/java/com/projectseptember/RNGL/GLCanvasManager.java index 2aeec3751124b8cca37bd7ae220cc80cc4d3aa08..6cc0f84f4389840c1c9556abc8dc799d9efab6f1 100644 --- a/android/src/main/java/com/projectseptember/RNGL/GLCanvasManager.java +++ b/android/src/main/java/com/projectseptember/RNGL/GLCanvasManager.java @@ -1,6 +1,6 @@ package com.projectseptember.RNGL; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.facebook.imagepipeline.core.DefaultExecutorSupplier; import com.facebook.imagepipeline.core.ExecutorSupplier; diff --git a/android/src/main/java/com/projectseptember/RNGL/GLImage.java b/android/src/main/java/com/projectseptember/RNGL/GLImage.java index 6564b417ab9ee2bfc939ff0987f0fc9fef70a6fe..74342783e5e1b01599a05966e79f60cc5fea5406 100644 --- a/android/src/main/java/com/projectseptember/RNGL/GLImage.java +++ b/android/src/main/java/com/projectseptember/RNGL/GLImage.java @@ -4,7 +4,7 @@ import android.content.Context; import android.graphics.Bitmap; import android.graphics.Matrix; import android.net.Uri; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import com.facebook.common.references.CloseableReference; diff --git a/example/android/gradle.properties b/example/android/gradle.properties index 1fd964e90b1c5ec50e26364318e2c872a9dd6154..e77af9f29cf3bd23670f3fb941e0f14db2397a47 100644 --- a/example/android/gradle.properties +++ b/example/android/gradle.properties @@ -18,3 +18,5 @@ # org.gradle.parallel=true android.useDeprecatedNdk=true +android.useAndroidX=true +android.enableJetifier=true \ No newline at end of file