Skip to content

Bump to 2.2.0 #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deusaquilus merged 1 commit into from
Nov 5, 2025
Merged

Bump to 2.2.0 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -192,9 +192,9 @@ val person: List<Person> = Sql("SELECT * FROM Person").queryOf<Person>().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 {
Expand Down
10 changes: 5 additions & 5 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
Expand Down Expand Up @@ -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 {
Expand Down
8 changes: 5 additions & 3 deletions controller-android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down Expand Up @@ -39,8 +39,10 @@ kotlin {

androidTarget {
compilations.all {
kotlinOptions {
jvmTarget = "17"
compileTaskProvider {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}
}
publishLibraryVariants("release", "debug")
Expand Down
2 changes: 1 addition & 1 deletion controller-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down
4 changes: 2 additions & 2 deletions controller-jdbc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()
Expand Down
2 changes: 1 addition & 1 deletion controller-native/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down
2 changes: 1 addition & 1 deletion scripts/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
10 changes: 6 additions & 4 deletions terpal-sql-android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down Expand Up @@ -52,8 +52,10 @@ kotlin {

androidTarget {
compilations.all {
kotlinOptions {
jvmTarget = "17"
compileTaskProvider {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}
}
publishLibraryVariants("release", "debug")
Expand Down
4 changes: 2 additions & 2 deletions terpal-sql-core-testing/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down
4 changes: 2 additions & 2 deletions terpal-sql-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down
5 changes: 2 additions & 3 deletions terpal-sql-jdbc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions terpal-sql-native/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down
Loading