Skip to content

Commit 78e8975

Browse files
committed
Merge branch 'sellmair-kotlin160m1' into main
2 parents 286784f + 9be19cb commit 78e8975

File tree

8 files changed

+6
-33
lines changed

8 files changed

+6
-33
lines changed

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ allprojects {
44
mavenCentral()
55
google()
66
jcenter()
7+
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
78
}
89
}

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
kotlin.code.style=official
22

33
GROUP=co.touchlab
4-
VERSION_NAME=1.1.1
5-
KOTLIN_VERSION=1.6.20-RC2
4+
VERSION_NAME=1.1.2
5+
KOTLIN_VERSION=1.6.20
66

77
kotlin.native.ignoreDisabledTargets=true
88

sqliter-driver/src/appleMain/kotlin/co/touchlab/sqliter/util/usleep.kt

Lines changed: 0 additions & 5 deletions
This file was deleted.

sqliter-driver/src/linuxX64Main/kotlin/co/touchlab/sqliter/util/usleep.kt

Lines changed: 0 additions & 8 deletions
This file was deleted.

sqliter-driver/src/mingwMain/kotlin/co/touchlab/sqliter/util/usleep.kt

Lines changed: 0 additions & 8 deletions
This file was deleted.

sqliter-driver/src/nativeCommonMain/kotlin/co/touchlab/sqliter/interop/ActualSqliteStatement.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package co.touchlab.sqliter.interop
22

33
import kotlinx.cinterop.*
44
import co.touchlab.sqliter.sqlite3.*
5-
import co.touchlab.sqliter.util.usleep
5+
import platform.posix.usleep
66

77
expect inline fun bytesToString(bv:CPointer<ByteVar>):String
88

@@ -54,7 +54,7 @@ internal class ActualSqliteStatement(private val db: SqliteDatabase, private val
5454
} else if (err == SQLITE_LOCKED || err == SQLITE_BUSY) {
5555
// The table is locked, retry
5656
traceLogCallback("Database locked, retrying")
57-
usleep(1000u);
57+
usleep(1000u)
5858
} else {
5959
throw sqlException(db.logger, db.config, "sqlite3_step failed", err)
6060
}

sqliter-driver/src/nativeCommonMain/kotlin/co/touchlab/sqliter/util/usleep.kt

Lines changed: 0 additions & 7 deletions
This file was deleted.

sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/NativeDatabaseConnectionTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package co.touchlab.sqliter
1818

19-
import co.touchlab.sqliter.util.usleep
19+
import platform.posix.usleep
2020
import kotlin.native.concurrent.*
2121
import kotlin.system.getTimeMillis
2222
import kotlin.test.*

0 commit comments

Comments
 (0)