Skip to content

Commit d668fd4

Browse files
committed
Kotlin 1.4.0 update
1 parent 1492f41 commit d668fd4

File tree

6 files changed

+17
-15
lines changed

6 files changed

+17
-15
lines changed

SQLiter/gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
kotlin.code.style=official
1818

1919
GROUP=co.touchlab
20-
VERSION_NAME=0.6.9
20+
VERSION_NAME=0.7.0
2121

22-
STATELY_VERSION=1.0.0-a2
23-
KOTLIN_VERSION=1.3.72
22+
STATELY_VERSION=1.1.0
23+
KOTLIN_VERSION=1.4.0
2424
kotlin.native.ignoreDisabledTargets=true
2525

2626
POM_URL=https://github.com/touchlab/SQLiter

SQLiter/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616

1717
distributionBase=GRADLE_USER_HOME
1818
distributionPath=wrapper/dists
19-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
19+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
2020
zipStoreBase=GRADLE_USER_HOME
21-
zipStorePath=wrapper/dists
21+
zipStorePath=wrapper/dists

SQLiter/settings.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,3 @@
1616

1717
rootProject.name = 'sqliter'
1818
enableFeaturePreview('GRADLE_METADATA')
19-
enableFeaturePreview('STABLE_PUBLISHING')

SQLiter/src/nativeCommonTest/kotlin/co/touchlab/sqliter/BaseDatabaseTest.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
package co.touchlab.sqliter
1818

1919
import co.touchlab.sqliter.DatabaseFileContext.deleteDatabase
20-
import kotlin.test.AfterEach
21-
import kotlin.test.BeforeEach
20+
import kotlin.test.AfterTest
21+
import kotlin.test.BeforeTest
2222

2323
abstract class BaseDatabaseTest{
24-
@BeforeEach
24+
@BeforeTest
2525
fun before(){
2626
deleteDatabase(TEST_DB_NAME)
2727
}
2828

29-
@AfterEach
29+
@AfterTest
3030
fun after(){
3131
deleteDatabase(TEST_DB_NAME)
3232
}
33-
}
33+
}

SQLiter/src/nativeCommonTest/kotlin/co/touchlab/sqliter/NativeDatabaseConnectionTest.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,9 @@ class NativeDatabaseConnectionTest : BaseDatabaseTest(){
341341

342342
val conn = manager.createMultiThreadedConnection()
343343
val stmt = conn.createStatement("select * from test")
344+
345+
//FYI: This will log an error, but that's OK. We're doing the logging ourselves.
346+
//ERROR - sqlite3_close(0x[whatever]) failed: 5
344347
assertFails { conn.close() }
345348
assertFalse(conn.closed)
346349
stmt.finalizeStatement()
@@ -397,4 +400,4 @@ class NativeDatabaseConnectionTest : BaseDatabaseTest(){
397400
}, busyTimeout = 30000
398401
)
399402
)
400-
}
403+
}

SQLiter/src/nativeCommonTest/kotlin/co/touchlab/sqliter/cts/DatabaseStatementTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class DatabaseStatementTest{
2727
return false
2828
}
2929

30-
@BeforeEach
30+
@BeforeTest
3131
protected fun setUp() {
3232
DatabaseFileContext.deleteDatabase(DATABASE_NAME)
3333
mDatabase = createDatabaseManager(DatabaseConfiguration(
@@ -37,7 +37,7 @@ class DatabaseStatementTest{
3737
)).surpriseMeConnection()
3838
}
3939

40-
@AfterEach
40+
@AfterTest
4141
protected fun tearDown() {
4242
mDatabase.close()
4343
DatabaseFileContext.deleteDatabase(DATABASE_NAME)
@@ -220,4 +220,4 @@ class DatabaseStatementTest{
220220
private val DATABASE_NAME = "database_test.db"
221221
private val CURRENT_DATABASE_VERSION = 42
222222
}
223-
}
223+
}

0 commit comments

Comments
 (0)