From 1a97b12db9274db37d8e67ae5461913f874a0091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B2=9D=E6=96=AF=E9=84=A7=E4=B8=8D=E5=88=A9=E5=A4=9A?= Date: Wed, 18 Dec 2019 15:45:25 +0800 Subject: [PATCH] Add support androidX --- android/build.gradle | 4 +++- .../main/java/com/projectseptember/RNGL/GLCanvasManager.java | 2 +- android/src/main/java/com/projectseptember/RNGL/GLImage.java | 2 +- example/android/gradle.properties | 2 ++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 639d075..f87e9ed 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 2aeec37..6cc0f84 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 6564b41..7434278 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 1fd964e..e77af9f 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 -- 2.26.2