From 35bc91761ad1f8336f331c6b04cff8bf4d9ae064 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Mon, 24 Aug 2020 14:28:34 -0300 Subject: Upgrade to Kotlin 1.4 --- taler-kotlin-android/build.gradle | 4 ++-- .../src/test/java/net/taler/common/ContractTermsTest.kt | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'taler-kotlin-android') diff --git a/taler-kotlin-android/build.gradle b/taler-kotlin-android/build.gradle index ca4df8a..5cb0b0e 100644 --- a/taler-kotlin-android/build.gradle +++ b/taler-kotlin-android/build.gradle @@ -52,7 +52,6 @@ android { dependencies { api project(":multiplatform:common") - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.core:core-ktx:1.3.1' @@ -67,8 +66,9 @@ dependencies { implementation 'com.google.zxing:core:3.4.0' // needs minSdkVersion 24+ // JSON parsing and serialization - api "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0" + api "org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.0-RC" implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.10.2" + implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" lintPublish 'com.github.thirdegg:lint-rules:0.0.4-alpha' diff --git a/taler-kotlin-android/src/test/java/net/taler/common/ContractTermsTest.kt b/taler-kotlin-android/src/test/java/net/taler/common/ContractTermsTest.kt index 62e8922..0e410ca 100644 --- a/taler-kotlin-android/src/test/java/net/taler/common/ContractTermsTest.kt +++ b/taler-kotlin-android/src/test/java/net/taler/common/ContractTermsTest.kt @@ -23,7 +23,6 @@ import com.fasterxml.jackson.module.kotlin.readValue import net.taler.lib.common.Amount import net.taler.lib.common.AmountMixin import net.taler.lib.common.Timestamp -import net.taler.lib.common.Timestamp.Companion.NEVER import net.taler.lib.common.TimestampMixin import org.junit.Assert.assertEquals import org.junit.Test @@ -75,7 +74,7 @@ class ContractTermsTest { """.trimIndent() val contractTerms: ContractTerms = mapper.readValue(json) assertEquals("Essay: 1. The Free Software Definition", contractTerms.summary) - assertEquals(Timestamp(NEVER), contractTerms.refundDeadline) + assertEquals(Timestamp.never(), contractTerms.refundDeadline) } } -- cgit v1.2.3