Skip to content
This repository has been archived by the owner on Apr 23, 2023. It is now read-only.

Commit

Permalink
Update gradle, build tools, and sdk (#201)
Browse files Browse the repository at this point in the history
* gradle plugin 2.3.2 and gradle 3.3

* build tools version 25.0.3

* update sdk to 25

* update circle
  • Loading branch information
sarahsnow1 committed May 18, 2017
1 parent 731e5df commit 70303ec
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
Expand Down
8 changes: 4 additions & 4 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
10 changes: 5 additions & 5 deletions lost-sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.android.tools.build:gradle:2.3.2'
}
}

Expand All @@ -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"
}
Expand All @@ -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')
12 changes: 6 additions & 6 deletions lost/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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'
Expand Down

0 comments on commit 70303ec

Please sign in to comment.