Skip to content
This repository has been archived by the owner on Dec 7, 2019. It is now read-only.

Commit

Permalink
Updated dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
Dmitry Yunitsky committed May 13, 2018
1 parent f74c96f commit bac30b8
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 15 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {

dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
classpath "org.junit.platform:junit-platform-gradle-plugin:$versions.junitPlatform"
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
}
Expand Down
15 changes: 7 additions & 8 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
ext.versions = [
kotlin : '1.1.1',
kotlin : '1.2.41',

rxJava : '1.2.9',
rxJava : '1.3.8',
jCommander : '1.71',
commander : '0.1.1',
commander : '0.1.7',

junit : '4.12',
junitPlatform: '1.0.0-M4',
spek : '1.1.2',
assertJ : '3.5.2',
mockito : '2.8.9',
junitPlatform: '1.0.1',
spek : '1.1.5',
assertJ : '3.9.1',
mockito : '2.8.1',
mockitoKotlin: '1.5.0',
]

Expand All @@ -25,7 +25,6 @@ ext.libraries = [

junit : "junit:junit:$versions.junit",
spek : "org.jetbrains.spek:spek-api:$versions.spek",
spekSubjectExtension : "org.jetbrains.spek:spek-subject-extension:$versions.spek",
spekJunitPlatformEngine: "org.jetbrains.spek:spek-junit-platform-engine:$versions.spek",
assertJ : "org.assertj:assertj-core:$versions.assertJ",
mockito : "org.mockito:mockito-core:$versions.mockito",
Expand Down
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-3.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
1 change: 0 additions & 1 deletion swarmer/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ dependencies {

dependencies {
testCompile libraries.spek
testCompile libraries.spekSubjectExtension
testRuntime libraries.spekJunitPlatformEngine
testCompile libraries.assertJ
testCompile libraries.mockito
Expand Down
12 changes: 8 additions & 4 deletions swarmer/src/test/kotlin/com/gojuno/swarmer/EmulatorsSpec.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ package com.gojuno.swarmer
import com.gojuno.commander.android.AdbDevice
import com.gojuno.commander.android.adb
import com.gojuno.commander.os.Notification
import com.nhaarman.mockito_kotlin.*
import com.nhaarman.mockito_kotlin.any
import com.nhaarman.mockito_kotlin.argumentCaptor
import com.nhaarman.mockito_kotlin.mock
import com.nhaarman.mockito_kotlin.verify
import com.nhaarman.mockito_kotlin.whenever
import org.jetbrains.spek.api.Spek
import org.jetbrains.spek.api.dsl.describe
import org.jetbrains.spek.api.dsl.it
Expand All @@ -16,9 +20,9 @@ import java.util.concurrent.TimeUnit
class EmulatorsSpec : Spek({

val ADB_DEVICES = setOf(
AdbDevice("id1", true),
AdbDevice("id2", true),
AdbDevice("id3", true)
AdbDevice("id1", online = true),
AdbDevice("id2", online = true),
AdbDevice("id3", online = true)
)

arrayOf(
Expand Down

0 comments on commit bac30b8

Please sign in to comment.