Address the various build warnings across the app after updating to kotlin 1.7.20 Beta

psh · psh · commit eaa619296fd3 · 2022-08-15T17:57:52.000-05:00
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ kotlin.code.style=official
 
 GROUP=co.touchlab
 VERSION_NAME=1.2.0
-KOTLIN_VERSION=1.6.20
+KOTLIN_VERSION=1.7.20-Beta
 
 kotlin.native.ignoreDisabledTargets=true
 
@@ -23,7 +23,5 @@ POM_DEVELOPER_NAME=Kevin Galligan
 POM_DEVELOPER_ORG=Kevin Galligan
 POM_DEVELOPER_URL=https://touchlab.co/
 
-kotlin.mpp.enableGranularSourceSetsMetadata=true
-kotlin.native.enableDependencyPropagation=false
 kotlin.mpp.enableCInteropCommonization=true
 kotlin.mpp.commonizerLogLevel=info
diff --git a/sqliter-driver/src/appleMain/kotlin/co/touchlab/sqliter/DatabaseFileContext.kt b/sqliter-driver/src/appleMain/kotlin/co/touchlab/sqliter/DatabaseFileContext.kt
@@ -18,6 +18,7 @@ package co.touchlab.sqliter
 
 import co.touchlab.sqliter.internal.File
 import co.touchlab.sqliter.internal.FileFilter
+import kotlinx.cinterop.UnsafeNumber
 import platform.Foundation.NSApplicationSupportDirectory
 import platform.Foundation.NSFileManager
 import platform.Foundation.NSSearchPathForDirectoriesInDomains
