From 44e8d91603e93b543192521217a777f0fb7c0cca Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 30 Jul 2019 15:46:47 -0700
Subject: [PATCH] Cleanup.

---
 .idea/modules/mobibot.iml  |  2 +-
 LICENCE.txt => LICENSE.txt |  0
 build.gradle               | 30 ++++++++++++++++++------------
 3 files changed, 19 insertions(+), 13 deletions(-)
 rename LICENCE.txt => LICENSE.txt (100%)

diff --git a/.idea/modules/mobibot.iml b/.idea/modules/mobibot.iml
index 880e624..2113f38 100644
--- a/.idea/modules/mobibot.iml
+++ b/.idea/modules/mobibot.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.7.3-beta+469" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.7.3-beta+484" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager">
     <output url="file://$MODULE_DIR$/../../out/production/classes" />
     <output-test url="file://$MODULE_DIR$/../../out/test/classes" />
diff --git a/LICENCE.txt b/LICENSE.txt
similarity index 100%
rename from LICENCE.txt
rename to LICENSE.txt
diff --git a/build.gradle b/build.gradle
index 1e9f534..7c452a2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,8 +23,11 @@ final def semverProcessor = "net.thauvin.erik:semver:1.2.0"
 mainClassName = packageName + '.Mobibot'
 
 ext {
-    log4j = '2.12.0'
-    spotbugs_annotations = '4.0.0-beta3'
+    versions = [
+        kotlin : '1.3.40',
+        log4j : '2.12.0',
+        spotbugs_annotations : '4.0.0-beta3'
+    ]
 }
 
 repositories {
@@ -40,9 +43,9 @@ dependencies {
     compile 'pircbot:pircbot:1.5.0'
     compileOnly 'pircbot:pircbot:1.5.0:sources'
 
-    compile "org.apache.logging.log4j:log4j-api:$log4j"
-    compile "org.apache.logging.log4j:log4j-core:$log4j"
-    compile "org.apache.logging.log4j:log4j-slf4j-impl:$log4j"
+    compile "org.apache.logging.log4j:log4j-api:$versions.log4j"
+    compile "org.apache.logging.log4j:log4j-core:$versions.log4j"
+    compile "org.apache.logging.log4j:log4j-slf4j-impl:$versions.log4j"
 
     compile 'commons-cli:commons-cli:1.4'
 
@@ -59,15 +62,18 @@ dependencies {
     compile 'net.thauvin.erik:pinboard-poster:1.0.1'
 
     compile 'net.aksingh:owm-japis:2.5.3.0'
+    // Override own-japis dependencies with newer version of Kotlin
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
 
     testImplementation 'org.testng:testng:6.14.3'
-    testImplementation 'org.assertj:assertj-core:3.12.2'
+    testImplementation 'org.assertj:assertj-core:3.13.1'
 
     spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.9.0'
     spotbugsPlugins 'com.mebigfatguy.sb-contrib:sb-contrib:7.4.6'
 
-    compileOnly "com.github.spotbugs:spotbugs-annotations:$spotbugs_annotations"
-    testCompileOnly "com.github.spotbugs:spotbugs-annotations:$spotbugs_annotations"
+    compileOnly "com.github.spotbugs:spotbugs-annotations:$versions.spotbugs_annotations"
+    testCompileOnly "com.github.spotbugs:spotbugs-annotations:$versions.spotbugs_annotations"
 }
 
 test {
@@ -153,6 +159,10 @@ tasks.withType(Checkstyle) {
     }
 }
 
+tasks.sonarqube {
+    dependsOn("jacocoTestReport")
+}
+
 task copyToDeploy(type: Copy) {
     from('properties')
     from jar
@@ -182,7 +192,3 @@ task release(dependsOn: ['wrapper', 'clean', 'deploy']) {
     group = 'Publishing'
     description = 'Releases new version.'
 }
-
-tasks.sonarqube {
-    dependsOn("jacocoTestReport")
-}