Use unique module names (#128)

toxicity-io · Oct 24, 2024 · 270fc22 · 270fc22
1 parent 52c63ef
commit 270fc22
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -409,8 +409,8 @@ I'm guessing this is not really a factor on iOS."
 <!-- TAG_DEPENDENCIES -->
 [badge-kotlin]: https://img.shields.io/badge/kotlin-1.9.24-blue.svg?logo=kotlin
 [badge-coroutines]: https://img.shields.io/badge/coroutines-1.8.1-blue.svg?logo=kotlin
-[badge-encoding]: https://img.shields.io/badge/encoding-2.2.1-blue.svg?style=flat
-[badge-immutable]: https://img.shields.io/badge/immutable-0.1.3-blue.svg?style=flat
+[badge-encoding]: https://img.shields.io/badge/encoding-2.2.2-blue.svg?style=flat
+[badge-immutable]: https://img.shields.io/badge/immutable-0.1.4-blue.svg?style=flat
 [badge-sqldelight]: https://img.shields.io/badge/SQLDelight-2.0.2-blue.svg?style=flat
 [badge-sqlite]: https://img.shields.io/badge/SQLite3-3.47.0-blue.svg?style=flat
 [badge-sqlitemc]: https://img.shields.io/badge/SQLite3MultipleCiphers-1.9.0-blue.svg?style=flat

diff --git a/build-logic/src/main/kotlin/-KmpConfigurationExtension.kt b/build-logic/src/main/kotlin/-KmpConfigurationExtension.kt
@@ -25,6 +25,10 @@ fun KmpConfigurationExtension.configureShared(
     action: (Action<KmpConfigurationContainerDsl>)? = null,
 ) {
     configure {
+        options {
+            useUniqueModuleNames = true
+        }
+
         jvm {
             kotlinJvmTarget = JavaVersion.VERSION_1_8
             compileSourceCompatibility = JavaVersion.VERSION_1_8
@@ -59,7 +63,7 @@ fun KmpConfigurationExtension.configureShared(
 fun KmpConfigurationContainerDsl.androidLibrary(
     namespace: String,
     buildTools: String? = "34.0.0",
-    compileSdk: Int = 33,
+    compileSdk: Int = 34,
     minSdk: Int = 21,
     javaVersion: JavaVersion = JavaVersion.VERSION_1_8,
     action: (Action<TargetAndroidContainer.Library>)? = null,

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,19 +1,19 @@
 [versions]
-androidx-startup = "1.1.1"
-androidx-test-core = "1.5.0"
-androidx-test-runner = "1.5.2"
+androidx-startup = "1.2.0"
+androidx-test-core = "1.6.1"
+androidx-test-runner = "1.6.2"
 
-encoding = "2.2.1"
+encoding = "2.2.2"
 
 gradle-android = "8.2.2"
-gradle-binary-compat = "0.14.0"
+gradle-binary-compat = "0.16.3"
 gradle-build-config = "4.1.2"
 gradle-cklib = "0.3.1"
-gradle-kmp-configuration = "0.2.2"
+gradle-kmp-configuration = "0.3.2"
 gradle-kotlin = "1.9.24"
-gradle-maven-publish = "0.28.0"
+gradle-maven-publish = "0.30.0"
 
-immutable = "0.1.3"
+immutable = "0.1.4"
 
 kotlinx-coroutines = "1.8.1"
 

diff --git a/library/driver/api/android/driver.api b/library/driver/api/android/driver.api
@@ -20,8 +20,6 @@ public abstract class io/toxicity/sqlite/mc/driver/PlatformDriver : app/cash/sql
 	public final fun beginTransaction (Ljava/sql/Connection;)V
 	public final fun close ()V
 	public final fun closeConnection (Ljava/sql/Connection;)V
-	public static final synthetic fun create$driver_release (Lio/toxicity/sqlite/mc/driver/config/FactoryConfig;Lio/toxicity/sqlite/mc/driver/EphemeralOpt;)Lio/toxicity/sqlite/mc/driver/PlatformDriver$Companion$Args;
-	public static final synthetic fun create$driver_release (Lio/toxicity/sqlite/mc/driver/config/FactoryConfig;Ljava/util/Map;Ljava/util/Map;)Lio/toxicity/sqlite/mc/driver/PlatformDriver$Companion$Args;
 	public final fun currentTransaction ()Lapp/cash/sqldelight/Transacter$Transaction;
 	public final fun endTransaction (Ljava/sql/Connection;)V
 	public final fun execute (Ljava/lang/Integer;Ljava/lang/String;ILkotlin/jvm/functions/Function1;)Lapp/cash/sqldelight/db/QueryResult;
@@ -126,7 +124,6 @@ public final class io/toxicity/sqlite/mc/driver/config/FilesystemConfig$Companio
 public abstract class io/toxicity/sqlite/mc/driver/config/MCPragma {
 	public final field name Ljava/lang/String;
 	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lio/toxicity/sqlite/mc/driver/config/MCPragma$Transformer;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public static final synthetic fun getALL$driver_release ()Ljava/util/Set;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -453,8 +450,6 @@ public abstract class io/toxicity/sqlite/mc/driver/config/encryption/MCCipherCon
 	public final field legacy I
 	public final field legacyPageSize I
 	public synthetic fun <init> (Lio/toxicity/sqlite/mc/driver/config/encryption/Cipher;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public static final fun checkKdfIter$driver_release (I)V
-	public static final fun checkLegacyPageSize$driver_release (I)V
 	public final fun equals (Ljava/lang/Object;)Z
 	public final fun hashCode ()I
 	public final fun toString ()Ljava/lang/String;

diff --git a/library/driver/api/jvm/driver.api b/library/driver/api/jvm/driver.api
@@ -20,8 +20,6 @@ public abstract class io/toxicity/sqlite/mc/driver/PlatformDriver : app/cash/sql
 	public final fun beginTransaction (Ljava/sql/Connection;)V
 	public final fun close ()V
 	public final fun closeConnection (Ljava/sql/Connection;)V
-	public static final synthetic fun create$driver (Lio/toxicity/sqlite/mc/driver/config/FactoryConfig;Lio/toxicity/sqlite/mc/driver/EphemeralOpt;)Lio/toxicity/sqlite/mc/driver/PlatformDriver$Companion$Args;
-	public static final synthetic fun create$driver (Lio/toxicity/sqlite/mc/driver/config/FactoryConfig;Ljava/util/Map;Ljava/util/Map;)Lio/toxicity/sqlite/mc/driver/PlatformDriver$Companion$Args;
 	public final fun currentTransaction ()Lapp/cash/sqldelight/Transacter$Transaction;
 	public final fun endTransaction (Ljava/sql/Connection;)V
 	public final fun execute (Ljava/lang/Integer;Ljava/lang/String;ILkotlin/jvm/functions/Function1;)Lapp/cash/sqldelight/db/QueryResult;
@@ -122,7 +120,6 @@ public final class io/toxicity/sqlite/mc/driver/config/FilesystemConfig$Companio
 public abstract class io/toxicity/sqlite/mc/driver/config/MCPragma {
 	public final field name Ljava/lang/String;
 	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lio/toxicity/sqlite/mc/driver/config/MCPragma$Transformer;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public static final synthetic fun getALL$driver ()Ljava/util/Set;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -449,8 +446,6 @@ public abstract class io/toxicity/sqlite/mc/driver/config/encryption/MCCipherCon
 	public final field legacy I
 	public final field legacyPageSize I
 	public synthetic fun <init> (Lio/toxicity/sqlite/mc/driver/config/encryption/Cipher;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public static final fun checkKdfIter$driver (I)V
-	public static final fun checkLegacyPageSize$driver (I)V
 	public final fun equals (Ljava/lang/Object;)Z
 	public final fun hashCode ()I
 	public final fun toString ()Ljava/lang/String;

diff --git a/library/driver/src/commonMain/kotlin/io/toxicity/sqlite/mc/driver/PlatformDriver.kt b/library/driver/src/commonMain/kotlin/io/toxicity/sqlite/mc/driver/PlatformDriver.kt
@@ -25,7 +25,6 @@ import app.cash.sqldelight.db.SqlDriver
 import app.cash.sqldelight.db.SqlPreparedStatement
 import io.toxicity.sqlite.mc.driver.config.*
 import io.toxicity.sqlite.mc.driver.config.MutableMCPragmas
-import kotlin.jvm.JvmStatic
 import kotlin.jvm.JvmSynthetic
 
 public expect sealed class PlatformDriver(args: Args): SqlDriver {
@@ -55,12 +54,10 @@ public expect sealed class PlatformDriver(args: Args): SqlDriver {
 
     protected companion object {
 
-        @JvmStatic
         @JvmSynthetic
         @Throws(IllegalArgumentException::class, IllegalStateException::class)
         internal fun FactoryConfig.create(keyPragma: MutableMCPragmas, rekeyPragma: MutableMCPragmas?): Args
 
-        @JvmStatic
         @JvmSynthetic
         @Throws(IllegalStateException::class)
         internal fun FactoryConfig.create(opt: EphemeralOpt): Args

diff --git a/library/driver/src/commonMain/kotlin/io/toxicity/sqlite/mc/driver/config/MCPragma.kt b/library/driver/src/commonMain/kotlin/io/toxicity/sqlite/mc/driver/config/MCPragma.kt
@@ -20,12 +20,10 @@ package io.toxicity.sqlite.mc.driver.config
 import app.cash.sqldelight.db.SqlCursor
 import io.matthewnelson.immutable.collections.immutableSetOf
 import io.matthewnelson.immutable.collections.toImmutableList
-import io.matthewnelson.immutable.collections.toImmutableSet
 import io.toxicity.sqlite.mc.driver.MCConfigDsl
 import io.toxicity.sqlite.mc.driver.config.encryption.*
 import io.toxicity.sqlite.mc.driver.internal.ext.buildMCConfigSQL
 import kotlin.jvm.JvmField
-import kotlin.jvm.JvmStatic
 import kotlin.jvm.JvmSynthetic
 
 public abstract class MCPragma<FieldType: Any> private constructor(
@@ -130,7 +128,6 @@ public abstract class MCPragma<FieldType: Any> private constructor(
 
     internal companion object {
 
-        @JvmStatic
         @get:JvmSynthetic
         internal val ALL: Set<MCPragma<*>> by lazy {
             immutableSetOf(

diff --git a/...er/src/commonMain/kotlin/io/toxicity/sqlite/mc/driver/config/encryption/MCCipherConfig.kt b/...er/src/commonMain/kotlin/io/toxicity/sqlite/mc/driver/config/encryption/MCCipherConfig.kt
@@ -22,7 +22,6 @@ import io.toxicity.sqlite.mc.driver.config.MCPragma
 import io.toxicity.sqlite.mc.driver.config.MutableMCPragmas
 import io.toxicity.sqlite.mc.driver.internal.ext.appendColon
 import kotlin.jvm.JvmField
-import kotlin.jvm.JvmStatic
 import kotlin.jvm.JvmSynthetic
 
 public sealed class MCCipherConfig(
@@ -324,7 +323,6 @@ public sealed class MCCipherConfig(
 
     protected companion object {
 
-        @JvmStatic
         @Suppress("NOTHING_TO_INLINE")
         @Throws(IllegalArgumentException::class)
         internal inline fun Int.checkLegacyPageSize() {
@@ -337,7 +335,6 @@ public sealed class MCCipherConfig(
             }
         }
 
-        @JvmStatic
         @Suppress("NOTHING_TO_INLINE")
         @Throws(IllegalArgumentException::class)
         internal inline fun Int.checkKdfIter() {

diff --git a/library/driver/src/jvmAndroidMain/kotlin/io/toxicity/sqlite/mc/driver/PlatformDriver.kt b/library/driver/src/jvmAndroidMain/kotlin/io/toxicity/sqlite/mc/driver/PlatformDriver.kt
@@ -112,7 +112,6 @@ public actual sealed class PlatformDriver actual constructor(private val args: A
 
     protected actual companion object {
 
-        @JvmStatic
         @JvmSynthetic
         @Throws(IllegalArgumentException::class, IllegalStateException::class)
         internal actual fun FactoryConfig.create(keyPragma: MutableMCPragmas, rekeyPragma: MutableMCPragmas?): Args {
@@ -140,7 +139,6 @@ public actual sealed class PlatformDriver actual constructor(private val args: A
             return Args(properties, driver, logger?.let { LogSqliteDriver(driver, it) })
         }
 
-        @JvmStatic
         @JvmSynthetic
         @Throws(IllegalStateException::class)
         internal actual fun FactoryConfig.create(opt: EphemeralOpt): Args {