diff options
| author | Torsten Grote <t@grobox.de> | 2020-08-18 11:35:28 -0300 |
|---|---|---|
| committer | Torsten Grote <t@grobox.de> | 2020-08-18 11:36:07 -0300 |
| commit | 612876e44de35cdbd563ac2ce40dcd1d4e397bc5 (patch) | |
| tree | b2127aff7376b7d2304e300d216d838a2e1d2595 /merchant-lib | |
| parent | 451157d992a4c771e3bdf80b6563f80fb1582c77 (diff) | |
| download | taler-android-612876e44de35cdbd563ac2ce40dcd1d4e397bc5.tar.gz taler-android-612876e44de35cdbd563ac2ce40dcd1d4e397bc5.tar.bz2 taler-android-612876e44de35cdbd563ac2ce40dcd1d4e397bc5.zip | |
Include Taler common Kotlin library as a submodule
Diffstat (limited to 'merchant-lib')
4 files changed, 6 insertions, 6 deletions
diff --git a/merchant-lib/src/main/java/net/taler/merchantlib/OrderHistory.kt b/merchant-lib/src/main/java/net/taler/merchantlib/OrderHistory.kt index b1ff5b1..dfd989b 100644 --- a/merchant-lib/src/main/java/net/taler/merchantlib/OrderHistory.kt +++ b/merchant-lib/src/main/java/net/taler/merchantlib/OrderHistory.kt @@ -18,8 +18,8 @@ package net.taler.merchantlib import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -import net.taler.common.Amount -import net.taler.common.Timestamp +import net.taler.lib.common.Amount +import net.taler.lib.common.Timestamp @Serializable data class OrderHistory( diff --git a/merchant-lib/src/main/java/net/taler/merchantlib/Orders.kt b/merchant-lib/src/main/java/net/taler/merchantlib/Orders.kt index 783dd19..0a405ad 100644 --- a/merchant-lib/src/main/java/net/taler/merchantlib/Orders.kt +++ b/merchant-lib/src/main/java/net/taler/merchantlib/Orders.kt @@ -25,7 +25,7 @@ import kotlinx.serialization.Serializer import kotlinx.serialization.json.JsonInput import kotlinx.serialization.json.JsonObject import net.taler.common.ContractTerms -import net.taler.common.Duration +import net.taler.lib.common.Duration @Serializable data class PostOrderRequest( diff --git a/merchant-lib/src/main/java/net/taler/merchantlib/Refunds.kt b/merchant-lib/src/main/java/net/taler/merchantlib/Refunds.kt index 61f0ab7..b78b571 100644 --- a/merchant-lib/src/main/java/net/taler/merchantlib/Refunds.kt +++ b/merchant-lib/src/main/java/net/taler/merchantlib/Refunds.kt @@ -18,7 +18,7 @@ package net.taler.merchantlib import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -import net.taler.common.Amount +import net.taler.lib.common.Amount @Serializable data class RefundRequest( diff --git a/merchant-lib/src/test/java/net/taler/merchantlib/MerchantApiTest.kt b/merchant-lib/src/test/java/net/taler/merchantlib/MerchantApiTest.kt index 992af6f..1e6a634 100644 --- a/merchant-lib/src/test/java/net/taler/merchantlib/MerchantApiTest.kt +++ b/merchant-lib/src/test/java/net/taler/merchantlib/MerchantApiTest.kt @@ -20,10 +20,10 @@ import io.ktor.http.HttpStatusCode.Companion.NotFound import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.TestCoroutineDispatcher import kotlinx.coroutines.test.runBlockingTest -import net.taler.common.Amount import net.taler.common.ContractProduct import net.taler.common.ContractTerms -import net.taler.common.Timestamp +import net.taler.lib.common.Amount +import net.taler.lib.common.Timestamp import net.taler.merchantlib.MockHttpClient.giveJsonResponse import net.taler.merchantlib.MockHttpClient.httpClient import org.junit.Assert.assertEquals |