From 16e567baa4c9e39173d16f7b6828c3582142b463 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 8 May 2021 01:03:31 -0700 Subject: [PATCH] Uptaded to Kotlin Serialization 1.2 --- build.gradle.kts | 7 +++++-- pom.xml | 27 +++++++++++++++++++-------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6287549..6ba189b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -43,12 +43,15 @@ dependencies { kapt(semverProcessor) compileOnly(semverProcessor) + implementation(platform("org.jetbrains.kotlin:kotlin-bom")) + implementation("javax.servlet:javax.servlet-api:4.0.1") implementation("com.squareup.okhttp3:okhttp:${versions.okhttp}") implementation("com.squareup.okhttp3:logging-interceptor:${versions.okhttp}") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:1.0-M1-1.4.0-rc") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.0") + testImplementation("org.mockito:mockito-core:3.9.0") testImplementation("org.testng:testng:7.4.0") } @@ -99,7 +102,7 @@ tasks { } jacoco { - toolVersion = "0.8.7-SNAPSHOT" + toolVersion = "0.8.7" } jacocoTestReport { diff --git a/pom.xml b/pom.xml index 8cd1f7c..55710ee 100644 --- a/pom.xml +++ b/pom.xml @@ -35,19 +35,30 @@ GitHub https://github.com/ethauvin/akismet-kotlin/issues + + + + org.jetbrains.kotlin + kotlin-bom + 1.5.0 + pom + import + + + + + javax.servlet + javax.servlet-api + 4.0.1 + compile + org.jetbrains.kotlin kotlin-stdlib-jdk8 1.5.0 compile - - javax.servlet - javax.servlet-api - 4.0.1 - runtime - com.squareup.okhttp3 okhttp @@ -62,8 +73,8 @@ org.jetbrains.kotlinx - kotlinx-serialization-runtime-jvm - 1.0-M1-1.4.0-rc + kotlinx-serialization-json-jvm + 1.2.0 runtime