Merge branch 'release/1.0.2'

NeoLSN · Jan 18, 2017 · d0dcf4e · d0dcf4e
2 parents 2736fb9 + 8bf4602
commit d0dcf4e
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ repositories {
 }
 dependencies {
     ...
-    compile 'com.github.NeoLSN:TaskQueue:1.0.1'
+    compile 'com.github.NeoLSN:TaskQueue:1.0.2'
 }
 ```
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,15 +1,16 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         applicationId "io.jasonyang.taskqueue.example"
         minSdkVersion 14
-        targetSdkVersion 23
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0.0"
+        vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
         release {
@@ -27,11 +28,19 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':library')
 
-    compile 'com.android.support:appcompat-v7:23.3.0'
-    compile 'com.android.support:design:23.3.0'
-    compile 'com.android.support:cardview-v7:23.3.0'
-    compile 'com.github.tianzhijiexian:CommonAdapter:1.1.8@aar'
-    compile 'com.github.tianzhijiexian:CommonAdapter-Fake-DataBinding:1.0.1@aar'
+    compile 'com.android.support:support-compat:25.1.0@aar'
+    compile 'com.android.support:support-core-utils:25.1.0@aar'
+    compile 'com.android.support:support-core-ui:25.1.0@aar'
+    compile 'com.android.support:support-media-compat:25.1.0@aar'
+    compile 'com.android.support:support-fragment:25.1.0@aar'
+
+    compile 'com.android.support:support-vector-drawable:25.1.0@aar'
+    compile 'com.android.support:animated-vector-drawable:25.1.0@aar'
+
+    compile 'com.android.support:appcompat-v7:25.1.0@aar'
+    compile 'com.android.support:design:25.1.0@aar'
+    compile 'com.android.support:cardview-v7:25.1.0@aar'
+    compile 'com.github.tianzhijiexian:CommonAdapter:1.1.9@aar'
 
     testCompile 'junit:junit:4.12'
 }
diff --git a/build.gradle b/build.gradle
@@ -5,8 +5,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+        classpath 'com.android.tools.build:gradle:2.3.0-beta2'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Wed Jan 18 12:50:40 CST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -2,15 +2,15 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
 group = 'com.github.NeoLSN'
-version = '1.0.1'
+version = '1.0.2'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 25
+    buildToolsVersion '25.0.2'
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0.0"
     }
@@ -25,5 +25,5 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:support-annotations:23.3.0'
+    compile 'com.android.support:support-annotations:25.1.0'
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ repositories { @@
     }
     dependencies {
         ...
-        compile 'com.github.NeoLSN:TaskQueue:1.0.1'
+        compile 'com.github.NeoLSN:TaskQueue:1.0.2'
     }
     ```
@@ Expand Down @@