From 54614a87758ea1f1f820b28b9d5317b85d9f36d9 Mon Sep 17 00:00:00 2001
From: Vetle Leinonen-Roeim <vetle@reprice.no>
Date: Fri, 22 Apr 2022 10:00:23 +0200
Subject: [PATCH] Upgrade Gradle to 6.9.2, Kotlin to 1.4.20, junit to 4.13.2
 and mockito 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
---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 mockito-kotlin/build.gradle              | 6 +++---
 tests/build.gradle                       | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

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
diff --git a/mockito-kotlin/build.gradle b/mockito-kotlin/build.gradle
index 8c089e00..30c3aea2 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()
@@ -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"
diff --git a/tests/build.gradle b/tests/build.gradle
index c40c2e31..66dcabbb 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 {
@@ -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"
 }
\ No newline at end of file