From d151a3adc9d3057b330a8d1cb24e705e41aa9088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Kota=C4=8Dka?= <vit.kotacka@oracle.com>
Date: Mon, 18 Feb 2019 13:53:53 +0100
Subject: [PATCH 1/2] Migrate to Gradle Kotlin DSL

---
 build.gradle                             | 28 ------------------------
 build.gradle.kts                         | 16 ++++++++++++++
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 3 files changed, 17 insertions(+), 29 deletions(-)
 delete mode 100644 build.gradle
 create mode 100644 build.gradle.kts

diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 5376b74d5..000000000
--- a/build.gradle
+++ /dev/null
@@ -1,28 +0,0 @@
-buildscript {
-    ext.kotlin_version = '1.2.10'
-
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
-apply plugin: 'kotlin'
-
-sourceSets {
-    main.java.srcDirs += 'src'
-    test.java.srcDirs += 'test'
-}
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    compile 'com.google.guava:guava:16.0'
-    testCompile 'junit:junit:4.12'
-}
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 000000000..4d6fb53f7
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,16 @@
+plugins {
+    kotlin("jvm") version "1.3.21"
+}
+
+repositories {
+    mavenCentral()
+}
+
+sourceSets["main"].java.srcDir("src")
+sourceSets["test"].java.srcDir("test")
+
+dependencies {
+    implementation(kotlin("stdlib"))
+    implementation("com.google.guava:guava:27.0.1-jre")
+    testImplementation("junit:junit:4.12")
+}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 15b8ed9a8..440702935 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -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-4.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip

From aa6c53eef5a1513bd446e3abc282fe88f6383708 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Kota=C4=8Dka?= <vit.kotacka@oracle.com>
Date: Tue, 19 Feb 2019 09:13:58 +0100
Subject: [PATCH 2/2] Upgrade JUnit dependency to version 5

---
 build.gradle.kts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 4d6fb53f7..34a362bac 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,5 +12,9 @@ sourceSets["test"].java.srcDir("test")
 dependencies {
     implementation(kotlin("stdlib"))
     implementation("com.google.guava:guava:27.0.1-jre")
-    testImplementation("junit:junit:4.12")
-}
\ No newline at end of file
+    testImplementation("org.junit.jupiter:junit-jupiter:5.4.0")
+}
+
+tasks.withType<Test> {
+    useJUnitPlatform()
+}