Skip to content

Commit

Permalink
Update dependencies (ButterKnife, ConstraintLayout, Gradle, Kotlin, M…
Browse files Browse the repository at this point in the history
…ockito, Testing Compile)
  • Loading branch information
ngsilverman committed Oct 31, 2018
1 parent b4bbdb6 commit 8d18192
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 7 deletions.
6 changes: 3 additions & 3 deletions blessedDeps.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ rootProject.ext {
// Keep these alphabetized
ANDROIDX_ANNOTATIONS_VERSION = '1.0.0'
ANDROIDX_APPCOMPAT_VERSION = '1.0.0'
ANDROIDX_CONSTRAINTLAYOUT_VERSION = '1.1.0'
ANDROIDX_CONSTRAINTLAYOUT_VERSION = '1.1.3'
ANDROIDX_ESPRESSO_VERSION = '3.1.0'
JAVAPOET_VERSION = '1.11.1'
JUNIT_VERSION = '4.12'
KOTLINPOET_VERSION = '0.7.0'
KOTLIN_TEST_VERSION = '2.0.7'
MOCKITO_VERSION = '2.18.3'
MOCKITO_VERSION = '2.23.0'
ROBOLECTRIC_VERSION = '3.8'
TESTING_COMPILE_VERSION = '0.13'
TESTING_COMPILE_VERSION = '0.15'

deps = [
// Keep these alphabetized
Expand Down
21 changes: 18 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
apply plugin: "com.github.ben-manes.versions"

buildscript {
ext {
ANDROID_PLUGIN_VERSION = '3.2.1'
BUTTERKNIFE_VERSION = '9.0.0-SNAPSHOT'
KOTLIN_VERSION = '1.2.60'
BUTTERKNIFE_VERSION = '9.0.0-rc1'
KOTLIN_VERSION = '1.3.0'
VERSIONS_VERSION = '0.20.0'
}

repositories {
Expand All @@ -17,6 +18,7 @@ buildscript {
classpath "com.android.tools.build:gradle:$ANDROID_PLUGIN_VERSION"
classpath "com.jakewharton:butterknife-gradle-plugin:$BUTTERKNIFE_VERSION"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
classpath "com.github.ben-manes:gradle-versions-plugin:$VERSIONS_VERSION"
}
}

Expand Down Expand Up @@ -49,3 +51,16 @@ subprojects { project ->
task clean(type: Delete) {
delete rootProject.buildDir
}

dependencyUpdates.resolutionStrategy {
componentSelection { rules ->
rules.all { ComponentSelection selection ->
boolean rejected = ['alpha', 'beta', 'rc', 'cr', 'm', 'preview'].any { qualifier ->
selection.candidate.version ==~ /(?i).*[.-]${qualifier}[.\d-]*/
}
if (rejected) {
selection.reject('Release candidate')
}
}
}
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

0 comments on commit 8d18192

Please sign in to comment.