v0.6.8 for Kotlin 1.3.70

plangrid · Mar 4, 2020 · ad0cfef · ad0cfef
1 parent 060fe9d
commit ad0cfef
Show file tree

Hide file tree

Showing 39 changed files with 7 additions and 6 deletions.
diff --git a/KotlinCpp/bcdist/ios_arm32/tlruntime.bc b/KotlinCpp/bcdist/ios_arm32/tlruntime.bc
diff --git a/KotlinCpp/bcdist/ios_arm32/tlruntime/KonanHelper.bc b/KotlinCpp/bcdist/ios_arm32/tlruntime/KonanHelper.bc
diff --git a/KotlinCpp/bcdist/ios_arm32/tlruntime/SQLiteCommon.bc b/KotlinCpp/bcdist/ios_arm32/tlruntime/SQLiteCommon.bc
diff --git a/KotlinCpp/bcdist/ios_arm32/tlruntime/SQLiteConnection.bc b/KotlinCpp/bcdist/ios_arm32/tlruntime/SQLiteConnection.bc
diff --git a/KotlinCpp/bcdist/ios_arm64/tlruntime.bc b/KotlinCpp/bcdist/ios_arm64/tlruntime.bc
diff --git a/KotlinCpp/bcdist/ios_arm64/tlruntime/KonanHelper.bc b/KotlinCpp/bcdist/ios_arm64/tlruntime/KonanHelper.bc
diff --git a/KotlinCpp/bcdist/ios_arm64/tlruntime/SQLiteCommon.bc b/KotlinCpp/bcdist/ios_arm64/tlruntime/SQLiteCommon.bc
diff --git a/KotlinCpp/bcdist/ios_arm64/tlruntime/SQLiteConnection.bc b/KotlinCpp/bcdist/ios_arm64/tlruntime/SQLiteConnection.bc
diff --git a/KotlinCpp/bcdist/ios_x64/tlruntime.bc b/KotlinCpp/bcdist/ios_x64/tlruntime.bc
diff --git a/KotlinCpp/bcdist/ios_x64/tlruntime/KonanHelper.bc b/KotlinCpp/bcdist/ios_x64/tlruntime/KonanHelper.bc
diff --git a/KotlinCpp/bcdist/ios_x64/tlruntime/SQLiteCommon.bc b/KotlinCpp/bcdist/ios_x64/tlruntime/SQLiteCommon.bc
diff --git a/KotlinCpp/bcdist/ios_x64/tlruntime/SQLiteConnection.bc b/KotlinCpp/bcdist/ios_x64/tlruntime/SQLiteConnection.bc
diff --git a/KotlinCpp/bcdist/macos_x64/tlruntime.bc b/KotlinCpp/bcdist/macos_x64/tlruntime.bc
diff --git a/KotlinCpp/bcdist/macos_x64/tlruntime/KonanHelper.bc b/KotlinCpp/bcdist/macos_x64/tlruntime/KonanHelper.bc
diff --git a/KotlinCpp/bcdist/macos_x64/tlruntime/SQLiteCommon.bc b/KotlinCpp/bcdist/macos_x64/tlruntime/SQLiteCommon.bc
diff --git a/KotlinCpp/bcdist/macos_x64/tlruntime/SQLiteConnection.bc b/KotlinCpp/bcdist/macos_x64/tlruntime/SQLiteConnection.bc
diff --git a/KotlinCpp/bcdist/tvos_arm64/tlruntime.bc b/KotlinCpp/bcdist/tvos_arm64/tlruntime.bc
diff --git a/KotlinCpp/bcdist/tvos_arm64/tlruntime/KonanHelper.bc b/KotlinCpp/bcdist/tvos_arm64/tlruntime/KonanHelper.bc
diff --git a/KotlinCpp/bcdist/tvos_arm64/tlruntime/SQLiteCommon.bc b/KotlinCpp/bcdist/tvos_arm64/tlruntime/SQLiteCommon.bc
diff --git a/KotlinCpp/bcdist/tvos_arm64/tlruntime/SQLiteConnection.bc b/KotlinCpp/bcdist/tvos_arm64/tlruntime/SQLiteConnection.bc
diff --git a/KotlinCpp/bcdist/tvos_x64/tlruntime.bc b/KotlinCpp/bcdist/tvos_x64/tlruntime.bc
diff --git a/KotlinCpp/bcdist/tvos_x64/tlruntime/KonanHelper.bc b/KotlinCpp/bcdist/tvos_x64/tlruntime/KonanHelper.bc
diff --git a/KotlinCpp/bcdist/tvos_x64/tlruntime/SQLiteCommon.bc b/KotlinCpp/bcdist/tvos_x64/tlruntime/SQLiteCommon.bc
diff --git a/KotlinCpp/bcdist/tvos_x64/tlruntime/SQLiteConnection.bc b/KotlinCpp/bcdist/tvos_x64/tlruntime/SQLiteConnection.bc
diff --git a/KotlinCpp/bcdist/watchos_arm32/tlruntime.bc b/KotlinCpp/bcdist/watchos_arm32/tlruntime.bc
diff --git a/KotlinCpp/bcdist/watchos_arm32/tlruntime/KonanHelper.bc b/KotlinCpp/bcdist/watchos_arm32/tlruntime/KonanHelper.bc
diff --git a/KotlinCpp/bcdist/watchos_arm32/tlruntime/SQLiteCommon.bc b/KotlinCpp/bcdist/watchos_arm32/tlruntime/SQLiteCommon.bc
diff --git a/KotlinCpp/bcdist/watchos_arm32/tlruntime/SQLiteConnection.bc b/KotlinCpp/bcdist/watchos_arm32/tlruntime/SQLiteConnection.bc
diff --git a/KotlinCpp/bcdist/watchos_arm64/tlruntime.bc b/KotlinCpp/bcdist/watchos_arm64/tlruntime.bc
diff --git a/KotlinCpp/bcdist/watchos_arm64/tlruntime/KonanHelper.bc b/KotlinCpp/bcdist/watchos_arm64/tlruntime/KonanHelper.bc
diff --git a/KotlinCpp/bcdist/watchos_arm64/tlruntime/SQLiteCommon.bc b/KotlinCpp/bcdist/watchos_arm64/tlruntime/SQLiteCommon.bc
diff --git a/KotlinCpp/bcdist/watchos_arm64/tlruntime/SQLiteConnection.bc b/KotlinCpp/bcdist/watchos_arm64/tlruntime/SQLiteConnection.bc
diff --git a/KotlinCpp/bcdist/watchos_x86/tlruntime.bc b/KotlinCpp/bcdist/watchos_x86/tlruntime.bc
diff --git a/KotlinCpp/bcdist/watchos_x86/tlruntime/KonanHelper.bc b/KotlinCpp/bcdist/watchos_x86/tlruntime/KonanHelper.bc
diff --git a/KotlinCpp/bcdist/watchos_x86/tlruntime/SQLiteCommon.bc b/KotlinCpp/bcdist/watchos_x86/tlruntime/SQLiteCommon.bc
diff --git a/KotlinCpp/bcdist/watchos_x86/tlruntime/SQLiteConnection.bc b/KotlinCpp/bcdist/watchos_x86/tlruntime/SQLiteConnection.bc
diff --git a/KotlinCpp/knarch/src/main/cpp/SQLiteCommon.h b/KotlinCpp/knarch/src/main/cpp/SQLiteCommon.h
@@ -30,7 +30,7 @@
 #define SQLITE_PROFILE_TAG "SQLiteTime"
 #define ALOGE(...) knarchLog("ERROR", __VA_ARGS__)
 #define ALOGW(...) knarchLog("WARN", __VA_ARGS__)
