Skip to content

Commit d0dcf4e

Browse files
朝傑 楊朝傑 楊
authored andcommitted
Merge branch 'release/1.0.2'
2 parents 2736fb9 + 8bf4602 commit d0dcf4e

5 files changed

Lines changed: 27 additions & 18 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ repositories {
1818
}
1919
dependencies {
2020
...
21-
compile 'com.github.NeoLSN:TaskQueue:1.0.1'
21+
compile 'com.github.NeoLSN:TaskQueue:1.0.2'
2222
}
2323
```
2424

app/build.gradle

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion "23.0.2"
4+
compileSdkVersion 25
5+
buildToolsVersion "25.0.2"
66

77
defaultConfig {
88
applicationId "io.jasonyang.taskqueue.example"
99
minSdkVersion 14
10-
targetSdkVersion 23
10+
targetSdkVersion 25
1111
versionCode 1
1212
versionName "1.0.0"
13+
vectorDrawables.useSupportLibrary = true
1314
}
1415
buildTypes {
1516
release {
@@ -27,11 +28,19 @@ dependencies {
2728
compile fileTree(dir: 'libs', include: ['*.jar'])
2829
compile project(':library')
2930

30-
compile 'com.android.support:appcompat-v7:23.3.0'
31-
compile 'com.android.support:design:23.3.0'
32-
compile 'com.android.support:cardview-v7:23.3.0'
33-
compile 'com.github.tianzhijiexian:CommonAdapter:1.1.8@aar'
34-
compile 'com.github.tianzhijiexian:CommonAdapter-Fake-DataBinding:1.0.1@aar'
31+
compile 'com.android.support:support-compat:25.1.0@aar'
32+
compile 'com.android.support:support-core-utils:25.1.0@aar'
33+
compile 'com.android.support:support-core-ui:25.1.0@aar'
34+
compile 'com.android.support:support-media-compat:25.1.0@aar'
35+
compile 'com.android.support:support-fragment:25.1.0@aar'
36+
37+
compile 'com.android.support:support-vector-drawable:25.1.0@aar'
38+
compile 'com.android.support:animated-vector-drawable:25.1.0@aar'
39+
40+
compile 'com.android.support:appcompat-v7:25.1.0@aar'
41+
compile 'com.android.support:design:25.1.0@aar'
42+
compile 'com.android.support:cardview-v7:25.1.0@aar'
43+
compile 'com.github.tianzhijiexian:CommonAdapter:1.1.9@aar'
3544

3645
testCompile 'junit:junit:4.12'
3746
}

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.1.0'
9-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
8+
classpath 'com.android.tools.build:gradle:2.3.0-beta2'
9+
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
1010

1111
// NOTE: Do not place your application dependencies here; they belong
1212
// in the individual module build.gradle files
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Dec 28 10:00:20 PST 2015
1+
#Wed Jan 18 12:50:40 CST 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

library/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ apply plugin: 'com.android.library'
22
apply plugin: 'com.github.dcendents.android-maven'
33

44
group = 'com.github.NeoLSN'
5-
version = '1.0.1'
5+
version = '1.0.2'
66

77
android {
8-
compileSdkVersion 23
9-
buildToolsVersion "23.0.2"
8+
compileSdkVersion 25
9+
buildToolsVersion '25.0.2'
1010

1111
defaultConfig {
1212
minSdkVersion 9
13-
targetSdkVersion 23
13+
targetSdkVersion 25
1414
versionCode 1
1515
versionName "1.0.0"
1616
}
@@ -25,5 +25,5 @@ android {
2525
dependencies {
2626
compile fileTree(dir: 'libs', include: ['*.jar'])
2727
testCompile 'junit:junit:4.12'
28-
compile 'com.android.support:support-annotations:23.3.0'
28+
compile 'com.android.support:support-annotations:25.1.0'
2929
}

0 commit comments

Comments
 (0)