update gradle to 3.0.1,fresco to 1.8.1

imliujun · Mar 21, 2018 · 6a4a714 · 6a4a714
1 parent 26a1cb2
commit 6a4a714
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 15 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         applicationId "info.liujun.imageload"
@@ -27,6 +26,8 @@ dependencies {
     compile "com.facebook.fresco:fresco:${FRESCO_VERSION}"
     compile "com.facebook.fresco:imagepipeline-okhttp3:${FRESCO_VERSION}"
     compile "com.facebook.fresco:animated-gif:${FRESCO_VERSION}"
+    compile "com.facebook.fresco:animated-webp:${FRESCO_VERSION}"
+    compile "com.facebook.fresco:webpsupport:${FRESCO_VERSION}"
     compile project(':image')
     compile "me.relex:photodraweeview:1.1.2"
 }
diff --git a/app/src/main/java/info/liujun/imageload/MainActivity.java b/app/src/main/java/info/liujun/imageload/MainActivity.java
@@ -30,7 +30,7 @@ public void onClick(View v) {
         //        ".cn/images/upload/upc/tx/wallpaper/1212/06/c1/16396010_1354784049718.jpg";
         String imageUrl = "http://heixiucrm-test.img-cn-beijing.aliyuncs" +
                 ".com/20160623175055_gift_select_animation_1466675455807" +
-                ".gif@50w_50h_1l_1e_1an.gif";
+                ".gif@131w_131h_1l_1e_1an.gif";
         //String imageUrl = "http://heixiucrm-test.img-cn-beijing.aliyuncs.com/20160623175055_gift_select_animation_1466675455807.gif";
         String cacheKey = imageUrl;
         //最简单的加载方式，只需要传入URL和cacheKey就可以显示图片

diff --git a/build.gradle b/build.gradle
@@ -3,10 +3,11 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:${ANDROID_GRADLE_PLUGIN_VERSION}"
-        classpath "com.github.dcendents:android-maven-gradle-plugin:1.4.1"
+        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath "com.github.dcendents:android-maven-gradle-plugin:2.0"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -15,6 +16,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 
@@ -28,4 +30,4 @@ ext {
     compileSdkVersion = COMPILE_SDK_VERSION.toInteger()
     minSdkVersion = MIN_SDK_VERSION;
     targetSdkVersion = TARGET_SDK_VERSION;
-}
+}
diff --git a/gradle.properties b/gradle.properties
@@ -24,8 +24,8 @@ PROJ_GROUP=info.liujun
 #项目名称
 PROJ_NAME=FrescoCustomCacheKey
 #项目版本
-PROJ_VERSION=1.0.1
-PROJ_VERSION_CODE=2
+PROJ_VERSION=1.0.2
+PROJ_VERSION_CODE=3
 
 PROJ_WEBSITEURL=https://github.com/imliujun/FrescoCustomCacheKey
 PROJ_VCSURL=git@github.com:imliujun/FrescoCustomCacheKey.git
@@ -41,12 +41,12 @@ DEVELOPER_NAME=Liu Jun
 DEVELOPER_EMAIL=mail@liujun.info
 # Deps for gradle
 BUILD_TOOLS_VERSION=25.0.1
-COMPILE_SDK_VERSION=25
+COMPILE_SDK_VERSION=27
 ANDROID_GRADLE_PLUGIN_VERSION=2.2.3
 # SDK versions for the samples
 MIN_SDK_VERSION=14
-TARGET_SDK_VERSION=25
+TARGET_SDK_VERSION=27
 # Deps for libraries
-SUPPORT_LIB_VERSION=25.1.0
-FRESCO_VERSION=1.0.0
-JSR305_VERSION=3.0.0
+SUPPORT_LIB_VERSION=27.1.0
+FRESCO_VERSION=1.8.1
+JSR305_VERSION=3.0.0
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Aug 17 00:07:53 CST 2016
+#Wed Mar 21 11:31:36 CST 2018
 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.1-all.zip
diff --git a/image/build.gradle b/image/build.gradle
@@ -5,7 +5,6 @@ group = 'com.github.imliujun'
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
@@ -26,3 +25,27 @@ dependencies {
     provided "com.google.code.findbugs:jsr305:${JSR305_VERSION}"
     compile "com.android.support:support-annotations:${SUPPORT_LIB_VERSION}"
 }
+
+// build a jar with source files
+task sourcesJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier = 'sources'
+}
+
+task javadoc(type: Javadoc) {
+    failOnError false
+    source = android.sourceSets.main.java.sourceFiles
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+    classpath += configurations.compile
+}
+
+// build a jar with javadoc
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+artifacts {
+    archives sourcesJar
+    archives javadocJar
+}