From e1bf01a758e7491ec47c32068a67ce752623176e Mon Sep 17 00:00:00 2001 From: Alexander Ioffe Date: Thu, 26 Jun 2025 00:18:58 -0400 Subject: [PATCH] Bump to 2.2.0 --- README.md | 18 +++++++++--------- build.gradle.kts | 10 +++++----- controller-android/build.gradle.kts | 8 +++++--- controller-core/build.gradle.kts | 2 +- controller-jdbc/build.gradle.kts | 4 ++-- controller-native/build.gradle.kts | 2 +- scripts/start.sh | 2 +- terpal-sql-android/build.gradle.kts | 10 ++++++---- terpal-sql-core-testing/build.gradle.kts | 4 ++-- terpal-sql-core/build.gradle.kts | 4 ++-- terpal-sql-jdbc/build.gradle.kts | 5 ++--- terpal-sql-native/build.gradle.kts | 4 ++-- 12 files changed, 38 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 5582fee..461866b 100644 --- a/README.md +++ b/README.md @@ -75,9 +75,9 @@ When using JDBC, add the following to your `build.gradle.kts` file: ```kotlin plugins { - kotlin("jvm") version "2.1.0" // Currently the plugin is only available for Kotlin-JVM - id("io.exoquery.terpal-plugin") version "2.1.0-2.0.0.PL" - kotlin("plugin.serialization") version "2.1.0" + kotlin("jvm") version "2.2.0" // Currently the plugin is only available for Kotlin-JVM + id("io.exoquery.terpal-plugin") version "2.2.0-2.0.0.PL" + kotlin("plugin.serialization") version "2.2.0" } dependencies { @@ -116,9 +116,9 @@ For Android development, add the following to your `build.gradle.kts` file: ```kotlin plugins { - kotlin("android") version "2.1.0" - id("io.exoquery.terpal-plugin") version "2.1.0-2.0.0.PL" - kotlin("plugin.serialization") version "2.1.0" + kotlin("android") version "2.2.0" + id("io.exoquery.terpal-plugin") version "2.2.0-2.0.0.PL" + kotlin("plugin.serialization") version "2.2.0" } dependencies { @@ -192,9 +192,9 @@ val person: List = Sql("SELECT * FROM Person").queryOf().runOn(c For iOS, OSX, Linux and Windows development, with Kotlin Multiplatform, add the following to your `build.gradle.kts` file: ```kotlin plugins { - kotlin("multiplatform") version "2.1.0" - id("io.exoquery.terpal-plugin") version "2.1.0-2.0.0.PL" - kotlin("plugin.serialization") version "2.1.0" + kotlin("multiplatform") version "2.2.0" + id("io.exoquery.terpal-plugin") version "2.2.0-2.0.0.PL" + kotlin("plugin.serialization") version "2.2.0" } kotlin { diff --git a/build.gradle.kts b/build.gradle.kts index 457003b..37a0ee0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,9 +1,9 @@ plugins { `maven-publish` signing - kotlin("jvm") version "2.1.0" apply false + kotlin("jvm") version "2.2.0" apply false id("io.github.gradle-nexus.publish-plugin") version "1.1.0" apply false - kotlin("multiplatform") version "2.1.0" apply false + kotlin("multiplatform") version "2.2.0" apply false id("com.android.library") version "8.2.0" apply false id("org.jetbrains.dokka") version "1.9.10" apply false } @@ -85,9 +85,9 @@ subprojects { artifact(javadocJar) pom { - name.set("decomat") - description.set("DecoMat - Deconstructive Pattern Matching for Kotlin") - url.set("https://github.com/exoquery/decomat") + name.set("terpal-sql") + description.set("Safe and fun SQL buliding with interpolated strings in Kotlin") + url.set("https://github.com/exoquery/terpal-sql") licenses { license { diff --git a/controller-android/build.gradle.kts b/controller-android/build.gradle.kts index 94a72ad..9a7e177 100644 --- a/controller-android/build.gradle.kts +++ b/controller-android/build.gradle.kts @@ -8,7 +8,7 @@ plugins { id("conventions") kotlin("multiplatform") id("com.android.library") - kotlin("plugin.serialization") version "2.1.0" + kotlin("plugin.serialization") version "2.2.0" // Already on the classpath //id("org.jetbrains.kotlin.android") version "1.9.23" } @@ -39,8 +39,10 @@ kotlin { androidTarget { compilations.all { - kotlinOptions { - jvmTarget = "17" + compileTaskProvider { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_17) + } } } publishLibraryVariants("release", "debug") diff --git a/controller-core/build.gradle.kts b/controller-core/build.gradle.kts index 9e4fe33..47b2d0d 100644 --- a/controller-core/build.gradle.kts +++ b/controller-core/build.gradle.kts @@ -5,7 +5,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { id("conventions") kotlin("multiplatform") - kotlin("plugin.serialization") version "2.1.0" + kotlin("plugin.serialization") version "2.2.0" id("nativebuild") } diff --git a/controller-jdbc/build.gradle.kts b/controller-jdbc/build.gradle.kts index 227d1e1..2b5e62b 100644 --- a/controller-jdbc/build.gradle.kts +++ b/controller-jdbc/build.gradle.kts @@ -1,10 +1,10 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat -import org.jetbrains.kotlin.gradle.dsl.KotlinCompile +import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask plugins { id("conventions") kotlin("multiplatform") - kotlin("plugin.serialization") version "2.1.0" + kotlin("plugin.serialization") version "2.2.0" } version = extra["controllerVersion"].toString() diff --git a/controller-native/build.gradle.kts b/controller-native/build.gradle.kts index fd7f018..a365f3c 100644 --- a/controller-native/build.gradle.kts +++ b/controller-native/build.gradle.kts @@ -8,7 +8,7 @@ import org.jetbrains.kotlin.konan.target.HostManager plugins { id("conventions") kotlin("multiplatform") - kotlin("plugin.serialization") version "2.1.0" + kotlin("plugin.serialization") version "2.2.0" id("nativebuild") } diff --git a/scripts/start.sh b/scripts/start.sh index 0c2efd2..35849e7 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -1,3 +1,3 @@ #!/bin/bash -docker-compose down && docker-compose build && docker-compose run --rm --service-ports setup +docker compose down && docker compose build && docker compose run --rm --service-ports setup diff --git a/terpal-sql-android/build.gradle.kts b/terpal-sql-android/build.gradle.kts index 19b35e2..addb7ee 100644 --- a/terpal-sql-android/build.gradle.kts +++ b/terpal-sql-android/build.gradle.kts @@ -8,8 +8,8 @@ plugins { id("conventions") kotlin("multiplatform") id("com.android.library") - id("io.exoquery.terpal-plugin") version "2.1.0-2.0.0.PL" - kotlin("plugin.serialization") version "2.1.0" + id("io.exoquery.terpal-plugin") version "2.2.0-2.0.0.PL" + kotlin("plugin.serialization") version "2.2.0" // Already on the classpath //id("org.jetbrains.kotlin.android") version "1.9.23" } @@ -52,8 +52,10 @@ kotlin { androidTarget { compilations.all { - kotlinOptions { - jvmTarget = "17" + compileTaskProvider { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_17) + } } } publishLibraryVariants("release", "debug") diff --git a/terpal-sql-core-testing/build.gradle.kts b/terpal-sql-core-testing/build.gradle.kts index 053f6b5..77e2b28 100644 --- a/terpal-sql-core-testing/build.gradle.kts +++ b/terpal-sql-core-testing/build.gradle.kts @@ -4,8 +4,8 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { kotlin("multiplatform") - id("io.exoquery.terpal-plugin") version "2.1.0-2.0.0.PL" - kotlin("plugin.serialization") version "2.1.0" + id("io.exoquery.terpal-plugin") version "2.2.0-2.0.0.PL" + kotlin("plugin.serialization") version "2.2.0" id("nativebuild") } diff --git a/terpal-sql-core/build.gradle.kts b/terpal-sql-core/build.gradle.kts index ba444bd..50f5e59 100644 --- a/terpal-sql-core/build.gradle.kts +++ b/terpal-sql-core/build.gradle.kts @@ -5,8 +5,8 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { id("conventions") kotlin("multiplatform") - id("io.exoquery.terpal-plugin") version "2.1.0-2.0.0.PL" - kotlin("plugin.serialization") version "2.1.0" + id("io.exoquery.terpal-plugin") version "2.2.0-2.0.0.PL" + kotlin("plugin.serialization") version "2.2.0" id("nativebuild") } diff --git a/terpal-sql-jdbc/build.gradle.kts b/terpal-sql-jdbc/build.gradle.kts index c1f8eca..7a8e997 100644 --- a/terpal-sql-jdbc/build.gradle.kts +++ b/terpal-sql-jdbc/build.gradle.kts @@ -1,11 +1,10 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat -import org.jetbrains.kotlin.gradle.dsl.KotlinCompile plugins { id("conventions") kotlin("multiplatform") - id("io.exoquery.terpal-plugin") version "2.1.0-2.0.0.PL" - kotlin("plugin.serialization") version "2.1.0" + id("io.exoquery.terpal-plugin") version "2.2.0-2.0.0.PL" + kotlin("plugin.serialization") version "2.2.0" } val thisVersion = version diff --git a/terpal-sql-native/build.gradle.kts b/terpal-sql-native/build.gradle.kts index 6531d4b..acdbd56 100644 --- a/terpal-sql-native/build.gradle.kts +++ b/terpal-sql-native/build.gradle.kts @@ -8,8 +8,8 @@ import org.jetbrains.kotlin.konan.target.HostManager plugins { id("conventions") kotlin("multiplatform") - id("io.exoquery.terpal-plugin") version "2.1.0-2.0.0.PL" - kotlin("plugin.serialization") version "2.1.0" + id("io.exoquery.terpal-plugin") version "2.2.0-2.0.0.PL" + kotlin("plugin.serialization") version "2.2.0" id("nativebuild") }