Merge pull request #143 from jillesvangurp/kotlin-2.0

kotlin 2.0
jillesvangurp · May 31, 2024 · 800662c · 800662c
2 parents 6345bef + 9538e9d
commit 800662c
Show file tree

Hide file tree

Showing 24 changed files with 235 additions and 238 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 bin
 build/
 !gradle/wrapper/gradle-wrapper.jar
+.kotlin
 
 ### STS ###
 .apt_generated

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -29,7 +29,6 @@ subprojects {
         kotlinOptions {
             // this is the minimum LTS version we support, 11 and 8 are no longer supported
             jvmTarget = "17"
-            languageVersion = "1.9"
         }
     }
 

diff --git a/docs/build.gradle.kts b/docs/build.gradle.kts
@@ -38,6 +38,7 @@ dependencies {
     testImplementation(project(":search-dsls"))
     testImplementation(project(":search-client"))
     testImplementation("com.jillesvangurp:json-dsl:_")
+    testImplementation("com.jillesvangurp:kotlinx-serialization-extensions:_")
 
     testImplementation(Kotlin.stdlib.jdk8)
     testImplementation(KotlinX.coroutines.jdk8)

diff --git a/docs/src/test/kotlin/documentation/manual/bulk/bulk.kt b/docs/src/test/kotlin/documentation/manual/bulk/bulk.kt
@@ -5,6 +5,7 @@ package documentation.manual.bulk
 import com.jillesvangurp.ktsearch.*
 import com.jillesvangurp.ktsearch.repository.repository
 import com.jillesvangurp.searchdsls.querydsl.Script
+import com.jillesvangurp.serializationext.DEFAULT_JSON
 import documentation.printStdOut
 import documentation.sourceGitRepository
 import kotlinx.serialization.Serializable

diff --git a/docs/src/test/kotlin/documentation/manual/knn/knn.kt b/docs/src/test/kotlin/documentation/manual/knn/knn.kt
@@ -3,9 +3,16 @@
 package documentation.manual.knn
 
 import com.github.doyaaaaaken.kotlincsv.dsl.csvReader
-import com.jillesvangurp.ktsearch.*
+import com.jillesvangurp.ktsearch.bulk
+import com.jillesvangurp.ktsearch.create
+import com.jillesvangurp.ktsearch.createIndex
+import com.jillesvangurp.ktsearch.deleteIndex
+import com.jillesvangurp.ktsearch.parseHit
+import com.jillesvangurp.ktsearch.search
+import com.jillesvangurp.ktsearch.searchHits
 import com.jillesvangurp.searchdsls.mappingdsl.KnnSimilarity
 import com.jillesvangurp.searchdsls.querydsl.KnnQuery
+import com.jillesvangurp.serializationext.DEFAULT_JSON
 import documentation.manual.search.client
 import documentation.printStdOut
 import documentation.sourceGitRepository

diff --git a/docs/src/test/kotlin/documentation/manual/search/aggregations.kt b/docs/src/test/kotlin/documentation/manual/search/aggregations.kt
@@ -5,6 +5,8 @@ package documentation.manual.search
 import com.jillesvangurp.ktsearch.*
 import com.jillesvangurp.ktsearch.repository.repository
 import com.jillesvangurp.searchdsls.querydsl.*
+import com.jillesvangurp.serializationext.DEFAULT_JSON
+import com.jillesvangurp.serializationext.DEFAULT_PRETTY_JSON
 import documentation.printStdOut
 import documentation.sourceGitRepository
 import kotlinx.coroutines.runBlocking

diff --git a/docs/src/test/kotlin/documentation/manual/search/highlighting.kt b/docs/src/test/kotlin/documentation/manual/search/highlighting.kt
@@ -1,6 +1,6 @@
 package documentation.manual.search
 
-import com.jillesvangurp.ktsearch.DEFAULT_PRETTY_JSON
+import com.jillesvangurp.serializationext.DEFAULT_PRETTY_JSON
 import com.jillesvangurp.ktsearch.search
 import com.jillesvangurp.searchdsls.querydsl.Fragmenter
 import com.jillesvangurp.searchdsls.querydsl.Type

diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
diff --git a/search-client/build.gradle.kts b/search-client/build.gradle.kts
@@ -90,14 +90,19 @@ kotlin {
     macosX64()
     macosArm64()
     // Blocked on ktor-client support
-    // wasmJs()
+//    wasmJs {
+//        browser()
+//        nodejs()
+//        d8()
+//    }
 
     sourceSets {
         commonMain {
             dependencies {
                 api(kotlin("stdlib-common", "_"))
                 api(project(":search-dsls"))
                 api("com.jillesvangurp:json-dsl:_")
+                api("com.jillesvangurp:kotlinx-serialization-extensions:_")
                 api(KotlinX.datetime)
                 implementation(Ktor.client.core)
                 api(KotlinX.coroutines.core)
@@ -112,6 +117,7 @@ kotlin {
                 implementation("io.ktor:ktor-serialization-kotlinx:_")
                 implementation("io.ktor:ktor-serialization-kotlinx-json:_")
                 implementation("io.ktor:ktor-client-content-negotiation:_")
+
             }
         }
         commonTest {
@@ -156,8 +162,13 @@ kotlin {
         }
 
         all {
-            languageSettings.optIn("kotlin.RequiresOptIn")
-            languageSettings.optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
+            languageSettings {
+                optIn("kotlin.RequiresOptIn")
+                optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
+                languageVersion = "1.9"
+                apiVersion = "1.9"
+            }
+
         }
     }
 }

diff --git a/search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/SearchClient.kt b/search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/SearchClient.kt
@@ -3,6 +3,7 @@
 package com.jillesvangurp.ktsearch
 
 import com.jillesvangurp.searchdsls.SearchEngineVariant
+import com.jillesvangurp.serializationext.DEFAULT_JSON
 import io.ktor.utils.io.core.*
 import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.json.Json

diff --git a/search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/SearchResponse.kt b/search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/SearchResponse.kt
@@ -3,6 +3,7 @@
 package com.jillesvangurp.ktsearch
 
 import com.jillesvangurp.ktsearch.repository.ModelSerializationStrategy
+import com.jillesvangurp.serializationext.DEFAULT_JSON
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull

diff --git a/search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/bulk-api.kt b/search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/bulk-api.kt
@@ -3,6 +3,7 @@ package com.jillesvangurp.ktsearch
 import com.jillesvangurp.jsondsl.json
 import com.jillesvangurp.jsondsl.withJsonDsl
 import com.jillesvangurp.searchdsls.querydsl.Script
+import com.jillesvangurp.serializationext.DEFAULT_JSON
 import io.ktor.utils.io.core.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

diff --git a/search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/documents-api.kt b/search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/documents-api.kt
@@ -1,6 +1,7 @@
 package com.jillesvangurp.ktsearch
 
 import com.jillesvangurp.jsondsl.JsonDsl
+import com.jillesvangurp.serializationext.DEFAULT_JSON
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.encodeToString

diff --git a/search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/json-configuration.kt b/search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/json-configuration.kt
diff --git a/search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/reindex-api.kt b/search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/reindex-api.kt
@@ -38,7 +38,6 @@ data class ReindexResponse(
 data class ReindexRetries(val bulk: Int, val search: Int)
 
 @VariantRestriction(ES7, ES8)
-@ExperimentalFeature
 suspend fun SearchClient.reindex(
     refresh: Boolean? = null,
     timeout: Duration? = null,
@@ -64,7 +63,6 @@ suspend fun SearchClient.reindex(
 
 
 @VariantRestriction(ES7, ES8)
-@ExperimentalFeature
 suspend fun SearchClient.reindexAsync(
     refresh: Boolean? = null,
     timeout: Duration? = null,
@@ -119,11 +117,6 @@ private suspend fun SearchClient.reindexGeneric(
     }
 }
 
-@RequiresOptIn(level = WARNING, message = "This API is experimental. It can be incompatibly changed in the future.")
-@Retention(BINARY)
-@Target(FUNCTION)
-annotation class ExperimentalFeature
-
 @Serializable
 data class TaskResponse(val task: String) {
     fun toTaskId() = TaskId(task)

diff --git a/...n/com/jillesvangurp/ktsearch/repository/KotlinxSerializationModelSerializationStrategy.kt b/...n/com/jillesvangurp/ktsearch/repository/KotlinxSerializationModelSerializationStrategy.kt
@@ -1,6 +1,6 @@
 package com.jillesvangurp.ktsearch.repository
 
-import com.jillesvangurp.ktsearch.DEFAULT_JSON
+import com.jillesvangurp.serializationext.DEFAULT_JSON
 import com.jillesvangurp.ktsearch.SearchClient
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.json.Json

diff --git a/search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/update-api.kt b/search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/update-api.kt
@@ -2,6 +2,7 @@ package com.jillesvangurp.ktsearch
 
 import com.jillesvangurp.jsondsl.json
 import com.jillesvangurp.searchdsls.querydsl.Script
+import com.jillesvangurp.serializationext.DEFAULT_JSON
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.encodeToString

diff --git a/search-client/src/commonTest/kotlin/com/jillesvangurp/ktsearch/DocumentCRUDTest.kt b/search-client/src/commonTest/kotlin/com/jillesvangurp/ktsearch/DocumentCRUDTest.kt
@@ -1,6 +1,7 @@
 package com.jillesvangurp.ktsearch
 
 import com.jillesvangurp.searchdsls.querydsl.Script
+import com.jillesvangurp.serializationext.DEFAULT_JSON
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.shouldNotBe
 import kotlin.test.Test

diff --git a/search-client/src/commonTest/kotlin/com/jillesvangurp/ktsearch/NestedQueryTest.kt b/search-client/src/commonTest/kotlin/com/jillesvangurp/ktsearch/NestedQueryTest.kt
@@ -5,6 +5,8 @@ import com.jillesvangurp.searchdsls.mappingdsl.IndexSettingsAndMappingsDSL
 import com.jillesvangurp.searchdsls.querydsl.ScoreMode
 import com.jillesvangurp.searchdsls.querydsl.nested
 import com.jillesvangurp.searchdsls.querydsl.range
+import com.jillesvangurp.serializationext.DEFAULT_JSON
+import com.jillesvangurp.serializationext.DEFAULT_PRETTY_JSON
 import io.kotest.matchers.shouldBe
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

diff --git a/search-client/src/commonTest/kotlin/com/jillesvangurp/ktsearch/test-fixture.kt b/search-client/src/commonTest/kotlin/com/jillesvangurp/ktsearch/test-fixture.kt
@@ -1,6 +1,8 @@
 package com.jillesvangurp.ktsearch
 
 import com.jillesvangurp.searchdsls.mappingdsl.IndexSettingsAndMappingsDSL
+import com.jillesvangurp.serializationext.DEFAULT_JSON
+import com.jillesvangurp.serializationext.DEFAULT_PRETTY_JSON
 import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
 import kotlinx.serialization.EncodeDefault

diff --git a/search-client/src/jvmMain/kotlin/com/jillesvangurp/ktsearch/defaultHttpClient.kt b/search-client/src/jvmMain/kotlin/com/jillesvangurp/ktsearch/defaultHttpClient.kt
@@ -1,5 +1,6 @@
 package com.jillesvangurp.ktsearch
 
+import com.jillesvangurp.serializationext.DEFAULT_JSON
 import io.ktor.client.*
 import io.ktor.client.engine.cio.*
 import io.ktor.client.engine.java.*

diff --git a/search-client/src/nativeMain/kotlin/com/jillesvangurp/ktsearch/KtorRestClient.native.kt b/search-client/src/nativeMain/kotlin/com/jillesvangurp/ktsearch/KtorRestClient.native.kt
@@ -1,5 +1,6 @@
 package com.jillesvangurp.ktsearch
 
+import com.jillesvangurp.serializationext.DEFAULT_JSON
 import io.ktor.client.*
 import io.ktor.client.engine.curl.*
 import io.ktor.client.plugins.auth.*

diff --git a/search-dsls/build.gradle.kts b/search-dsls/build.gradle.kts
@@ -8,6 +8,7 @@ plugins {
 
 kotlin {
     jvm {
+
     }
     js(IR) {
         browser()
@@ -25,15 +26,18 @@ kotlin {
     mingwX64()
     macosX64()
     macosArm64()
-    wasmJs()
+    wasmJs {
+        browser()
+        nodejs()
+        d8()
+    }
     // not supported by kotest yet
 //    wasmWasi()
     sourceSets {
         commonMain {
             dependencies {
                 implementation(kotlin("stdlib-common", "_"))
                 implementation("com.jillesvangurp:json-dsl:_")
-
             }
         }
         commonTest {
@@ -65,6 +69,10 @@ kotlin {
         }
 
         all {
+            languageSettings {
+                languageVersion = "1.9"
+                apiVersion = "1.9"
+            }
             languageSettings.optIn("kotlin.RequiresOptIn")
         }
     }

diff --git a/versions.properties b/versions.properties
@@ -19,32 +19,27 @@ version.com.github.jillesvangurp..kotlin4example=1.1.5
 
 version.com.jillesvangurp..json-dsl=3.0.1
 
+version.com.jillesvangurp..kotlinx-serialization-extensions=1.0.2
+
 version.io.github.microutils..kotlin-logging=3.0.5
 ##                               # available=4.0.0-beta-1
 ##                               # available=4.0.0-beta-2
 
 version.junit.jupiter=5.10.2
 ##        # available=5.11.0-M1
+##        # available=5.11.0-M2
 
 version.kotest=5.9.0
 
-version.kotlin=1.9.24
-## # available=2.0.0-Beta1
-## # available=2.0.0-Beta2
-## # available=2.0.0-Beta3
-## # available=2.0.0-Beta4
-## # available=2.0.0-Beta5
-## # available=2.0.0-RC1
-## # available=2.0.0-RC2
-## # available=2.0.0-RC3
+version.kotlin=2.0.0
 
 version.kotlinx.coroutines=1.8.1
+##             # available=1.9.0-RC
 
-version.kotlinx.datetime=0.5.0
-##           # available=0.6.0-RC
-##           # available=0.6.0-RC.2
+version.kotlinx.datetime=0.6.0
 
 version.kotlinx.serialization=1.6.3
+##                # available=1.7.0-RC
 
  version.ktor=2.3.11
 ### available=3.0.0-beta-1