diff --git a/build.gradle b/build.gradle index 8339c6b..a4feb6c 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:2.3.2' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' } } diff --git a/circle.yml b/circle.yml index 222a0f5..7165e2b 100644 --- a/circle.yml +++ b/circle.yml @@ -4,12 +4,12 @@ machine: dependencies: pre: - - if [ ! -e /usr/local/android-sdk-linux/build-tools/24.0.2 ]; then echo y | android update sdk --all --no-ui --filter "build-tools-24.0.2"; fi; - - if [ ! -e /usr/local/android-sdk-linux/platforms/android-24 ]; then echo y | android update sdk --all --no-ui --filter "android-24"; fi; + - if [ ! -e /usr/local/android-sdk-linux/build-tools/25.0.3 ]; then echo y | android update sdk --all --no-ui --filter "build-tools-25.0.3"; fi; + - if [ ! -e /usr/local/android-sdk-linux/platforms/android-25 ]; then echo y | android update sdk --all --no-ui --filter "android-25"; fi; - if ! $(grep -q "Revision=47.0.0" /usr/local/android-sdk-linux/extras/android/m2repository/source.properties); then echo y | android update sdk --all --no-ui --filter "extra-android-m2repository"; fi; cache_directories: - - /usr/local/android-sdk-linux/build-tools/24.0.2 - - /usr/local/android-sdk-linux/platforms/android-24 + - /usr/local/android-sdk-linux/build-tools/25.0.3 + - /usr/local/android-sdk-linux/platforms/android-25 - /usr/local/android-sdk-linux/extras/android/m2repository test: diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8a7b30c..66d42a4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Aug 26 13:53:34 CEST 2016 +#Thu May 18 11:18:30 MDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip diff --git a/lost-sample/build.gradle b/lost-sample/build.gradle index 541a978..f97f958 100644 --- a/lost-sample/build.gradle +++ b/lost-sample/build.gradle @@ -4,7 +4,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:2.3.2' } } @@ -24,13 +24,13 @@ version = VERSION_NAME description = """LOST Sample""" android { - compileSdkVersion 24 - buildToolsVersion "24.0.2" + compileSdkVersion 25 + buildToolsVersion '25.0.3' defaultConfig { applicationId "com.example.lost" minSdkVersion 15 - targetSdkVersion 24 + targetSdkVersion 25 versionCode 1 versionName "1.0" } @@ -49,7 +49,7 @@ task checkstyle(type: Checkstyle) { dependencies { compile project(':lost') compile 'com.mapzen.android:prefs-plus:1.0.0' - compile 'com.android.support:appcompat-v7:24.2.1' + compile 'com.android.support:appcompat-v7:25.3.1' } apply from: file('../gradle-mvn-push.gradle') diff --git a/lost/build.gradle b/lost/build.gradle index 8591379..fd09dd0 100644 --- a/lost/build.gradle +++ b/lost/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:2.3.2' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3' classpath 'net.researchgate:gradle-release:2.4.0' } @@ -31,12 +31,12 @@ release { } android { - compileSdkVersion 24 - buildToolsVersion "24.0.2" + compileSdkVersion 25 + buildToolsVersion '25.0.3' defaultConfig { minSdkVersion 15 - targetSdkVersion 23 + targetSdkVersion 25 } compileOptions { @@ -93,8 +93,8 @@ task printVersion << { } dependencies { - compile 'com.android.support:support-annotations:24.2.1' - compile 'com.android.support:appcompat-v7:24.2.1' + compile 'com.android.support:support-annotations:25.3.1' + compile 'com.android.support:appcompat-v7:25.3.1' testCompile 'com.google.guava:guava:18.0' testCompile 'junit:junit:4.12'