From 8815105bf2462787885214a12af927d484226f21 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 30 Jul 2020 16:40:23 -0300
Subject: Split out common code into multiplatform Kotlin library

---
 merchant-lib/.gitlab-ci.yml                                         | 1 +
 merchant-lib/build.gradle                                           | 2 +-
 merchant-lib/src/main/java/net/taler/merchantlib/Response.kt        | 3 +--
 merchant-lib/src/test/java/net/taler/merchantlib/MerchantApiTest.kt | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'merchant-lib')

diff --git a/merchant-lib/.gitlab-ci.yml b/merchant-lib/.gitlab-ci.yml
index 62a7516..8f7c7c2 100644
--- a/merchant-lib/.gitlab-ci.yml
+++ b/merchant-lib/.gitlab-ci.yml
@@ -2,6 +2,7 @@ merchant_lib_test:
   stage: test
   only:
     changes:
+      - taler-kotlin-common/**/*
       - merchant-lib/**/*
       - build.gradle
   script: ./gradlew :merchant-lib:check
diff --git a/merchant-lib/build.gradle b/merchant-lib/build.gradle
index 128f4c1..33e8379 100644
--- a/merchant-lib/build.gradle
+++ b/merchant-lib/build.gradle
@@ -45,7 +45,7 @@ android {
 }
 
 dependencies {
-    api project(":taler-kotlin-common")
+    api project(":taler-kotlin-android")
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
diff --git a/merchant-lib/src/main/java/net/taler/merchantlib/Response.kt b/merchant-lib/src/main/java/net/taler/merchantlib/Response.kt
index 9aefa5f..65a12a9 100644
--- a/merchant-lib/src/main/java/net/taler/merchantlib/Response.kt
+++ b/merchant-lib/src/main/java/net/taler/merchantlib/Response.kt
@@ -16,7 +16,6 @@
 
 package net.taler.merchantlib
 
-import android.util.Log
 import io.ktor.client.call.receive
 import io.ktor.client.features.ClientRequestException
 import io.ktor.client.features.ResponseException
@@ -32,7 +31,7 @@ class Response<out T> private constructor(
             return try {
                 success(request())
             } catch (e: Throwable) {
-                Log.e("merchant-lib", "Error", e)
+                println(e)
                 failure(e)
             }
         }
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 ea5a12a..deed81e 100644
--- a/merchant-lib/src/test/java/net/taler/merchantlib/MerchantApiTest.kt
+++ b/merchant-lib/src/test/java/net/taler/merchantlib/MerchantApiTest.kt
@@ -113,6 +113,7 @@ class MerchantApiTest {
         val unpaidResponse = CheckPaymentResponse.Unpaid(false, "http://taler.net/foo")
         httpClient.giveJsonResponse("http://example.net/instances/testInstance/private/orders/$orderId") {
             """{
+                "order_status": "unpaid",
                 "paid": ${unpaidResponse.paid},
                 "taler_pay_uri": "${unpaidResponse.talerPayUri}"
             }""".trimIndent()
-- 
cgit v1.2.3