Skip to content

Up ktor version to 2.0.0 #69

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

Open
Merseyside wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Up ktor version to 2.0.0 #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b87a7d8
Merge pull request #60 from icerockdev/develop
anton6tak Jul 14, 2021
4522b5e
Up ktor version to 2.0.0
Apr 12, 2022
f169ede
Uncomment some stuff
Apr 12, 2022
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
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ buildscript {
dependencies {
classpath(":maps-build-logic")
classpath("dev.icerock.moko:resources-generator:0.16.1")
classpath("org.jetbrains.kotlin:kotlin-serialization:1.5.20")
classpath("org.jetbrains.kotlin:kotlin-serialization:1.6.20")
}
}

Expand Down
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
kotlinVersion = "1.5.20"
kotlinVersion = "1.6.20"
lifecycleVersion = "2.2.0"
androidAppCompatVersion = "1.2.0"
espressoCoreVersion = "3.2.0"
Expand All @@ -14,15 +14,15 @@ mapboxAnnotationVersion = "0.9.0"
mapboxServicesVersion = "5.8.0"
multidexVersion = "2.0.1"
kotlinxSerializationVersion = "1.2.1"
coroutinesVersion = "1.5.0-native-mt"
ktorClientVersion = "1.6.0"
coroutinesVersion = "1.6.0-native-mt"
ktorClientVersion = "2.0.0"
mokoGraphicsVersion = "0.7.0"
mokoParcelizeVersion = "0.7.1"
mokoResourcesVersion = "0.16.1"
mokoMvvmVersion = "0.11.0"
mokoGeoVersion = "0.4.0"
mokoPermissionsVersion = "0.10.1"
mokoMapsVersion = "0.6.0"
mokoMapsVersion = "0.7.0"

[libraries]
appCompat = { module = "androidx.appcompat:appcompat", version.ref = "androidAppCompatVersion" }
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions maps-build-logic/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repositories {

dependencies {
api("dev.icerock:mobile-multiplatform:0.12.0")
api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20")
api("com.android.tools.build:gradle:4.2.1")
api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20")
api("com.android.tools.build:gradle:7.0.4")
api("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.15.0")
}
3 changes: 2 additions & 1 deletion maps-google/src/iosX64Main/kotlin/dev/icerock/moko/maps/google/GoogleMapController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import io.ktor.client.HttpClient
import io.ktor.client.call.ReceivePipelineException
import io.ktor.client.request.HttpRequestBuilder
import io.ktor.client.request.request
import io.ktor.client.statement.*
import io.ktor.http.HttpMethod
import io.ktor.http.takeFrom
import kotlinx.cinterop.cValue
Expand Down Expand Up @@ -225,7 +226,7 @@ actual class GoogleMapController(
}

try {
val result: String = httpClient.request(builder)
val result: String = httpClient.request(builder).bodyAsText()
return buildRoute(result, lineColor, markersImage)
} catch (pipeline: ReceivePipelineException) {
throw pipeline.cause
Expand Down