Skip to content

Commit a22e399

Browse files
LtTempletonPeckLtTempletonPeck
committed
Update 2.1.0 Kotlin
1 parent d58e1dc commit a22e399

File tree

10 files changed

+29
-29
lines changed

10 files changed

+29
-29
lines changed

‎README.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ When using JDBC, add the following to your `build.gradle.kts` file:
7575

7676
```kotlin
7777
plugins {
78-
kotlin("jvm") version "2.1.0" // Currently the plugin is only available for Kotlin-JVM
79-
id("io.exoquery.terpal-plugin") version "2.1.0-2.0.0.PL"
80-
kotlin("plugin.serialization") version "2.1.0"
78+
kotlin("jvm") version "2.1.20" // Currently the plugin is only available for Kotlin-JVM
79+
id("io.exoquery.terpal-plugin") version "2.1.20-2.0.0.PL"
80+
kotlin("plugin.serialization") version "2.1.20"
8181
}
8282

8383
dependencies {
@@ -116,9 +116,9 @@ For Android development, add the following to your `build.gradle.kts` file:
116116

117117
```kotlin
118118
plugins {
119-
kotlin("android") version "2.1.0"
120-
id("io.exoquery.terpal-plugin") version "2.1.0-2.0.0.PL"
121-
kotlin("plugin.serialization") version "2.1.0"
119+
kotlin("android") version "2.1.20"
120+
id("io.exoquery.terpal-plugin") version "2.1.20-2.0.0.PL"
121+
kotlin("plugin.serialization") version "2.1.20"
122122
}
123123

