Skip to content

Commit

Permalink
Update gradle and dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
mg6maciej committed Feb 25, 2017
1 parent 2eb90a8 commit ac811c6
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
8 changes: 4 additions & 4 deletions android-maps-extensions-demo/build.gradle
Expand Up @@ -4,18 +4,18 @@ tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
}

def isTravis = "true".equals(System.getenv("TRAVIS"))
def isCI = System.env.CI == "true"

android {
compileSdkVersion 23
buildToolsVersion '23.0.3'
buildToolsVersion '25.0.2'

defaultConfig {
minSdkVersion 8
targetSdkVersion 23
}
dexOptions {
preDexLibraries = !isTravis
preDexLibraries = !isCI
}
lintOptions {
abortOnError false
Expand All @@ -27,5 +27,5 @@ dependencies {
exclude module: 'play-services-maps'
}
compile 'com.google.android.gms:play-services:3.2.65'
compile 'com.android.support:appcompat-v7:23.0.1'
compile 'com.android.support:appcompat-v7:23.4.0'
}
12 changes: 6 additions & 6 deletions android-maps-extensions/build.gradle
Expand Up @@ -6,31 +6,31 @@ tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
}

def isTravis = "true".equals(System.getenv("TRAVIS"))
def isCI = System.env.CI == "true"

android {
compileSdkVersion 23
buildToolsVersion '23.0.3'
compileSdkVersion 25
buildToolsVersion '25.0.2'

defaultConfig {
minSdkVersion 8
}
dexOptions {
preDexLibraries = !isTravis
preDexLibraries = !isCI
}
lintOptions {
abortOnError false
}
}

dependencies {
compile 'com.google.android.gms:play-services-maps:9.6.1'
compile 'com.google.android.gms:play-services-maps:10.2.0'
}

group = 'com.androidmapsextensions'
version = '2.3.2-SNAPSHOT'

if (!isTravis) {
if (!isCI) {

signing {
sign configurations.archives
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Expand Up @@ -3,7 +3,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.2'
classpath 'com.android.tools.build:gradle:2.3.0-rc1'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.11.3'
}
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Sun Jul 03 17:48:51 EEST 2016
#Sat Feb 25 15:45:22 CET 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

0 comments on commit ac811c6

Please sign in to comment.