Minor Gradle changes.

lightningkite · Oct 7, 2023 · 8cffdd5 · 8cffdd5
1 parent c090521
commit 8cffdd5
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 9 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,6 @@ kotlinVersion=1.7.10
 kspVersion=1.7.10-1.0.6
 rxPlusVersion=1.0.6
 khrysalisVersion=1.0.5
-#khrysalisVersion=1.0.4
 kotlinXSerialization=1.5.0
 logBack=1.4.6
 coroutines=1.7.1

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-7.6.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/processor/src/main/kotlin/com/lightningkite/lightningdb/MongoFields.kt b/processor/src/main/kotlin/com/lightningkite/lightningdb/MongoFields.kt
@@ -21,7 +21,6 @@ data class MongoFields(
         .flatMap { it.allSubs(handled) }
 
     fun write(out: TabAppendable) = with(out) {
-        var useContextualFor = listOf<String>()
         declaration.containingFile?.annotations?.forEach {
             when (it.shortName.asString()) {
                 "UseContextualSerialization" -> {
@@ -34,7 +33,6 @@ data class MongoFields(
                                     ?.removePrefix("[")
                                     ?.removeSuffix("]")
                                     ?.split(", ")
-                                    ?.also { useContextualFor = it }
                                     ?.joinToString { "$it::class" }
                             }
                         })"

diff --git a/server-aws/src/main/kotlin/com/lightningkite/lightningserver/files/S3File.kt b/server-aws/src/main/kotlin/com/lightningkite/lightningserver/files/S3File.kt
@@ -62,6 +62,7 @@ data class S3File(val system: S3FileSystem, val path: File) : FileObject {
         }
     }
 
+    @Deprecated("Use get instead", replaceWith = ReplaceWith("get().stream()"))
     override suspend fun read(): InputStream = withContext(Dispatchers.IO) {
         system.s3.getObject(
             GetObjectRequest.builder().also {

diff --git a/server-core/build.gradle.kts b/server-core/build.gradle.kts
@@ -33,14 +33,14 @@ dependencies {
 
     implementation("com.lightningkite.khrysalis:jvm-runtime:$khrysalisVersion")
 
-    api("io.ktor:ktor-client-content-negotiation:$ktorVersion")
-    api("io.ktor:ktor-client-cio-jvm:2.3.4")
+    api("io.ktor:ktor-client-content-negotiation-jvm:$ktorVersion")
+    api("io.ktor:ktor-client-cio-jvm:$ktorVersion")
+    api("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
 
     implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines")
     api("org.jetbrains.kotlinx:kotlinx-html-jvm:0.8.0")
 
-    api("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
     api("com.lightningkite:kotlinx-serialization-csv:2.1.0-SNAPSHOT")
     api("org.jetbrains.kotlinx:kotlinx-serialization-properties:$kotlinXSerialization")
     api("org.jetbrains.kotlinx:kotlinx-serialization-cbor:$kotlinXSerialization")

diff --git a/server-ktor/build.gradle.kts b/server-ktor/build.gradle.kts
@@ -14,14 +14,13 @@ plugins {
 
 val ktorVersion: String by project
 val kotlinVersion: String by project
-val khrysalisVersion: String by project
 dependencies {
     api(project(":server-core"))
     api("io.ktor:ktor-server-websockets-jvm:$ktorVersion")
     api("io.ktor:ktor-server-core-jvm:$ktorVersion")
     api("io.ktor:ktor-server-cio-jvm:$ktorVersion")
     api("io.ktor:ktor-server-netty-jvm:$ktorVersion")
-    api("io.ktor:ktor-server-cors:$ktorVersion")
+    api("io.ktor:ktor-server-cors-jvm:$ktorVersion")
 
     testImplementation("io.ktor:ktor-server-test-host-jvm:$ktorVersion")
 

diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -58,6 +58,7 @@ khrysalis {
     additionalEquivalentDirectories = listOf(project.file("build/generated/ksp/main/resources"))
 }
 
+tasks.getByName("equivalentsJar").published = true
 tasks.getByName("equivalentsJar").dependsOn("kspKotlin")
 
 standardPublishing {