Skip to content

Commit ef0698e

Browse files
committed
Updated build configuration
1 parent b954a31 commit ef0698e

File tree

10 files changed

+12
-12
lines changed

10 files changed

+12
-12
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ language: android
22
jdk: openjdk7
33
android:
44
components:
5-
- build-tools-19.1.0
5+
- build-tools-21.1.1
66
- extra-android-support
77
- extra-android-m2repository
8-
- android-19
8+
- android-21
99
licenses:
1010
- '.+'
1111
script:

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
}
55

66
dependencies {
7-
classpath 'com.android.tools.build:gradle:0.12.2'
7+
classpath 'com.android.tools.build:gradle:0.14.2'
88
}
99
}
1010

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
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-1.12-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-bin.zip

library/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 19
5-
buildToolsVersion '19.1'
4+
compileSdkVersion 21
5+
buildToolsVersion '21.1.1'
66

77
defaultConfig {
88
minSdkVersion 3
9-
targetSdkVersion 19
9+
targetSdkVersion 21
1010
}
1111

1212
lintOptions {

sample/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ buildscript {
33
mavenCentral()
44
}
55
dependencies {
6-
classpath 'com.android.tools.build:gradle:0.12.2'
6+
classpath 'com.android.tools.build:gradle:0.14.2'
77
}
88
}
99
apply plugin: 'com.android.application'
@@ -16,12 +16,12 @@ repositories {
1616
}
1717

1818
android {
19-
compileSdkVersion 19
20-
buildToolsVersion '19.1'
19+
compileSdkVersion 21
20+
buildToolsVersion '21.1.1'
2121

2222
defaultConfig {
2323
minSdkVersion 3
24-
targetSdkVersion 19
24+
targetSdkVersion 21
2525
}
2626

2727
compileOptions {
@@ -45,6 +45,6 @@ android {
4545
}
4646

4747
dependencies {
48-
compile 'com.fasterxml.jackson.core:jackson-databind:2.2.3'
48+
compile 'com.fasterxml.jackson.core:jackson-databind:2.4.3'
4949
compile project(':library')
5050
}

sample/src/main/res/drawable-hdpi/ic_launcher.png

100755100644
-5.6 KB
Loading

sample/src/main/res/drawable-mdpi/ic_launcher.png

100755100644
-2.55 KB
Loading

sample/src/main/res/drawable-xhdpi/ic_launcher.png

100755100644
-9.25 KB
Loading
Loading
Loading

0 commit comments

Comments
 (0)