Ktor upgrade to 2.1.3 (#32)

* ktor libs upgrade and compilation errors resolved

* migrating from deprecated plugin to content negotiation

* upgrading to the latest version

.gitignore

@@ -1,12 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
+/.idea/
 .DS_Store
 /build
 /captures

build.gradle.kts

@@ -23,18 +23,19 @@ group = "com.github.mmoghaddam385"
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10")
 
-    val ktorVersion = "1.6.7"
-    implementation("io.ktor:ktor-client-core:$ktorVersion")
-    implementation("io.ktor:ktor-client-websockets:$ktorVersion")
-    implementation("io.ktor:ktor-client-okhttp:$ktorVersion")
-    implementation("io.ktor:ktor-client-serialization-jvm:$ktorVersion")
+    val ktorVersion = "2.1.3"
+    implementation("io.ktor:ktor-client-core-jvm:$ktorVersion")
+    implementation("io.ktor:ktor-client-websockets-jvm:$ktorVersion")
+    implementation("io.ktor:ktor-client-okhttp-jvm:$ktorVersion")
+    implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
+    implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
 
     // Annotation processor that generates Java builders for data classes
     val ktBuilderVersion = "1.2.1"
     implementation("com.thinkinglogic.builder:kotlin-builder-annotation:$ktBuilderVersion")
     kapt("com.thinkinglogic.builder:kotlin-builder-processor:$ktBuilderVersion")
 
-    testImplementation("junit:junit:4.12")
+    testImplementation("junit:junit:4.13.2")
 }
 
 allprojects {

sample/build.gradle.kts

@@ -12,7 +12,7 @@ dependencies {
     implementation("com.squareup.okhttp3:okhttp:4.7.2")
 
     // For custom CIO engine on defaultJvmHttpClientProvider
-    implementation("io.ktor:ktor-client-cio:1.3.1")
+    implementation("io.ktor:ktor-client-cio-jvm:2.1.2")
 
     // For pretty printing data classes
     implementation("com.tylerthrailkill.helpers:pretty-print:2.0.2")

src/main/kotlin/io/polygon/kotlin/sdk/HttpClientProvider.kt

@@ -3,10 +3,10 @@ package io.polygon.kotlin.sdk
 import io.ktor.client.*
 import io.ktor.client.engine.*
 import io.ktor.client.engine.okhttp.*
-import io.ktor.client.features.json.JsonFeature
-import io.ktor.client.features.json.serializer.*
-import io.ktor.client.features.websocket.*
+import io.ktor.client.plugins.contentnegotiation.*
+import io.ktor.client.plugins.websocket.*
 import io.ktor.http.*
+import io.ktor.serialization.kotlinx.json.*
 import kotlinx.serialization.json.Json
 import okhttp3.Interceptor
 
@@ -55,8 +55,8 @@ constructor(
     override fun buildClient() =
         HttpClient(buildEngine()) {
             install(WebSockets)
-            install(JsonFeature) {
-                serializer = KotlinxSerializer(Json {
+            install(ContentNegotiation) {
+                json(Json {
                     isLenient = true
                     ignoreUnknownKeys = true
                 })

src/main/kotlin/io/polygon/kotlin/sdk/rest/Aggregates.kt

@@ -2,6 +2,7 @@ package io.polygon.kotlin.sdk.rest
 
 import com.thinkinglogic.builder.annotation.Builder
 import com.thinkinglogic.builder.annotation.DefaultValue
+import io.ktor.http.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

src/main/kotlin/io/polygon/kotlin/sdk/rest/GroupedDaily.kt

@@ -2,6 +2,7 @@ package io.polygon.kotlin.sdk.rest
 
 import com.thinkinglogic.builder.annotation.Builder
 import com.thinkinglogic.builder.annotation.DefaultValue
+import io.ktor.http.*
 import io.polygon.kotlin.sdk.rest.reference.PolygonReferenceClient
 
 /** See [PolygonRestClient.getGroupedDailyAggregatesBlocking] */

src/main/kotlin/io/polygon/kotlin/sdk/rest/PolygonRestClient.kt

@@ -1,6 +1,7 @@
 package io.polygon.kotlin.sdk.rest
 
 import io.ktor.client.HttpClient
+import io.ktor.client.call.body
 import io.ktor.client.request.get
 import io.ktor.http.URLBuilder
 import io.polygon.kotlin.sdk.DefaultJvmHttpClientProvider
@@ -92,7 +93,7 @@ constructor(
         urlBuilderBlock: URLBuilder.() -> Unit
     ): T {
         val url = baseUrlBuilder.apply(urlBuilderBlock).build()
-        return withHttpClient { httpClient -> httpClient.get(url) }
+        return withHttpClient { httpClient -> httpClient.get(url) }.body()
     }
 
 }

src/main/kotlin/io/polygon/kotlin/sdk/rest/crypto/DailyOpenClose.kt

@@ -1,6 +1,7 @@
 package io.polygon.kotlin.sdk.rest.crypto
 
 import com.thinkinglogic.builder.annotation.Builder
+import io.ktor.http.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

src/main/kotlin/io/polygon/kotlin/sdk/rest/crypto/Exchanges.kt

@@ -1,5 +1,6 @@
 package io.polygon.kotlin.sdk.rest.crypto
 
+import io.ktor.http.*
 import kotlinx.serialization.Serializable
 
 /** See [PolygonCryptoClient.getSupportedExchangesBlocking] */

src/main/kotlin/io/polygon/kotlin/sdk/rest/crypto/HistoricTrades.kt

@@ -1,6 +1,7 @@
 package io.polygon.kotlin.sdk.rest.crypto
 
 import com.thinkinglogic.builder.annotation.Builder
+import io.ktor.http.*
 import kotlinx.serialization.Serializable
 
 /** See [PolygonCryptoClient.getHistoricTradesBlocking] */

src/main/kotlin/io/polygon/kotlin/sdk/rest/crypto/LastTrade.kt

@@ -1,5 +1,6 @@
 package io.polygon.kotlin.sdk.rest.crypto
 
+import io.ktor.http.*
 import kotlinx.serialization.Serializable
 
 /** See [PolygonCryptoClient.getLastTradeBlocking] */

src/main/kotlin/io/polygon/kotlin/sdk/rest/crypto/Snapshots.kt

@@ -1,5 +1,6 @@
 package io.polygon.kotlin.sdk.rest.crypto
 
+import io.ktor.http.*
 import io.polygon.kotlin.sdk.rest.stocks.GainersOrLosersDirection
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

src/main/kotlin/io/polygon/kotlin/sdk/rest/forex/HistoricTicks.kt

@@ -1,6 +1,7 @@
 package io.polygon.kotlin.sdk.rest.forex
 
 import com.thinkinglogic.builder.annotation.Builder
+import io.ktor.http.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

src/main/kotlin/io/polygon/kotlin/sdk/rest/forex/LastQuote.kt

@@ -1,5 +1,6 @@
 package io.polygon.kotlin.sdk.rest.forex
 
+import io.ktor.http.*
 import kotlinx.serialization.Serializable
 
 /** See [PolygonForexClient.getLastQuoteBlocking] */

src/main/kotlin/io/polygon/kotlin/sdk/rest/forex/RealTimeConversion.kt

@@ -2,6 +2,7 @@ package io.polygon.kotlin.sdk.rest.forex
 
 import com.thinkinglogic.builder.annotation.Builder
 import com.thinkinglogic.builder.annotation.DefaultValue
+import io.ktor.http.*
 import kotlinx.serialization.Serializable
 
 /** See [PolygonForexClient.getRealTimeConversionBlocking] */

src/main/kotlin/io/polygon/kotlin/sdk/rest/forex/Snapshots.kt

@@ -1,5 +1,6 @@
 package io.polygon.kotlin.sdk.rest.forex
 
+import io.ktor.http.*
 import io.polygon.kotlin.sdk.rest.stocks.GainersOrLosersDirection
 import io.polygon.kotlin.sdk.rest.stocks.SnapshotAggregateDTO
 import kotlinx.serialization.SerialName

src/main/kotlin/io/polygon/kotlin/sdk/rest/reference/Locales.kt

@@ -1,5 +1,6 @@
 package io.polygon.kotlin.sdk.rest.reference
 
+import io.ktor.http.*
 import kotlinx.serialization.Serializable
 
 /** See [PolygonReferenceClient.getSupportedLocalesBlocking] */

src/main/kotlin/io/polygon/kotlin/sdk/rest/reference/MarketHolidays.kt

@@ -1,5 +1,6 @@
 package io.polygon.kotlin.sdk.rest.reference
 
+import io.ktor.http.*
 import kotlinx.serialization.Serializable
 
 /** See [PolygonReferenceClient.getMarketHolidaysBlocking] */

src/main/kotlin/io/polygon/kotlin/sdk/rest/reference/MarketStatus.kt

@@ -1,5 +1,6 @@
 package io.polygon.kotlin.sdk.rest.reference
 
+import io.ktor.http.*
 import kotlinx.serialization.Serializable
 
 /** See [PolygonReferenceClient.getMarketStatusBlocking] */

src/main/kotlin/io/polygon/kotlin/sdk/rest/reference/Markets.kt

@@ -1,5 +1,6 @@
 package io.polygon.kotlin.sdk.rest.reference
 
+import io.ktor.http.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

src/main/kotlin/io/polygon/kotlin/sdk/rest/reference/StockDividends.kt

@@ -1,5 +1,6 @@
 package io.polygon.kotlin.sdk.rest.reference
 
+import io.ktor.http.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

src/main/kotlin/io/polygon/kotlin/sdk/rest/reference/StockFinancials.kt

@@ -1,6 +1,7 @@
 package io.polygon.kotlin.sdk.rest.reference
 
 import com.thinkinglogic.builder.annotation.Builder
+import io.ktor.http.*
 import kotlinx.serialization.Serializable
 
 /** See [PolygonReferenceClient.getStockFinancialsBlocking] */

src/main/kotlin/io/polygon/kotlin/sdk/rest/reference/StockSplits.kt

@@ -1,5 +1,6 @@
 package io.polygon.kotlin.sdk.rest.reference
 
+import io.ktor.http.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

src/main/kotlin/io/polygon/kotlin/sdk/rest/reference/TickerDetails.kt

@@ -1,5 +1,6 @@
 package io.polygon.kotlin.sdk.rest.reference
 
+import io.ktor.http.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

src/main/kotlin/io/polygon/kotlin/sdk/rest/reference/TickerNews.kt

@@ -2,6 +2,7 @@ package io.polygon.kotlin.sdk.rest.reference
 
 import com.thinkinglogic.builder.annotation.Builder
 import com.thinkinglogic.builder.annotation.DefaultValue
+import io.ktor.http.*
 import kotlinx.serialization.Serializable
 
 /** See [PolygonReferenceClient.getTickerNewsBlocking] */

src/main/kotlin/io/polygon/kotlin/sdk/rest/reference/TickerTypes.kt

@@ -1,5 +1,6 @@
 package io.polygon.kotlin.sdk.rest.reference
 
+import io.ktor.http.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

src/main/kotlin/io/polygon/kotlin/sdk/rest/reference/Tickers.kt

@@ -2,6 +2,7 @@ package io.polygon.kotlin.sdk.rest.reference
 
 import com.thinkinglogic.builder.annotation.Builder
 import com.thinkinglogic.builder.annotation.DefaultValue
+import io.ktor.http.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

src/main/kotlin/io/polygon/kotlin/sdk/rest/stocks/ConditionMappings.kt

@@ -1,5 +1,7 @@
 package io.polygon.kotlin.sdk.rest.stocks
 
+import io.ktor.http.*
+
 /** See [PolygonStocksClient.getConditionMappingsBlocking] */
 suspend fun PolygonStocksClient.getConditionMappings(type: ConditionMappingTickerType): Map<String, String> =
     polygonClient.fetchResult { path("v1", "meta", "conditions", type.urlParamName) }

src/main/kotlin/io/polygon/kotlin/sdk/rest/stocks/DailyOpenClose.kt

@@ -1,5 +1,6 @@
 package io.polygon.kotlin.sdk.rest.stocks
 
+import io.ktor.http.*
 import kotlinx.serialization.Serializable
 
 /** See [PolygonStocksClient.getDailyOpenCloseBlocking] */

src/main/kotlin/io/polygon/kotlin/sdk/rest/stocks/Exchanges.kt

@@ -1,5 +1,6 @@
 package io.polygon.kotlin.sdk.rest.stocks
 
+import io.ktor.http.*
 import kotlinx.serialization.Serializable
 
 /** See [PolygonStocksClient.getSupportedExchangesBlocking] */

src/main/kotlin/io/polygon/kotlin/sdk/rest/stocks/HistoricQuotes.kt

@@ -2,6 +2,7 @@ package io.polygon.kotlin.sdk.rest.stocks
 
 import com.thinkinglogic.builder.annotation.Builder
 import com.thinkinglogic.builder.annotation.DefaultValue
+import io.ktor.http.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

src/main/kotlin/io/polygon/kotlin/sdk/rest/stocks/HistoricTrades.kt

@@ -2,6 +2,7 @@ package io.polygon.kotlin.sdk.rest.stocks
 
 import com.thinkinglogic.builder.annotation.Builder
 import com.thinkinglogic.builder.annotation.DefaultValue
+import io.ktor.http.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

src/main/kotlin/io/polygon/kotlin/sdk/rest/stocks/LastQuote.kt

@@ -1,5 +1,6 @@
 package io.polygon.kotlin.sdk.rest.stocks
 
+import io.ktor.http.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

src/main/kotlin/io/polygon/kotlin/sdk/rest/stocks/LastTrade.kt

@@ -1,5 +1,6 @@
 package io.polygon.kotlin.sdk.rest.stocks
 
+import io.ktor.http.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

src/main/kotlin/io/polygon/kotlin/sdk/rest/stocks/PreviousClose.kt

@@ -1,5 +1,6 @@
 package io.polygon.kotlin.sdk.rest.stocks
 
+import io.ktor.http.*
 import io.polygon.kotlin.sdk.rest.AggregateDTO
 import kotlinx.serialization.Serializable
 

src/main/kotlin/io/polygon/kotlin/sdk/rest/stocks/Snapshots.kt

@@ -1,5 +1,6 @@
 package io.polygon.kotlin.sdk.rest.stocks
 
+import io.ktor.http.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

src/main/kotlin/io/polygon/kotlin/sdk/websocket/PolygonWebSocketClient.kt

@@ -1,10 +1,10 @@
 package io.polygon.kotlin.sdk.websocket
 
 import io.ktor.client.*
-import io.ktor.client.features.websocket.*
+import io.ktor.client.plugins.websocket.*
 import io.ktor.client.request.*
 import io.ktor.http.*
-import io.ktor.http.cio.websocket.*
+import io.ktor.websocket.*
 import io.polygon.kotlin.sdk.DefaultJvmHttpClientProvider
 import io.polygon.kotlin.sdk.HttpClientProvider
 import io.polygon.kotlin.sdk.ext.PolygonCompletionCallback