Migration to AndroidX

.gitignore

@@ -3,6 +3,7 @@
 /local.properties
 /.idea/workspace.xml
 /.idea/libraries
+/.idea/caches
 .DS_Store
 /build
 /captures

PhotoDraweeView.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="PhotoDraweeView" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="PhotoDraweeView" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
@@ -13,7 +13,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

README.md

@@ -11,10 +11,20 @@
 
 
 ## Gradle
+
+###### AndroidX
+```groovy
+dependencies {
+    implementation 'com.facebook.fresco:fresco:x.x.x' // (latest)
+    implementation 'me.relex:photodraweeview:2.0.0'
+}
+```
+
+###### Android Support Library
 ```groovy
 dependencies {
-    compile 'com.facebook.fresco:fresco:1.3.0'
-    compile 'me.relex:photodraweeview:1.1.3'
+    implementation 'com.facebook.fresco:fresco:x.x.x' // (latest)
+    implementation 'me.relex:photodraweeview:1.1.3'
 }
 ```
 

build.gradle

@@ -3,16 +3,18 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath 'com.android.tools.build:gradle:3.2.0'
+        //        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
+        //        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }

gradle.properties

@@ -15,4 +15,6 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

photodraweeview/build.gradle

@@ -1,15 +1,12 @@
 apply plugin: 'com.android.library'
 
-version = "1.1.3"
-def int version_code = 113
+version = "2.0.0"
+int version_code = 200
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
-
+    compileSdkVersion 28
     defaultConfig {
         minSdkVersion 14
-        //targetSdkVersion 23
         versionCode version_code
         versionName version
     }
@@ -22,9 +19,9 @@ android {
 }
 
 dependencies {
-    provided 'com.facebook.fresco:fresco:1.3.0'
-    provided 'com.android.support:support-annotations:25.3.1'
-    provided 'com.android.support:support-core-ui:25.3.1'
+    implementation 'androidx.annotation:annotation:1.0.0'
+    implementation 'androidx.core:core:1.0.0'
+    compileOnly 'com.facebook.fresco:fresco:1.10.0'
 }
 
 //apply from: "upload-jcenter.gradle"