From 2b500c8926d9f8b83658376a84ecbbe0b3f3589b Mon Sep 17 00:00:00 2001 From: Anurag Date: Fri, 22 Nov 2019 16:26:18 +0530 Subject: [PATCH 1/2] Move to androidx --- android/build.gradle | 4 ++-- android/gradle.properties | 2 ++ android/src/main/java/io/amarcruz/photoview/ImageEvent.java | 2 +- android/src/main/java/io/amarcruz/photoview/PhotoView.java | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 android/gradle.properties diff --git a/android/build.gradle b/android/build.gradle index 14a1eb4..bd73758 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -56,8 +56,8 @@ repositories { } dependencies { - compileOnly 'com.facebook.react:react-native:+' - implementation 'me.relex:photodraweeview:1.1.3' + implementation('com.facebook.react:react-native:+') + implementation 'me.relex:photodraweeview:2.0.0' } task customClean(type: Delete) { diff --git a/android/gradle.properties b/android/gradle.properties new file mode 100644 index 0000000..bfc5365 --- /dev/null +++ b/android/gradle.properties @@ -0,0 +1,2 @@ +android.enableJetifier=false +android.useAndroidX=true \ No newline at end of file diff --git a/android/src/main/java/io/amarcruz/photoview/ImageEvent.java b/android/src/main/java/io/amarcruz/photoview/ImageEvent.java index ddc10e3..644659c 100644 --- a/android/src/main/java/io/amarcruz/photoview/ImageEvent.java +++ b/android/src/main/java/io/amarcruz/photoview/ImageEvent.java @@ -1,6 +1,6 @@ package io.amarcruz.photoview; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import com.facebook.react.bridge.WritableMap; import com.facebook.react.uimanager.events.Event; import com.facebook.react.uimanager.events.RCTEventEmitter; diff --git a/android/src/main/java/io/amarcruz/photoview/PhotoView.java b/android/src/main/java/io/amarcruz/photoview/PhotoView.java index d437e89..b2ac647 100644 --- a/android/src/main/java/io/amarcruz/photoview/PhotoView.java +++ b/android/src/main/java/io/amarcruz/photoview/PhotoView.java @@ -4,7 +4,7 @@ import android.graphics.drawable.Animatable; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.facebook.drawee.backends.pipeline.PipelineDraweeControllerBuilder; import com.facebook.drawee.controller.BaseControllerListener; From dc548a7a1ab02cd3e04823e8d475b06d36e5f751 Mon Sep 17 00:00:00 2001 From: Anurag Chutani Date: Mon, 9 Dec 2019 14:57:42 +0530 Subject: [PATCH 2/2] Update build.gradle Fix implementation --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index bd73758..1101ca5 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -56,7 +56,7 @@ repositories { } dependencies { - implementation('com.facebook.react:react-native:+') + implementation 'com.facebook.react:react-native:+' implementation 'me.relex:photodraweeview:2.0.0' }