Merge branch 'feature/kn-update' into dev

Author: iSoron

.gitignore

@@ -4,6 +4,7 @@
 *.perspectivev3
 *.swp
 *~.nib
+*.hprof
 .DS_Store
 .externalNativeBuild
 .gradle

core/build.gradle

@@ -18,7 +18,7 @@
  */
 
 plugins {
-    id 'kotlin-multiplatform' version '1.3.21'
+    id 'kotlin-multiplatform' version "1.3.72"
 }
 
 repositories {
@@ -32,7 +32,11 @@ kotlin {
         def iosPreset = isIphone ? presets.iosArm64 : presets.iosX64
 
         fromPreset(iosPreset, 'ios') {
-            compilations.main.outputKinds('FRAMEWORK')
+            binaries {
+                framework {
+                    baseName = "LoopHabitTracker"
+                }
+            }
             compilations.main {
                 cinterops {
                     sqlite3 {
@@ -61,7 +65,7 @@ kotlin {
             kotlin { srcDir "src/main/common" }
             dependencies {
                 implementation kotlin('stdlib-common')
-                implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.2.0-alpha-2'
+                implementation "$KX_COROUTINES-core-common:$KX_COROUTINES_VERSION"
             }
         }
 
@@ -77,7 +81,7 @@ kotlin {
             kotlin { srcDir "src/main/jvm" }
             dependencies {
                 implementation kotlin('stdlib-jdk8')
-                implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.0-alpha-2'
+                implementation "$KX_COROUTINES-core:$KX_COROUTINES_VERSION"
             }
         }
 
@@ -94,7 +98,7 @@ kotlin {
             kotlin { srcDir "src/main/js" }
             dependencies {
                 implementation kotlin('stdlib-js')
-                implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.2.0-alpha-2'
+                implementation "$KX_COROUTINES-core-js:$KX_COROUTINES_VERSION"
             }
         }
 
@@ -108,36 +112,25 @@ kotlin {
         iosMain {
             kotlin { srcDir "src/main/ios" }
             dependencies {
-                implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-native:1.2.0-alpha-2'
+                implementation "$KX_COROUTINES-core-native:$KX_COROUTINES_VERSION"
             }
         }
 
         iosTest {
             kotlin { srcDir "src/test/ios" }
             dependencies {
-                implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-native:1.2.0-alpha-2'
+                implementation "$KX_COROUTINES-core-native:$KX_COROUTINES_VERSION"
             }
         }
     }
 
     task iosTestCopyResources(type: Copy) {
-        dependsOn 'linkTestIos'
         from 'assets/test/'
         from 'assets/main/'
-        into 'build/bin/ios/testDebugExecutable'
+        into 'build/bin/ios/debugTest'
     }
 
-    task iosTest {
-        dependsOn 'linkTestIos', 'iosTestCopyResources'
-        group = JavaBasePlugin.VERIFICATION_GROUP
-        description = "Runs tests on iOS simulator"
-
-        doLast {
-            def emulatorName = "iPhone 8 Plus"
-            def binary = kotlin.targets.ios.compilations.test.getBinary('EXECUTABLE', 'DEBUG')
-            exec {
-                commandLine 'xcrun', 'simctl', 'spawn', emulatorName, binary.absolutePath
-            }
-        }
+    if (project.tasks.findByName('iosTest')) {
+        iosTest.dependsOn(iosTestCopyResources)
     }
-}
+}

core/gradle.properties

@@ -0,0 +1,2 @@
+KX_COROUTINES_VERSION=1.3.6
+KX_COROUTINES=org.jetbrains.kotlinx:kotlinx-coroutines

core/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sun Apr 07 10:31:43 CDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip

core/src/main/common/org/isoron/platform/io/Log.kt

@@ -30,14 +30,17 @@ interface Log {
  */
 class StandardLog : Log {
     override fun warn(tag: String, msg: String) {
-        println(sprintf("W %-20s %s", tag, msg))
+        val ftag = format("%-20s", tag)
+        println("W $ftag $msg")
     }
 
     override fun info(tag: String, msg: String) {
-        println(sprintf("I %-20s %s", tag, msg))
+        val ftag = format("%-20s", tag)
+        println("I $ftag $msg")
     }
 
     override fun debug(tag: String, msg: String) {
-        println(sprintf("D %-20s %s", tag, msg))
+        val ftag = format("%-20s", tag)
+        println("D $ftag $msg")
     }
 }

core/src/main/common/org/isoron/platform/io/Strings.kt

@@ -19,4 +19,6 @@
 
 package org.isoron.platform.io
 
-expect fun sprintf(format: String, vararg args: Any?): String
+expect fun format(format: String, arg: String): String
+expect fun format(format: String, arg: Int): String
+expect fun format(format: String, arg: Double): String

core/src/main/common/org/isoron/uhabits/components/NumberButton.kt

@@ -24,22 +24,22 @@ import org.isoron.platform.io.*
 import kotlin.math.*
 
 fun Double.toShortString(): String = when {
-    this >= 1e9 -> sprintf("%.1fG", this / 1e9)
-    this >= 1e8 -> sprintf("%.0fM", this / 1e6)
-    this >= 1e7 -> sprintf("%.1fM", this / 1e6)
-    this >= 1e6 -> sprintf("%.1fM", this / 1e6)
-    this >= 1e5 -> sprintf("%.0fk", this / 1e3)
-    this >= 1e4 -> sprintf("%.1fk", this / 1e3)
-    this >= 1e3 -> sprintf("%.1fk", this / 1e3)
-    this >= 1e2 -> sprintf("%.0f", this)
+    this >= 1e9 -> format("%.1fG", this / 1e9)
+    this >= 1e8 -> format("%.0fM", this / 1e6)
+    this >= 1e7 -> format("%.1fM", this / 1e6)
+    this >= 1e6 -> format("%.1fM", this / 1e6)
+    this >= 1e5 -> format("%.0fk", this / 1e3)
+    this >= 1e4 -> format("%.1fk", this / 1e3)
+    this >= 1e3 -> format("%.1fk", this / 1e3)
+    this >= 1e2 -> format("%.0f", this)
     this >= 1e1 -> when {
-        round(this) == this -> sprintf("%.0f", this)
-        else -> sprintf("%.1f", this)
+        round(this) == this -> format("%.0f", this)
+        else -> format("%.1f", this)
     }
     else -> when {
-        round(this) == this -> sprintf("%.0f", this)
-        round(this * 10) == this * 10 -> sprintf("%.1f", this)
-        else -> sprintf("%.2f", this)
+        round(this) == this -> format("%.0f", this)
+        round(this * 10) == this * 10 -> format("%.1f", this)
+        else -> format("%.2f", this)
     }
 }
 

core/src/main/common/org/isoron/uhabits/components/Ring.kt

@@ -47,7 +47,7 @@ class Ring(val color: Color,
         if(label) {
             canvas.setColor(color)
             canvas.setFontSize(radius * 0.4)
-            canvas.drawText(sprintf("%.0f%%", percentage * 100), width / 2, height / 2)
+            canvas.drawText(format("%.0f%%", percentage * 100), width / 2, height / 2)
         }
     }
 }