Skip to content

Commit

Permalink
Updated dependencies
Browse files Browse the repository at this point in the history
Avoided updating anything past stable, though.
  • Loading branch information
dlew committed Jul 29, 2018
1 parent 6e6c924 commit 4297c30
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -4,8 +4,8 @@ android:
components:
- tools
- platform-tools
- build-tools-26.0.2
- android-26
- build-tools-27.0.3
- android-27
- extra-android-m2repository

jdk: oraclejdk8
Expand Down
26 changes: 13 additions & 13 deletions build.gradle
@@ -1,18 +1,18 @@
buildscript {
ext {
//version here to share between build script and projects
verKotlin = '1.1.4-3'
verKotlin = '1.2.51'
}
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'com.android.tools.build:gradle:3.1.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$verKotlin"
classpath "org.jetbrains.kotlin:kotlin-android-extensions:$verKotlin"
classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
}
}

Expand All @@ -25,21 +25,21 @@ apply plugin: 'com.github.ben-manes.versions'

ext {
minSdkVersion = 14
compileSdkVersion = 26
compileSdkVersion = 27
targetSdkVersion = compileSdkVersion
buildToolsVersion = '26.0.2'
buildToolsVersion = '27.0.3'

supportLibVersion = '26.0.2'
lifecycleVersion = '1.0.0'
lifecycleRuntimeVersion = '1.0.3'
supportLibVersion = '27.1.1'
lifecycleVersion = '1.1.1'
lifecycleRuntimeVersion = '1.1.1'

sourceCompatibilityVersion = JavaVersion.VERSION_1_7
targetCompatibilityVersion = JavaVersion.VERSION_1_7

// Define all dependencies in the base project, to unify & make it easy to update
rxJava = 'io.reactivex.rxjava2:rxjava:2.1.3'
rxAndroid = 'io.reactivex.rxjava2:rxandroid:2.0.1'
navi = 'com.trello.navi2:navi:2.0'
rxJava = 'io.reactivex.rxjava2:rxjava:2.1.17'
rxAndroid = 'io.reactivex.rxjava2:rxandroid:2.0.2'
navi = 'com.trello.navi2:navi:2.0.1'
lifecycle = "android.arch.lifecycle:runtime:$lifecycleRuntimeVersion"
lifecycleProcessor = "android.arch.lifecycle:compiler:$lifecycleVersion"
lifecycleExtensions = "android.arch.lifecycle:extensions:$lifecycleVersion"
Expand All @@ -49,5 +49,5 @@ ext {
supportAnnotations = "com.android.support:support-annotations:$supportLibVersion"
jsr305Annotations = 'com.google.code.findbugs:jsr305:3.0.2'
junit = 'junit:junit:4.12'
robolectric = 'org.robolectric:robolectric:3.4.2'
robolectric = 'org.robolectric:robolectric:3.8'
}

0 comments on commit 4297c30

Please sign in to comment.