4 files changed, 8 insertions, 9 deletions
diff --git a/common/src/commonMain/kotlin/net/taler/common/Amount.kt b/common/src/commonMain/kotlin/net/taler/lib/common/Amount.kt
index 84d10c5..213abb3 100644
--- a/common/src/commonMain/kotlin/net/taler/common/Amount.kt
+++ b/common/src/commonMain/kotlin/net/taler/lib/common/Amount.kt
@@ -14,7 +14,7 @@
  * GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
  */
 
-package net.taler.common
+package net.taler.lib.common
 
 import kotlinx.serialization.Decoder
 import kotlinx.serialization.Encoder
diff --git a/common/src/commonMain/kotlin/net/taler/common/TalerUri.kt b/common/src/commonMain/kotlin/net/taler/lib/common/TalerUri.kt
index 9f121d3..8255dc0 100644
--- a/common/src/commonMain/kotlin/net/taler/common/TalerUri.kt
+++ b/common/src/commonMain/kotlin/net/taler/lib/common/TalerUri.kt
@@ -14,9 +14,9 @@
  * GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
  */
 
-package net.taler.common
+package net.taler.lib.common
 
-internal object TalerUri {
+object TalerUri {
 
     private const val SCHEME = "taler://"
     private const val SCHEME_INSECURE = "taler+http://"
diff --git a/common/src/commonMain/kotlin/net/taler/common/Time.kt b/common/src/commonMain/kotlin/net/taler/lib/common/Time.kt
index 37b6606..0e5e07c 100644
--- a/common/src/commonMain/kotlin/net/taler/common/Time.kt
+++ b/common/src/commonMain/kotlin/net/taler/lib/common/Time.kt
@@ -14,8 +14,9 @@
  * GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
  */
 
-package net.taler.common
+package net.taler.lib.common
 
+import com.soywiz.klock.DateTime
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.builtins.serializer
@@ -24,11 +25,9 @@ import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.JsonTransformingSerializer
 import kotlinx.serialization.json.contentOrNull
 import kotlinx.serialization.json.longOrNull
-import net.taler.common.Duration.Companion.FOREVER
+import net.taler.lib.common.Duration.Companion.FOREVER
 import kotlin.math.max
 
-expect fun nowMillis(): Long
-
 @Serializable
 data class Timestamp(
     @SerialName("t_ms")
@@ -38,7 +37,7 @@ data class Timestamp(
 
     companion object {
         const val NEVER: Long = -1
-        fun now(): Timestamp = Timestamp(nowMillis())
+        fun now(): Timestamp = Timestamp(DateTime.nowUnixLong())
     }
 
     /**
diff --git a/common/src/commonMain/kotlin/net/taler/common/Version.kt b/common/src/commonMain/kotlin/net/taler/lib/common/Version.kt
index 8774115..d3f0ad2 100644
--- a/common/src/commonMain/kotlin/net/taler/common/Version.kt
+++ b/common/src/commonMain/kotlin/net/taler/lib/common/Version.kt
@@ -14,7 +14,7 @@
  * GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
  */
 
-package net.taler.common
+package net.taler.lib.common
 
 import kotlin.math.sign