124124
dependencies {
@@ -211,9 +211,9 @@ val person: List<Person> = Sql("SELECT * FROM Person").queryOf<Person>().runOn(c
211211
For iOS, OSX, Linux and Windows development, with Kotlin Multiplatform, add the following to your `build.gradle.kts` file:
212212
```kotlin
213213
plugins {
214-
kotlin("multiplatform") version "2.1.0"
215-
id("io.exoquery.terpal-plugin") version "2.1.0-2.0.0.PL"
216-
kotlin("plugin.serialization") version "2.1.0"
214+
kotlin("multiplatform") version "2.1.20"
215+
id("io.exoquery.terpal-plugin") version "2.1.20-2.0.0.PL"
216+
kotlin("plugin.serialization") version "2.1.20"
217217
}
218218

219219
kotlin {
@@ -223,7 +223,7 @@ kotlin {
223223
implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.2")
224224
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2")
225225
// Note that terpal-sql-native supports iOS, OSX, Linux and Windows
226-
api("io.exoquery:terpal-runtime:2.1.0-2.0.0.PL")
226+
api("io.exoquery:terpal-runtime:2.1.20-2.0.0.PL")
227227
implementation("io.exoquery:terpal-sql-native:2.0.0.PL-1.2.0")
228228
}
229229
}

‎build-logic/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ repositories {
99
}
1010

1111
dependencies {
12-
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0")
12+
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.20")
1313
implementation("io.github.gradle-nexus:publish-plugin:1.1.0")
1414
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.8.20")
1515

‎build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
plugins {
22
`maven-publish`
33
signing
4-
kotlin("jvm") version "2.1.0" apply false
4+
kotlin("jvm") version "2.1.20" apply false
55
id("io.github.gradle-nexus.publish-plugin") version "1.1.0" apply false
6-
kotlin("multiplatform") version "2.1.0" apply false
6+
kotlin("multiplatform") version "2.1.20" apply false
77
id("com.android.library") version "8.2.0" apply false
88
id("org.jetbrains.dokka") version "1.9.10" apply false
99
}

‎terpal-sql-android/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ plugins {
88
id("conventions")
99
kotlin("multiplatform")
1010
id("com.android.library")
11-
id("io.exoquery.terpal-plugin") version "2.1.0-2.0.0.PL"
12-
kotlin("plugin.serialization") version "2.1.0"
11+
id("io.exoquery.terpal-plugin") version "2.1.20-2.0.0.PL"
12+
kotlin("plugin.serialization") version "2.1.20"
1313
// Already on the classpath
1414
//id("org.jetbrains.kotlin.android") version "1.9.23"
1515
}
@@ -74,7 +74,7 @@ kotlin {
7474
api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2")
7575
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
7676
//api("org.jetbrains.kotlinx:kotlinx-datetime:0.6.0")
77-
api("io.exoquery:terpal-runtime:2.1.0-2.0.0.PL")
77+
api("io.exoquery:terpal-runtime:2.1.20-2.0.0.PL")
7878

7979
//implementation("androidx.sqlite:sqlite:2.4.0")
8080
//implementation("androidx.sqlite:sqlite-ktx:2.4.0")

‎terpal-sql-core-testing/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
44

55
plugins {
66
kotlin("multiplatform")
7-
id("io.exoquery.terpal-plugin") version "2.1.0-2.0.0.PL"
8-
kotlin("plugin.serialization") version "2.1.0"
7+
id("io.exoquery.terpal-plugin") version "2.1.20-2.0.0.PL"
8+
kotlin("plugin.serialization") version "2.1.20"
99
id("nativebuild")
1010
}
1111

@@ -34,7 +34,7 @@ kotlin {
3434
api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2")
3535
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
3636
//api("org.jetbrains.kotlinx:kotlinx-datetime:0.6.0")
37-
api("io.exoquery:terpal-runtime:2.1.0-2.0.0.PL")
37+
api("io.exoquery:terpal-runtime:2.1.20-2.0.0.PL")
3838
implementation("org.jetbrains.kotlinx:atomicfu:0.23.1")
3939
implementation("app.cash.sqldelight:runtime:2.0.2")
4040

‎terpal-sql-core/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
55
plugins {
66
id("conventions")
77
kotlin("multiplatform")
8-
id("io.exoquery.terpal-plugin") version "2.1.0-2.0.0.PL"
9-
kotlin("plugin.serialization") version "2.1.0"
8+
id("io.exoquery.terpal-plugin") version "2.1.20-2.0.0.PL"
9+
kotlin("plugin.serialization") version "2.1.20"
1010
id("nativebuild")
1111
}
1212

@@ -30,7 +30,7 @@ kotlin {
3030
api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2")
3131
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
3232
//api("org.jetbrains.kotlinx:kotlinx-datetime:0.6.0")
33-
api("io.exoquery:terpal-runtime:2.1.0-2.0.0.PL")
33+
api("io.exoquery:terpal-runtime:2.1.20-2.0.0.PL")
3434
implementation("org.jetbrains.kotlinx:atomicfu:0.23.1")
3535
implementation("com.sschr15.annotations:jb-annotations-kmp:24.1.0+apple")
3636
}

‎terpal-sql-core/settings.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pluginManagement {
55
// eachPlugin {
66
// if (requested.id.namespace == "io.exoquery" && requested.id.name == "terpal-runtime") {
77
// println("---------------------- HERE ----------------------")
8-
// useModule("io.exoquery:terpal-runtime:2.1.0-0.3.2")
8+
// useModule("io.exoquery:terpal-runtime:2.1.20-0.3.2")
99
// }
1010
// }
1111
//}

‎terpal-sql-jdbc/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
44
plugins {
55
id("conventions")
66
kotlin("multiplatform")
7-
id("io.exoquery.terpal-plugin") version "2.1.0-2.0.0.PL"
8-
kotlin("plugin.serialization") version "2.1.0"
7+
id("io.exoquery.terpal-plugin") version "2.1.20-2.0.0.PL"
8+
kotlin("plugin.serialization") version "2.1.20"
99
}
1010

1111
val thisVersion = version

‎terpal-sql-native/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import org.jetbrains.kotlin.konan.target.HostManager
88
plugins {
99
id("conventions")
1010
kotlin("multiplatform")
11-
id("io.exoquery.terpal-plugin") version "2.1.0-2.0.0.PL"
12-
kotlin("plugin.serialization") version "2.1.0"
11+
id("io.exoquery.terpal-plugin") version "2.1.20-2.0.0.PL"
12+
kotlin("plugin.serialization") version "2.1.20"
1313
id("nativebuild")
1414
}
1515

@@ -96,7 +96,7 @@ kotlin {
9696
api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2")
9797
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
9898
//api("org.jetbrains.kotlinx:kotlinx-datetime:0.6.0")
99-
api("io.exoquery:terpal-runtime:2.1.0-2.0.0.PL")
99+
api("io.exoquery:terpal-runtime:2.1.20-2.0.0.PL")
100100
implementation("app.cash.sqldelight:native-driver:2.0.2")
101101

102102
}

‎terpal-sql-native/src/commonTest/kotlin/io/exoquery/sql/native/PoolConcurrencySpec.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class PoolConcurrencySpec {
9494
}
9595

9696
// Need to have underscores or odd errors happen in android. Not sure why.
97-
// ERROR: /home/alexi/git/terpal-sql/terpal-sql-core-testing/build/libs/terpal-sql-core-testing-jvm-2.1.0-0.3.0.jar: D8: com.android.tools.r8.internal.vc: Space characters in SimpleName 'io/exoquery/sql/PoolConcurrencyOps$Pool should wait once all connections are exhausted$1$1' are not allowed prior to DEX version 040
97+
// ERROR: /home/alexi/git/terpal-sql/terpal-sql-core-testing/build/libs/terpal-sql-core-testing-jvm-2.1.20-0.3.0.jar: D8: com.android.tools.r8.internal.vc: Space characters in SimpleName 'io/exoquery/sql/PoolConcurrencyOps$Pool should wait once all connections are exhausted$1$1' are not allowed prior to DEX version 040
9898
@Test
9999
fun `Pool_should_wait_once_all_connections_are_exhausted`() {
100100
fun currTime() = run {

0 commit comments

Comments
 (0)