- 编译3.3.2通过

- jdk 1.8
- 编译apk

Author: dujinyang

Diff for: build.gradle

@@ -2,13 +2,19 @@
 
 buildscript {
     repositories {
-        jcenter()
-        mavenCentral()
+       // maven{url 'http://maven.aliyun.com/nexus/content/groups/public/'}
+
+      jcenter()
+       mavenCentral()
+       // maven{url 'http://maven.aliyun.com/nexus/content/groups/public/'}
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
-        classpath 'me.tatarka:gradle-retrolambda:3.2.5'
-        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.5.0'
+        classpath 'com.android.tools.build:gradle:3.3.2'
+        // classpath 'com.android.tools.build:gradle:2.1.3'
+       classpath 'me.tatarka:gradle-retrolambda:3.2.5'
+        //classpath 'me.tatarka:gradle-retrolambda:3.7'
+        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
     }
@@ -18,12 +24,19 @@ buildscript {
     configurations.classpath.exclude group: 'com.android.tools.external.lombok'
 }
 
+
+
 allprojects {
     repositories {
+        google()
+      //  maven{url 'http://maven.aliyun.com/nexus/content/groups/public/'}
         jcenter()
     }
 }
 
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
+
+/*
+android.enableD8 = true*/

Diff for: gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#AT
+#Tue Mar 26 14:11:59 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

Diff for: library/build.gradle

@@ -1,57 +1,61 @@
 apply plugin: 'com.android.library'
-apply plugin: 'me.tatarka.retrolambda'
+//apply plugin: 'me.tatarka.retrolambda'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: "com.jfrog.bintray"
 
 version = "1.1.3"
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     // compileSdkVersion 24
     // buildToolsVersion '24'
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 26
         //  targetSdkVersion 24
         versionCode 3
         versionName version
 
         vectorDrawables.useSupportLibrary = true
-    }
+    }/*
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
-    }
+    }*/
     lintOptions {
         abortOnError false
         checkReleaseBuilds false
 
     }
     resourcePrefix "gallery_"
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
-
+/*Configuration 'provided' is obsolete and has been replaced with 'compileOnly'.*/
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
-    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
-    compile 'io.reactivex.rxjava2:rxjava:2.1.0'
-    compile 'com.yalantis:ucrop:2.2.0'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile "com.android.support:exifinterface:25.3.1"
-    /* compile 'com.android.support:recyclerview-v7:24.2.0'
-    compile 'com.android.support:appcompat-v7:24.2.0'
-    compile "com.android.support:exifinterface:25.1.0"*/
-    provided 'com.squareup.picasso:picasso:2.5.2'
-    provided 'com.facebook.fresco:fresco:1.3.0'
-    provided 'com.facebook.fresco:animated-gif:1.3.0'
-    provided 'com.github.bumptech.glide:glide:3.7.0'
-    provided 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation 'junit:junit:4.12'
+    api 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    api 'io.reactivex.rxjava2:rxjava:2.1.0'
+    api 'com.yalantis:ucrop:2.2.0'
+    api 'com.android.support:recyclerview-v7:28.0.0'
+    api 'com.android.support:appcompat-v7:28.0.0'
+    api 'com.android.support:exifinterface:28.0.0'
+    /* implementation 'com.android.support:recyclerview-v7:24.2.0'
+            implementation 'com.android.support:appcompat-v7:24.2.0'
+            implementation "com.android.support:exifinterface:25.1.0"*/
+    api 'com.squareup.picasso:picasso:2.5.2'
+    api 'com.facebook.fresco:fresco:1.3.0'
+    api 'com.facebook.fresco:animated-gif:1.3.0'
+    api 'com.github.bumptech.glide:glide:3.7.0'
+    api 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
 }
 
 //===================================upload jcenter=================================================

Diff for: sample/build.gradle

@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.getkeepsafe.dexcount'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion '25.0.3'
-    //  buildToolsVersion '24'
+    compileSdkVersion 28
+    //buildToolsVersion '25.0.3'
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "cn.finalteam.rxgalleryfinal.sample"
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 26
         //  targetSdkVersion 24
         versionCode 1
         versionName "1.0"
@@ -29,18 +29,24 @@ android {
     lintOptions {
         abortOnError false
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
-
+/*compile 改成implementation
+androidTestCompile改成androidTestImplementation
+testCompile 改成testImplementation*/
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
-    compile 'com.squareup.picasso:picasso:2.5.2'
-    compile 'com.facebook.fresco:fresco:1.3.0'
-    compile 'com.facebook.fresco:animated-gif:1.3.0'
-    compile 'com.github.bumptech.glide:glide:3.7.0'
-    compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
-    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.1'
-    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
-    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
-    compile project(':library')
-}
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation 'junit:junit:4.12'
+    implementation 'com.squareup.picasso:picasso:2.5.2'
+    implementation 'com.facebook.fresco:fresco:1.3.0'
+    implementation 'com.facebook.fresco:animated-gif:1.3.0'
+    implementation 'com.github.bumptech.glide:glide:3.7.0'
+    implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.1'
+    releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
+    testImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
+    implementation project(':library')
+}

Diff for: sample/proguard-rules.pro

@@ -100,3 +100,15 @@
 
 #9.picasso
 -dontwarn com.squareup.okhttp.**
+-keep class com.squareup.okhttp.**{*;}
+# okhttp
+-keep class okhttp3.** { *; }
+-keep interface okhttp3.** { *; }
+-dontwarn okhttp3.**
+
+# okio
+-keep class sun.misc.Unsafe { *; }
+-dontwarn java.nio.file.*
+-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+-keep class okio.**{*;}
+-dontwarn okio.**

Diff for: settings.gradle

@@ -1,2 +1,3 @@
-include ':library', ':sample'
+include ':library'
+include ':sample'