From 3aab37de65a87503a0a2f02053b4df985709ecc9 Mon Sep 17 00:00:00 2001 From: Vetle Leinonen-Roeim Date: Wed, 20 Apr 2022 08:20:31 +0200 Subject: [PATCH 1/4] Upgrading to Gradle 6.9.2 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 28ff446a..ec991f9a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 From 30c36f82a04da9171ebe252e83684fc5b2161190 Mon Sep 17 00:00:00 2001 From: Vetle Leinonen-Roeim Date: Wed, 20 Apr 2022 08:26:09 +0200 Subject: [PATCH 2/4] Upgrading to Kotlin 1.4.20, most recent version supported by Gradle 6.9.2 --- mockito-kotlin/build.gradle | 2 +- tests/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mockito-kotlin/build.gradle b/mockito-kotlin/build.gradle index 8c089e00..f31f662b 100644 --- a/mockito-kotlin/build.gradle +++ b/mockito-kotlin/build.gradle @@ -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() diff --git a/tests/build.gradle b/tests/build.gradle index c40c2e31..d590adca 100644 --- a/tests/build.gradle +++ b/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 { From 53ac9333065372e2808d09c44510a90437a2b116 Mon Sep 17 00:00:00 2001 From: Vetle Leinonen-Roeim Date: Fri, 22 Apr 2022 09:14:26 +0200 Subject: [PATCH 3/4] Upgrade to Mockito 4.5.1 --- mockito-kotlin/build.gradle | 2 +- tests/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mockito-kotlin/build.gradle b/mockito-kotlin/build.gradle index f31f662b..2d3112a1 100644 --- a/mockito-kotlin/build.gradle +++ b/mockito-kotlin/build.gradle @@ -23,7 +23,7 @@ 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 'com.nhaarman:expect.kt:1.0.1' diff --git a/tests/build.gradle b/tests/build.gradle index d590adca..6346887b 100644 --- a/tests/build.gradle +++ b/tests/build.gradle @@ -21,7 +21,7 @@ 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 "com.nhaarman:expect.kt:1.0.1" From 875a06a55ba5eb34d00baa9147b8859bde4d71fb Mon Sep 17 00:00:00 2001 From: Vetle Leinonen-Roeim Date: Fri, 22 Apr 2022 09:16:29 +0200 Subject: [PATCH 4/4] Upgrade to junit 4.13.2 --- mockito-kotlin/build.gradle | 2 +- tests/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mockito-kotlin/build.gradle b/mockito-kotlin/build.gradle index 2d3112a1..30c3aea2 100644 --- a/mockito-kotlin/build.gradle +++ b/mockito-kotlin/build.gradle @@ -25,7 +25,7 @@ dependencies { 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" diff --git a/tests/build.gradle b/tests/build.gradle index 6346887b..66dcabbb 100644 --- a/tests/build.gradle +++ b/tests/build.gradle @@ -23,6 +23,6 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" 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" } \ No newline at end of file