Skip to content

Commit a0e25bc

Browse files
Updated gradle to 2.4 and gradle plugin 1.2.2. Updated to support libraries v 22.1.1
1 parent 6820fdb commit a0e25bc

File tree

10 files changed

+21
-29
lines changed

10 files changed

+21
-29
lines changed

build.gradle

+3-4
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@ buildscript {
55
}
66

77
dependencies {
8-
classpath 'com.android.tools.build:gradle:1.0.0'
9-
classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
8+
classpath 'com.android.tools.build:gradle:1.2.0'
109
}
1110
}
1211

1312
ext {
14-
compileSdkVersion = 21
15-
buildToolsVersion = "21.1.2"
13+
compileSdkVersion = 22
14+
buildToolsVersion = "22.0.1"
1615
}
1716

1817
def isReleaseBuild() {

demo/extras/build.gradle

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
apply plugin: 'android-sdk-manager'
21
apply plugin: 'com.android.application'
32

43
repositories {
@@ -13,7 +12,7 @@ android {
1312

1413
defaultConfig {
1514
minSdkVersion 14
16-
targetSdkVersion 21
15+
targetSdkVersion 22
1716
versionName project.VERSION_NAME
1817
versionCode Integer.parseInt(project.VERSION_CODE)
1918
}
@@ -50,8 +49,8 @@ dependencies {
5049
compile project(':extra:extra-dragdrop')
5150

5251
// Support Libraries
53-
compile 'com.android.support:support-v4:21.0.3'
54-
compile 'com.android.support:appcompat-v7:21.0.3'
52+
compile 'com.android.support:support-v4:22.1.1'
53+
compile 'com.android.support:appcompat-v7:22.1.1'
5554

5655
//OkHttp
5756
//temporary patch for android-L for Okio packaging problem (see https://gist.github.com/JakeWharton/017738659d4f38adedc2)

extra/extra-dragdrop/build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
apply plugin: 'android-sdk-manager'
21
apply plugin: 'com.android.library'
32

43
repositories {
@@ -11,7 +10,7 @@ android {
1110

1211
defaultConfig {
1312
minSdkVersion 14
14-
targetSdkVersion 21
13+
targetSdkVersion 22
1514
versionName project.VERSION_NAME
1615
versionCode Integer.parseInt(project.VERSION_CODE)
1716
}

extra/extra-staggeredgrid/build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
apply plugin: 'android-sdk-manager'
21
apply plugin: 'com.android.library'
32

43
repositories {
@@ -11,7 +10,7 @@ android {
1110

1211
defaultConfig {
1312
minSdkVersion 14
14-
targetSdkVersion 21
13+
targetSdkVersion 22
1514
versionName project.VERSION_NAME
1615
versionCode Integer.parseInt(project.VERSION_CODE)
1716
}

extra/extra-twoway/build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
apply plugin: 'android-sdk-manager'
21
apply plugin: 'com.android.library'
32

43
repositories {
@@ -13,7 +12,7 @@ android {
1312

1413
defaultConfig {
1514
minSdkVersion 14
16-
targetSdkVersion 21
15+
targetSdkVersion 22
1716
versionName project.VERSION_NAME
1817
versionCode Integer.parseInt(project.VERSION_CODE)
1918
}

gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
VERSION_NAME=2.0.2-SNAPSHOT
2-
VERSION_CODE=202
1+
VERSION_NAME=2.1.0-SNAPSHOT
2+
VERSION_CODE=210
33
GROUP=com.github.gabrielemariotti.cards
44

55
POM_DESCRIPTION=Android Library to build a UI Card

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ 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.2.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip

library-cards/build.gradle

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
apply plugin: 'android-sdk-manager'
21
apply plugin: 'com.android.library'
32

43
repositories {
@@ -11,7 +10,7 @@ android {
1110

1211
defaultConfig {
1312
minSdkVersion 14
14-
targetSdkVersion 21
13+
targetSdkVersion 22
1514
versionName project.VERSION_NAME
1615
versionCode Integer.parseInt(project.VERSION_CODE)
1716
}
@@ -27,7 +26,7 @@ dependencies {
2726
compile project(':library-core')
2827

2928
//Annotation
30-
compile 'com.android.support:support-annotations:21.0.3'
29+
compile 'com.android.support:support-annotations:22.1.1'
3130
}
3231

3332
// Used to update in Maven

library-core/build.gradle

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
apply plugin: 'android-sdk-manager'
21
apply plugin: 'com.android.library'
32

43
repositories {
@@ -11,7 +10,7 @@ android {
1110

1211
defaultConfig {
1312
minSdkVersion 14
14-
targetSdkVersion 21
13+
targetSdkVersion 22
1514
versionName project.VERSION_NAME
1615
versionCode Integer.parseInt(project.VERSION_CODE)
1716
}
@@ -24,13 +23,13 @@ android {
2423

2524
dependencies {
2625
//CardView
27-
compile 'com.android.support:cardview-v7:21.0.3'
26+
compile 'com.android.support:cardview-v7:22.1.1'
2827

2928
//Support lib
30-
compile 'com.android.support:support-v4:21.0.3'
29+
compile 'com.android.support:support-v4:22.1.1'
3130

3231
//Annotation
33-
compile 'com.android.support:support-annotations:21.0.3'
32+
compile 'com.android.support:support-annotations:22.1.1'
3433
}
3534

3635
// Used to update in Maven

library-recyclerview/build.gradle

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
apply plugin: 'android-sdk-manager'
21
apply plugin: 'com.android.library'
32

43
repositories {
@@ -11,7 +10,7 @@ android {
1110

1211
defaultConfig {
1312
minSdkVersion 14
14-
targetSdkVersion 21
13+
targetSdkVersion 22
1514
versionName project.VERSION_NAME
1615
versionCode Integer.parseInt(project.VERSION_CODE)
1716
}
@@ -27,9 +26,9 @@ dependencies {
2726
compile project(':library-core')
2827

2928
//Annotation
30-
compile 'com.android.support:support-annotations:21.0.3'
29+
compile 'com.android.support:support-annotations:22.1.1'
3130
//Recycler View
32-
compile 'com.android.support:recyclerview-v7:21.0.3'
31+
compile 'com.android.support:recyclerview-v7:22.1.1'
3332
}
3433

3534
// Used to update in Maven

0 commit comments

Comments
 (0)