Skip to content

Commit

Permalink
Merge pull request #299 from jossiwolf/kotlin-1.3
Browse files Browse the repository at this point in the history
Update to Kotlin 1.3, migrate to stable coroutines and update Mockito
  • Loading branch information
nhaarman committed Oct 9, 2018
2 parents 98584ec + ae821f5 commit 7444d1d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions mockito-kotlin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apply from: '../publishing.gradle'
apply plugin: 'org.jetbrains.dokka'

buildscript {
ext.kotlin_version = "1.3.0-rc-116"
ext.kotlin_version = "1.3.0-rc-146"

repositories {
mavenCentral()
Expand All @@ -29,7 +29,7 @@ dependencies {
compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
compileOnly 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.30.0-eap13'

compile "org.mockito:mockito-core:2.21.0"
compile "org.mockito:mockito-core:2.23.0"

testCompile 'junit:junit:4.12'
testCompile 'com.nhaarman:expect.kt:1.0.0'
Expand Down

0 comments on commit 7444d1d

Please sign in to comment.