Skip to content

Commit 2de6f9f

Browse files
committed
Merge pull request #96 from coffeesherk/master
update gradle wrapper version
2 parents 91165cf + 1736f91 commit 2de6f9f

File tree

5 files changed

+19
-17
lines changed

5 files changed

+19
-17
lines changed

build.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

3+
task wrapper(type: Wrapper) {
4+
gradleVersion = '2.2.1'
5+
}
6+
37
buildscript {
48
repositories {
59
mavenCentral()
610
}
711
dependencies {
8-
classpath 'com.android.tools.build:gradle:0.12.+'
12+
classpath 'com.android.tools.build:gradle:1.1.2'
913
classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.10.+'
1014
}
1115
}

demo/build.gradle

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
apply plugin: 'android-sdk-manager'
2-
apply plugin: 'android'
2+
apply plugin: 'com.android.application'
33

44

55
android {
6-
compileSdkVersion 20
7-
buildToolsVersion "20"
6+
compileSdkVersion 22
7+
buildToolsVersion "22.0.1"
88

99
defaultConfig {
1010
minSdkVersion 8
11-
targetSdkVersion 20
11+
targetSdkVersion 22
1212
versionCode 2
1313
versionName "1.0.1"
1414
}
1515
buildTypes {
1616
release {
17-
runProguard false
1817
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
1918
}
2019
}
@@ -23,7 +22,7 @@ android {
2322
dependencies {
2423
compile fileTree(dir: 'libs', include: ['*.jar'])
2524
compile project(':library')
26-
compile 'com.android.support:appcompat-v7:20.+'
25+
compile 'com.android.support:appcompat-v7:22.+'
2726
compile 'com.nineoldandroids:library:2.4.0'
2827
compile 'com.daimajia.androidanimations:library:1.0.3@aar'
2928
}

gradle/wrapper/gradle-wrapper.jar

2.19 KB
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Jun 09 09:36:23 CST 2014
1+
#Sun May 03 23:34:25 CST 2015
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip

library/build.gradle

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
apply plugin: 'android-library'
1+
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 20
5-
buildToolsVersion "20"
4+
compileSdkVersion 22
5+
buildToolsVersion "22.0.1"
66

77
defaultConfig {
88
minSdkVersion 8
9-
targetSdkVersion 20
9+
targetSdkVersion 22
1010
versionCode 10
1111
versionName "1.0.9"
1212
}
1313
buildTypes {
1414
release {
15-
runProguard false
1615
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
1716
}
1817
}
@@ -23,9 +22,9 @@ android {
2322

2423
dependencies {
2524
compile fileTree(dir: 'libs', include: ['*.jar'])
26-
compile 'com.android.support:appcompat-v7:20.+'
27-
compile "com.android.support:support-v4:20.0.+"
25+
compile 'com.android.support:appcompat-v7:22.+'
26+
compile "com.android.support:support-v4:22.+"
2827
compile 'com.squareup.picasso:picasso:+'
2928
compile 'com.nineoldandroids:library:+'
3029
}
31-
apply from: './gradle-mvn-push.gradle'
30+
apply from: './gradle-mvn-push.gradle'

0 commit comments

Comments
 (0)