-#define ALOGV(...) knarchLog("VERBOSE", __VA_ARGS__)
+#define ALOGV(...) //knarchLog("VERBOSE", __VA_ARGS__) Need a way to turn log levels on/off that doesn't require compiling...
 #define ALOG(tag, ...) knarchLog(tag, __VA_ARGS__)
 
 extern "C" {

diff --git a/SQLiter/build.gradle b/SQLiter/build.gradle
@@ -113,7 +113,8 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                implementation "co.touchlab:stately:$STATELY_VERSION"
+                implementation "co.touchlab:stately-common:$STATELY_VERSION"
+                implementation "co.touchlab:stately-concurrency:$STATELY_VERSION"
                 implementation 'org.jetbrains.kotlin:kotlin-stdlib-common'
             }
         }
@@ -191,7 +192,7 @@ task mergeCppAll(dependsOn:build) {
         mergeCppOutput("macos", "macos_x64")
         mergeCppOutput("watchosArm32", "watchos_arm32")
         mergeCppOutput("watchosArm64", "watchos_arm64")
-        mergeCppOutput("mawatchosX86cos", "watchos_x86")
+        mergeCppOutput("watchosX86", "watchos_x86")
         mergeCppOutput("tvosArm64", "tvos_arm64")
         mergeCppOutput("tvosX64", "tvos_x64")
         mergeCppOutput("mingw", "mingw_x64")

diff --git a/SQLiter/gradle.properties b/SQLiter/gradle.properties
@@ -17,10 +17,10 @@
 kotlin.code.style=official
 
 GROUP=co.touchlab
-VERSION_NAME=0.6.6
+VERSION_NAME=0.6.8
 
-STATELY_VERSION=0.9.5
-KOTLIN_VERSION=1.3.61
+STATELY_VERSION=1.0.0-a2
+KOTLIN_VERSION=1.3.70
 kotlin.native.ignoreDisabledTargets=true
 
 POM_URL=https://github.com/touchlab/SQLiter