diff --git a/build.gradle.kts b/build.gradle.kts index b663b04..1bf5165 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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") } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 310b673..370623d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" @@ -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" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0f80bbf..aa991fc 100755 --- 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.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/maps-build-logic/build.gradle.kts b/maps-build-logic/build.gradle.kts index 84cbae3..d9a3e15 100644 --- a/maps-build-logic/build.gradle.kts +++ b/maps-build-logic/build.gradle.kts @@ -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") } diff --git a/maps-google/src/iosX64Main/kotlin/dev/icerock/moko/maps/google/GoogleMapController.kt b/maps-google/src/iosX64Main/kotlin/dev/icerock/moko/maps/google/GoogleMapController.kt index c0310a5..4a85038 100644 --- a/maps-google/src/iosX64Main/kotlin/dev/icerock/moko/maps/google/GoogleMapController.kt +++ b/maps-google/src/iosX64Main/kotlin/dev/icerock/moko/maps/google/GoogleMapController.kt @@ -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 @@ -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