Skip to content

Commit

Permalink
Upgrade Gradle to 6.9.2, Kotlin to 1.4.20, junit to 4.13.2 and mockit…
Browse files Browse the repository at this point in the history
…o to 4.4.0 (#458)

* Upgrading to Gradle 6.9.2

* Upgrading to Kotlin 1.4.20, most recent version supported by Gradle 6.9.2

* Upgrade to Mockito 4.5.1

* Upgrade to junit 4.13.2
  • Loading branch information
vetler committed Apr 22, 2022
1 parent 0a483e8 commit 54614a8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions mockito-kotlin/build.gradle
Expand Up @@ -3,7 +3,7 @@ apply from: '../gradle/publishing.gradle'
apply plugin: 'org.jetbrains.dokka'

buildscript {
ext.kotlin_version = "1.3.50"
ext.kotlin_version = "1.4.20"

repositories {
mavenCentral()
Expand All @@ -23,9 +23,9 @@ dependencies {
compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
compileOnly 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.0'

compile "org.mockito:mockito-core:4.0.0"
compile "org.mockito:mockito-core:4.5.1"

testCompile 'junit:junit:4.12'
testCompile 'junit:junit:4.13.2'
testCompile 'com.nhaarman:expect.kt:1.0.1'

testCompile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
Expand Down
6 changes: 3 additions & 3 deletions tests/build.gradle
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = System.getenv("KOTLIN_VERSION") ?: '1.3.50'
ext.kotlin_version = System.getenv("KOTLIN_VERSION") ?: '1.4.20'
println "$project uses Kotlin $kotlin_version"

repositories {
Expand All @@ -21,8 +21,8 @@ dependencies {
compile files("${rootProject.projectDir}/mockito-kotlin/build/libs/mockito-kotlin-${version}.jar")

compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
compile "org.mockito:mockito-core:4.0.0"
compile "org.mockito:mockito-core:4.5.1"

testCompile "junit:junit:4.12"
testCompile 'junit:junit:4.13.2'
testCompile "com.nhaarman:expect.kt:1.0.1"
}

0 comments on commit 54614a8

Please sign in to comment.