diff --git a/CHANGELOG.md b/CHANGELOG.md index b52f754..6be0ad7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,24 +2,26 @@ - Date format: YYYY-MM-dd -## 2.3.0 / 2026-05-xx +## 2.3.0 / 2026-08-20 ### All -* Update `Kotlin`'s version to `2.3.21` -* Update `AGP`'s version to `9.2.1`, migrated from `com.android.library` plugin to `com.android.kotlin.multiplatform.library` +* Update `Kotlin`'s version to `2.4.10` +* Update `AGP`'s version to `9.3.1`, migrated from `com.android.library` plugin to `com.android.kotlin.multiplatform.library` * Update `kotlinx.serialization`'s version to `1.11.0` * Update `kotlinx.coroutines`'s version to `1.11.0` * Fix documentation: Android minimum supported version has been `7.0+` (API 24) since `2.0.0`, the README incorrectly stated `6.0+` * **Breaking change**: Drop `iosX64`, `macosX64`, `watchosX64`, and `tvosX64` target support +### sqllin-dsl + ### sqllin-driver -* Update `sqlite-jdbc`'s version to `3.53.1.0` +* Update `sqlite-jdbc`'s version to `3.53.2.1` ### sqllin-processor -* Update `KSP`'s version to `2.3.7` +* Update `KSP`'s version to `2.3.11` ## 2.2.0 / 2025-12-15 diff --git a/ROADMAP.md b/ROADMAP.md index 60759e9..7feef9f 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -1,9 +1,5 @@ # SQLlin Roadmap -## High Priority - -* Support INSERT OR REPLACE - ## Medium Priority * Support WASM platform DSL @@ -20,5 +16,6 @@ ## Supported +* Support INSERT OR REPLACE (2.3.0 ✅) * Support FOREIGN KEY DSL (2.2.0 ✅) * Support CREATE INDEX DSL (2.2.0 ✅) \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 2eafc6c..b206ad9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,6 +17,8 @@ org.gradle.jvmargs=-Xmx8g -XX:MaxMetaspaceSize=16g -XX:+HeapDumpOnOutOfMemoryErr org.gradle.workers.max=16 org.gradle.parallel=true org.gradle.caching=true +# Enabled parallel sync for Gradle 9.4+ +org.gradle.tooling.parallel=true #Android android.useAndroidX=true @@ -31,4 +33,4 @@ kotlin.native.ignoreDisabledTargets=true kotlin.jvm.target.validation.mode=warning kotlin.native.binary.pagedAllocator=false kotlin.native.binary.latin1Strings=true -#kotlin.compiler.execution.strategy=out-of-process \ No newline at end of file +#kotlin.compiler.execution.strategy=out-of-process diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 99ca92a..0886eca 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,18 +1,18 @@ [versions] -kotlin = "2.3.21" -agp = "9.2.1" -ksp = "2.3.7" +kotlin = "2.4.10" +agp = "9.3.1" +ksp = "2.3.11" serialization = "1.11.0" coroutines = "1.11.0" androidx-annotation = "1.10.0" androidx-test = "1.7.0" androidx-test-runner = "1.7.0" -sqlite-jdbc = "3.53.1.0" +sqlite-jdbc = "3.53.2.1" jvm-toolchain = "21" android-sdk-compile = "37" android-sdk-min = "24" -vanniktech-maven-publish = "0.36.0" +vanniktech-maven-publish = "0.37.0" [libraries] diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c1627d7..96052ec 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Mar 08 15:11:46 CST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME \ No newline at end of file diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 3275348..d43f0f6 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -24,7 +24,7 @@ kotlin { iosSimulatorArm64() compilerOptions { - freeCompilerArgs.addAll("-Xexpect-actual-classes", "-Xcontext-parameters") + freeCompilerArgs.addAll("-Xexpect-actual-classes") } sourceSets { @@ -48,9 +48,7 @@ dependencies { afterEvaluate { // WORKAROUND: both register() and named() fail – https://github.com/gradle/gradle/issues/9331 tasks { - withType> { - if (name != "kspCommonMainKotlinMetadata") - dependsOn("kspCommonMainKotlinMetadata") - } + matching { (it is KotlinCompilationTask<*> || it.name.startsWith("ksp")) && it.name != "kspCommonMainKotlinMetadata" } + .configureEach { dependsOn("kspCommonMainKotlinMetadata") } } -} \ No newline at end of file +} diff --git a/sqllin-driver-test/build.gradle.kts b/sqllin-driver-test/build.gradle.kts index ec99121..e71a424 100644 --- a/sqllin-driver-test/build.gradle.kts +++ b/sqllin-driver-test/build.gradle.kts @@ -47,7 +47,7 @@ kotlin { } compilerOptions { - freeCompilerArgs.addAll("-Xexpect-actual-classes", "-Xcontext-parameters") + freeCompilerArgs.addAll("-Xexpect-actual-classes") } sourceSets { diff --git a/sqllin-driver-test/build/konan.txt b/sqllin-driver-test/build/konan.txt deleted file mode 100644 index aaf65fa..0000000 --- a/sqllin-driver-test/build/konan.txt +++ /dev/null @@ -1 +0,0 @@ -/Users/qiaoyuang/.konan/kotlin-native-prebuilt-macos-x86_64-2.3.21 \ No newline at end of file diff --git a/sqllin-driver-test/build/kotlin/commonizedNativeDistributionLocation.txt b/sqllin-driver-test/build/kotlin/commonizedNativeDistributionLocation.txt deleted file mode 100644 index 731dc41..0000000 --- a/sqllin-driver-test/build/kotlin/commonizedNativeDistributionLocation.txt +++ /dev/null @@ -1 +0,0 @@ -/Users/qiaoyuang/.konan/kotlin-native-prebuilt-macos-x86_64-2.3.21/klib/commonized/2.3.21 \ No newline at end of file diff --git a/sqllin-driver/build.gradle.kts b/sqllin-driver/build.gradle.kts index a38cbf1..c410c16 100644 --- a/sqllin-driver/build.gradle.kts +++ b/sqllin-driver/build.gradle.kts @@ -50,7 +50,7 @@ kotlin { } compilerOptions { - freeCompilerArgs.addAll("-Xexpect-actual-classes", "-Xcontext-parameters") + freeCompilerArgs.addAll("-Xexpect-actual-classes") } sourceSets { diff --git a/sqllin-dsl-test/build.gradle.kts b/sqllin-dsl-test/build.gradle.kts index af2c09d..287bdd4 100644 --- a/sqllin-dsl-test/build.gradle.kts +++ b/sqllin-dsl-test/build.gradle.kts @@ -50,7 +50,7 @@ kotlin { } compilerOptions { - freeCompilerArgs.addAll("-Xexpect-actual-classes", "-Xcontext-parameters") + freeCompilerArgs.addAll("-Xexpect-actual-classes") } sourceSets { @@ -109,9 +109,7 @@ dependencies { afterEvaluate { // WORKAROUND: both register() and named() fail – https://github.com/gradle/gradle/issues/9331 tasks { - withType> { - if (name != "kspCommonMainKotlinMetadata") - dependsOn("kspCommonMainKotlinMetadata") - } + matching { (it is KotlinCompilationTask<*> || it.name.startsWith("ksp")) && it.name != "kspCommonMainKotlinMetadata" } + .configureEach { dependsOn("kspCommonMainKotlinMetadata") } } -} \ No newline at end of file +} diff --git a/sqllin-dsl/build.gradle.kts b/sqllin-dsl/build.gradle.kts index 404e88f..a795658 100644 --- a/sqllin-dsl/build.gradle.kts +++ b/sqllin-dsl/build.gradle.kts @@ -47,7 +47,7 @@ kotlin { mingwX64() compilerOptions { - freeCompilerArgs.addAll("-Xexpect-actual-classes", "-Xcontext-parameters") + freeCompilerArgs.addAll("-Xexpect-actual-classes") } sourceSets {