@@ -34,6 +35,7 @@ actual object DatabaseFileContext{
 
     internal fun databaseDirPath():String = iosDirPath("databases")
 
+    @OptIn(UnsafeNumber::class)
     internal fun iosDirPath(folder:String):String{
         val paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, true);
         val documentsDirectory = paths[0] as String;
diff --git a/sqliter-driver/src/linuxX64Main/kotlin/co/touchlab/sqliter/DatabaseFileContext.kt b/sqliter-driver/src/linuxX64Main/kotlin/co/touchlab/sqliter/DatabaseFileContext.kt
@@ -46,8 +46,8 @@ actual object DatabaseFileContext {
         if (dir != null) {
             val prefix = file.getName() + "-mj"
             val files = dir.listFiles(object : FileFilter {
-                override fun accept(candidate: File): Boolean {
-                    return candidate.getName().startsWith(prefix)
+                override fun accept(pathname: File): Boolean {
+                    return pathname.getName().startsWith(prefix)
                 }
             })
             if (files != null) {
diff --git a/sqliter-driver/src/linuxX64Main/kotlin/co/touchlab/sqliter/internal/File.kt b/sqliter-driver/src/linuxX64Main/kotlin/co/touchlab/sqliter/internal/File.kt
@@ -330,7 +330,7 @@ internal actual class File(dirPath: String? = null, name: String) {
         }
         val result = ArrayList<String>(filenames.size)
         for (filename in filenames) {
-            if (filter!!.accept(this, filename)) {
+            if (filter.accept(this, filename)) {
                 result.add(filename)
             }
         }
@@ -389,7 +389,7 @@ internal actual class File(dirPath: String? = null, name: String) {
         }
         val result = ArrayList<File>(files.size)
         for (file in files) {
-            if (filter!!.accept(file)) {
+            if (filter.accept(file)) {
                 result.add(file)
             }
         }
@@ -407,10 +407,8 @@ internal actual class File(dirPath: String? = null, name: String) {
             return null
         }
         val count = filenames.size
-        val result = arrayOfNulls<File>(count)
 
-        val files = Array<File>(count, { i -> File(this, filenames[i]) })
-        return files
+        return Array(count) { i -> File(this, filenames[i]) }
     }
 
     /**
@@ -454,6 +452,7 @@ internal actual class File(dirPath: String? = null, name: String) {
         return mkdirs(false)
     }
 
+    @Suppress("UNUSED_PARAMETER")
     private fun mkdirs(resultIfExists: Boolean): Boolean {
         /* If the terminal directory already exists, answer false */
         if (exists()) {
diff --git a/sqliter-driver/src/mingwMain/kotlin/co/touchlab/sqliter/DatabaseFileContext.kt b/sqliter-driver/src/mingwMain/kotlin/co/touchlab/sqliter/DatabaseFileContext.kt
@@ -28,8 +28,8 @@ actual object DatabaseFileContext {
         if (dir != null) {
             val prefix = file.getName() + "-mj"
             val files = dir.listFiles(object: FileFilter {
-                override fun accept(candidate: File):Boolean {
-                    return candidate.getName().startsWith(prefix)
+                override fun accept(pathname: File):Boolean {
+                    return pathname.getName().startsWith(prefix)
                 }
             })
             if (files != null) {
diff --git a/sqliter-driver/src/mingwMain/kotlin/co/touchlab/sqliter/internal/Utils.kt b/sqliter-driver/src/mingwMain/kotlin/co/touchlab/sqliter/internal/Utils.kt
@@ -2,6 +2,7 @@ package co.touchlab.sqliter.internal
 
 import kotlinx.cinterop.allocArray
 import kotlinx.cinterop.memScoped
+import kotlinx.cinterop.sizeOf
 import kotlinx.cinterop.toKString
 import platform.windows.GetEnvironmentVariableW
 import platform.windows.WCHARVar
@@ -14,9 +15,9 @@ internal class Utils {
             return getEnvironmentVariable("USERPROFILE")
         }
 
-        fun getEnvironmentVariable(variable: String): String {
+        private fun getEnvironmentVariable(variable: String): String {
             return memScoped {
-                val size = 1024 * WCHARVar.size
+                val size = 1024 * sizeOf<WCHARVar>()
                 val pointer = allocArray<WCHARVar>(size)
                 GetEnvironmentVariableW(variable, pointer, size.toUInt())
                 pointer.toKString()
diff --git a/sqliter-driver/src/nativeCommonMain/kotlin/co/touchlab/sqliter/concurrency/SingleThreadDatabaseConnection.kt b/sqliter-driver/src/nativeCommonMain/kotlin/co/touchlab/sqliter/concurrency/SingleThreadDatabaseConnection.kt
@@ -17,12 +17,11 @@
 package co.touchlab.sqliter.concurrency
 
 import co.touchlab.sqliter.DatabaseConnection
-import kotlin.native.concurrent.ensureNeverFrozen
+import co.touchlab.sqliter.util.ensureNeverFrozenIfStrictMM
 
 internal class SingleThreadDatabaseConnection(delegateConnection: DatabaseConnection):DatabaseConnection by delegateConnection
 {
     init {
-        if (Platform.memoryModel == MemoryModel.STRICT)
-            ensureNeverFrozen()
+        ensureNeverFrozenIfStrictMM()
     }
 }
diff --git a/sqliter-driver/src/nativeCommonMain/kotlin/co/touchlab/sqliter/util/Functions.kt b/sqliter-driver/src/nativeCommonMain/kotlin/co/touchlab/sqliter/util/Functions.kt
@@ -1,9 +1,17 @@
 package co.touchlab.sqliter.util
 
+import kotlin.native.concurrent.ensureNeverFrozen
 import kotlin.native.concurrent.freeze
 
+@OptIn(FreezingIsDeprecated::class)
 internal inline fun <T> T.maybeFreeze(): T = if (Platform.memoryModel == MemoryModel.STRICT) {
     this.freeze()
 } else {
     this
+}
+
+@OptIn(FreezingIsDeprecated::class)
+internal inline fun <T> T.ensureNeverFrozenIfStrictMM() {
+    if (Platform.memoryModel == MemoryModel.STRICT)
+        this?.ensureNeverFrozen()
 }
diff --git a/sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/NativeDatabaseConnectionTest.kt b/sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/NativeDatabaseConnectionTest.kt
@@ -16,6 +16,7 @@
 
 package co.touchlab.sqliter
 
+import co.touchlab.sqliter.util.maybeFreeze
 import platform.posix.usleep
 import kotlin.native.concurrent.*
 import kotlin.system.getTimeMillis
@@ -77,7 +78,7 @@ class NativeDatabaseConnectionTest : BaseDatabaseTest(){
         val workers = Array(10) { Worker.start() }
         val futures = mutableListOf<Future<Unit>>()
         workers.forEach {
-            futures.add(it.execute(TransferMode.SAFE, { ManagerOps(manager, biginsert, bigselect).freeze() }) {
+            futures.add(it.execute(TransferMode.SAFE, { ManagerOps(manager, biginsert, bigselect).maybeFreeze() }) {
                 val conn = it.manager.surpriseMeConnection()
                 try {
                     for (i in 0 until 10) {
@@ -402,7 +403,7 @@ class NativeDatabaseConnectionTest : BaseDatabaseTest(){
 
         val workers = (0 until 20).map { Worker.start(errorReporting = true, name = "Test Worker $it") }
         val futures = workers.map { worker ->
-            worker.execute(TransferMode.SAFE, { config2.freeze() }) {
+            worker.execute(TransferMode.SAFE, { config2.maybeFreeze() }) {
                 val managerInner = createDatabaseManager(it)
                 val conn = managerInner.createMultiThreadedConnection()
                 conn.close()
@@ -419,7 +420,7 @@ class NativeDatabaseConnectionTest : BaseDatabaseTest(){
     private fun threadWait(time: Int, manager: DatabaseManager, block: (DatabaseConnection) -> Unit): Boolean {
         return manager.withConnection {
             val worker = Worker.start()
-            val future = worker.execute(TransferMode.SAFE, { Pair(manager, block).freeze() }) {
+            val future = worker.execute(TransferMode.SAFE, { Pair(manager, block).maybeFreeze() }) {
                 try {
                     usleep(500_000u)
                     it.first.withConnection(it.second)
diff --git a/sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/TestSupport.kt b/sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/TestSupport.kt
@@ -16,16 +16,16 @@
 
 package co.touchlab.sqliter
 
+import co.touchlab.sqliter.util.maybeFreeze
 import kotlin.native.concurrent.Future
 import kotlin.native.concurrent.TransferMode
 import kotlin.native.concurrent.Worker
-import kotlin.native.concurrent.freeze
 import kotlin.system.getTimeMillis
 
 class MPWorker(){
     val worker = Worker.start()
     fun <T> runBackground(backJob: () -> T): MPFuture<T> {
-        return MPFuture(worker.execute(TransferMode.SAFE, {backJob.freeze()}){
+        return MPFuture(worker.execute(TransferMode.SAFE, {backJob.maybeFreeze()}){
             it()
         })
     }
@@ -61,7 +61,7 @@ class ThreadOps<C>(val producer:()->C){
             tests.shuffle()
         }
 
-        exes.freeze()
+        exes.maybeFreeze()
 
         val start = currentTimeMillis()
 
diff --git a/sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/concurrency/ConcurrentDatabaseConnectionTest.kt b/sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/concurrency/ConcurrentDatabaseConnectionTest.kt
@@ -17,7 +17,7 @@
 package co.touchlab.sqliter.concurrency
 
 import co.touchlab.sqliter.*
-import kotlin.native.concurrent.freeze
+import co.touchlab.sqliter.util.maybeFreeze
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFails
@@ -78,7 +78,7 @@ class ConcurrentDatabaseConnectionTest {
         basicTestDb(TWO_COL) {
             val conn = it.createSingleThreadedConnection()
             try {
-                assertFails { conn.freeze() }
+                assertFails { conn.maybeFreeze() }
             } catch (assertion: AssertionError) {
                 throw assertion
             } finally {

Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ internal actual class File(dirPath: String? = null, name: String) {`
`330`	`330`	`}`
`331`	`331`	`val result = ArrayList<String>(filenames.size)`
`332`	`332`	`for (filename in filenames) {`
`333`		`- if (filter!!.accept(this, filename)) {`
	`333`	`+ if (filter.accept(this, filename)) {`
`334`	`334`	`result.add(filename)`
`335`	`335`	`}`
`336`	`336`	`}`
`@@ -389,7 +389,7 @@ internal actual class File(dirPath: String? = null, name: String) {`
`389`	`389`	`}`
`390`	`390`	`val result = ArrayList<File>(files.size)`
`391`	`391`	`for (file in files) {`
`392`		`- if (filter!!.accept(file)) {`
	`392`	`+ if (filter.accept(file)) {`
`393`	`393`	`result.add(file)`
`394`	`394`	`}`
`395`	`395`	`}`
`@@ -407,10 +407,8 @@ internal actual class File(dirPath: String? = null, name: String) {`
`407`	`407`	`return null`
`408`	`408`	`}`
`409`	`409`	`val count = filenames.size`
`410`		`- val result = arrayOfNulls<File>(count)`
`411`	`410`
`412`		`- val files = Array<File>(count, { i -> File(this, filenames[i]) })`
`413`		`- return files`
	`411`	`+ return Array(count) { i -> File(this, filenames[i]) }`
`414`	`412`	`}`
`415`	`413`
`416`	`414`	`/**`
`@@ -454,6 +452,7 @@ internal actual class File(dirPath: String? = null, name: String) {`
`454`	`452`	`return mkdirs(false)`
`455`	`453`	`}`
`456`	`454`
	`455`	`+ @Suppress("UNUSED_PARAMETER")`
`457`	`456`	`private fun mkdirs(resultIfExists: Boolean): Boolean {`
`458`	`457`	`/* If the terminal directory already exists, answer false */`
`459`	`458`	`if (exists()) {`
Original file line number	Diff line number	Diff line change
`@@ -17,12 +17,11 @@`
`17`	`17`	`package co.touchlab.sqliter.concurrency`
`18`	`18`
`19`	`19`	`import co.touchlab.sqliter.DatabaseConnection`
`20`		`-import kotlin.native.concurrent.ensureNeverFrozen`
	`20`	`+import co.touchlab.sqliter.util.ensureNeverFrozenIfStrictMM`
`21`	`21`
`22`	`22`	`internal class SingleThreadDatabaseConnection(delegateConnection: DatabaseConnection):DatabaseConnection by delegateConnection`
`23`	`23`	`{`
`24`	`24`	`init {`
`25`		`- if (Platform.memoryModel == MemoryModel.STRICT)`
`26`		`- ensureNeverFrozen()`
	`25`	`+ ensureNeverFrozenIfStrictMM()`
`27`	`26`	`}`
`28`	`27`	`}`