aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-06-26 15:04:46 -0700
committerAllan Wang <me@allanwang.ca>2017-06-26 15:04:46 -0700
commitcddb866441d04814a13a0cedb7e1e3da4908ebf4 (patch)
treebd68a2a0b49e59206b4ce12093be1e22d236e4b0
parent6270c060e4d33db12903e476146456569d260261 (diff)
downloadfrost-cddb866441d04814a13a0cedb7e1e3da4908ebf4.tar.gz
frost-cddb866441d04814a13a0cedb7e1e3da4908ebf4.tar.bz2
frost-cddb866441d04814a13a0cedb7e1e3da4908ebf4.zip
Test dependencies 2
-rw-r--r--app/build.gradle6
-rw-r--r--build.gradle3
-rw-r--r--gradle.properties5
3 files changed, 7 insertions, 7 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 9b19f26c..96263812 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -80,15 +80,15 @@ repositories {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+ androidTestCompile('com.android.support.test.espresso:espresso-core:2.3-alpha', {
exclude group: 'com.android.support', module: 'support-annotations'
})
testCompile 'junit:junit:4.12'
compile("ca.allanwang:kau:${KAU}")
- compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
- testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
+ compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:${KOTLIN}"
+ testCompile "org.jetbrains.kotlin:kotlin-test-junit:${KOTLIN}"
debugCompile "com.squareup.leakcanary:leakcanary-android:${LEAK_CANARY}"
releaseTestCompile "com.squareup.leakcanary:leakcanary-android-no-op:${LEAK_CANARY}"
diff --git a/build.gradle b/build.gradle
index 083ca65f..d2011ba6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,13 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.kotlin_version = '1.1.3'
repositories {
jcenter()
maven { url 'https://maven.fabric.io/public' }
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${KOTLIN}"
classpath 'io.fabric.tools:gradle:1.+'
}
}
diff --git a/gradle.properties b/gradle.properties
index ed651a11..00243757 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,12 +20,13 @@ VERSION_CODE=5
VERSION_NAME=0.5
KAU=c09b59f09a
+KOTLIN=1.1.3
MATERIAL_DRAWER=5.9.3
MATERIAL_DRAWER_KT=1.0.4
IICON_MATERIAL=2.2.0.2
IICON_COMMUNITY=1.9.32.1
-JSOUP=1.10.2
-GLIDE=4.0.0-RC0
+JSOUP=1.10.3
+GLIDE=4.0.0-RC1
RETROFIT=2.2.0
DBFLOW=4.0.4
ROBOELECTRIC=3.3.2