build: upgrade to kotlin 1.4.0

Author: sylux6

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.1.5 (2020-08-30)
+
+- Upgrade to kotlin 1.4.0
+
 ## 3.1.4 (2020-07-19)
 
 ### Bug fixes

build.gradle.kts

@@ -1,16 +1,20 @@
+val atriumVersion = "0.12.0"
+val javaStringSimilarityVersion = "2.0.0"
+val jsonVersion = "20200518"
 val kotlinVersion = "1.3.61"
+val mockkVersion = "1.10.0"
 val fuelVersion = "2.2.1"
 val spekVersion = "2.0.9"
 
 plugins {
     java
     maven
-    kotlin("jvm") version "1.3.61"
-    id("org.jmailen.kotlinter") version "2.3.0"
+    kotlin("jvm") version "1.4.0"
+    id("org.jmailen.kotlinter") version "3.0.2"
 }
 
 group = "com.github.AzurApi"
-version = "3.1.3"
+version = "3.1.5"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
@@ -26,14 +30,14 @@ dependencies {
     implementation(kotlin("stdlib-jdk8"))
     implementation("com.github.kittinunf.fuel:fuel:$fuelVersion")
     implementation("com.github.kittinunf.fuel:fuel-json:$fuelVersion")
-    implementation("org.json", "json", "20190722")
-    implementation("info.debatty", "java-string-similarity", "1.2.1")
+    implementation("org.json:json:$jsonVersion")
+    implementation("info.debatty:java-string-similarity:$javaStringSimilarityVersion")
 
     testImplementation("org.spekframework.spek2:spek-dsl-jvm:$spekVersion")
     testRuntimeOnly("org.spekframework.spek2:spek-runner-junit5:$spekVersion")
     testRuntimeOnly("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
-    testImplementation("io.mockk:mockk:1.9.3")
-    testImplementation("ch.tutteli.atrium:atrium-fluent-en_GB:0.9.1")
+    testImplementation("io.mockk:mockk:$mockkVersion")
+    testImplementation("ch.tutteli.atrium:atrium-fluent-en_GB:$atriumVersion")
 }
 
 tasks {

src/main/kotlin/com/github/azurapi/azurapikotlin/api/Atago.kt

@@ -47,8 +47,10 @@ object Atago {
      */
     fun getShipById(id: String, caseSensitive: Boolean = false): Ship {
         val formattedId = if (!caseSensitive) id.toLowerCase() else id
-        return (if (!caseSensitive) database.shipsById.mapKeys { it.key.toLowerCase() } else
-            database.shipsById)[formattedId] ?: throw ShipNotFoundException("Could not find ship with id: $id")
+        return (
+            if (!caseSensitive) database.shipsById.mapKeys { it.key.toLowerCase() } else
+                database.shipsById
+            )[formattedId] ?: throw ShipNotFoundException("Could not find ship with id: $id")
     }
 
     /**

src/main/kotlin/com/github/azurapi/azurapikotlin/internal/json/Takao.kt

@@ -8,8 +8,8 @@ import com.github.azurapi.azurapikotlin.internal.utils.parser.jsonToShip
 import com.github.kittinunf.fuel.httpGet
 import com.github.kittinunf.fuel.json.responseJson
 import info.debatty.java.stringsimilarity.Cosine
-import java.util.Date
 import org.json.JSONObject
+import java.util.Date
 
 /**
  * JSON deserializer object.
@@ -62,7 +62,8 @@ internal class Takao {
             jsonDatabase = loadJSON(TakaoInfo.JSON_SOURCE)
             for (shipId in jsonDatabase.keySet()) {
                 val ship = jsonToShip(
-                    jsonDatabase.getJSONObject(shipId), shipId
+                    jsonDatabase.getJSONObject(shipId),
+                    shipId
                 )
                 shipsById[ship.id] = ship
                 shipsByEnName[ship.names.en] = ship

src/test/kotlin/com/github/azurapi/azurapikotlin/internal/utils/parser/ShipParserSpec.kt

@@ -303,10 +303,11 @@ class ShipParserSpec : Spek({
                     ]
                 }
             }
-        """.trimIndent()
+                """.trimIndent()
             )
             val atago = jsonToShip(
-                json.optJSONObject("201"), "201"
+                json.optJSONObject("201"),
+                "201"
             )
             expect(atago.wikiUrl).toBe("https://azurlane.koumakan.jp/Atago")
             expect(atago.id).toBe("201")