Skip to content
This repository has been archived by the owner on Feb 28, 2022. It is now read-only.

Commit

Permalink
Update some dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
MGaetan89 committed Oct 16, 2016
1 parent 46db5bf commit 6d6fe42
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 7 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Expand Up @@ -6,7 +6,7 @@ jdk:
android:
components:
- android-24
- build-tools-24.0.0
- build-tools-24.0.3
- extra-android-m2repository
- platform-tools
- tools
Expand All @@ -33,7 +33,7 @@ before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock

before_install:
- echo y | android update sdk --all --no-ui --force --filter build-tools-24.0.0
- echo y | android update sdk --all --no-ui --force --filter build-tools-24.0.3
- echo y | android update sdk --all --no-ui --force --filter android-24

script:
Expand All @@ -48,3 +48,4 @@ cache:
directories:
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/
- $HOME/.m2/
1 change: 1 addition & 0 deletions app/build.gradle
Expand Up @@ -12,6 +12,7 @@ android {
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName '1.0'
resConfigs rootProject.ext.supportedLocales
}

buildTypes {
Expand Down
7 changes: 4 additions & 3 deletions build.gradle
Expand Up @@ -6,7 +6,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:2.2.0'
classpath 'com.android.tools.build:gradle:2.2.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
classpath 'io.realm:realm-gradle-plugin:1.0.1'
classpath 'org.jacoco:org.jacoco.core:0.7.7.201606060606'
Expand All @@ -26,16 +26,17 @@ task clean(type: Delete) {
}

ext {
buildToolsVersion = '24.0.2'
buildToolsVersion = '24.0.3'
compileSdkVersion = 24
minSdkVersion = 9
targetSdkVersion = 24
supportedLocales = ['en', 'fr']

// Dependencies version
jUnitVersion = '4.12'
kolumbusVersionCode = 9
kolumbusVersionName = '0.9'
kotlinVersion = '1.0.4'
mockitoVersion = '2.2.0-beta.1'
mockitoVersion = '2.2.2'
supportLibraryVersion = '24.2.1'
}
3 changes: 2 additions & 1 deletion gradle.properties
Expand Up @@ -15,4 +15,5 @@
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
# org.gradle.parallel=true
kotlin.incremental=true
1 change: 1 addition & 0 deletions kolumbus-no-op/build.gradle
Expand Up @@ -15,6 +15,7 @@ android {
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode rootProject.ext.kolumbusVersionCode
versionName rootProject.ext.kolumbusVersionName
resConfigs rootProject.ext.supportedLocales
}

buildTypes {
Expand Down
2 changes: 1 addition & 1 deletion kolumbus/build.gradle
Expand Up @@ -17,7 +17,7 @@ android {
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode rootProject.ext.kolumbusVersionCode
versionName rootProject.ext.kolumbusVersionName
resConfigs 'en', 'fr'
resConfigs rootProject.ext.supportedLocales
vectorDrawables.useSupportLibrary = true
}

Expand Down

0 comments on commit 6d6fe42

Please sign in to comment.