From 71808f6c803e03f9397d6c940cd863d2e54a2ab5 Mon Sep 17 00:00:00 2001 From: Daniel Lopes Date: Mon, 23 Oct 2023 11:28:59 +0200 Subject: [PATCH] chore(deps): Updated Kotlin from v1.7.0 to v1.9.10, Gradle from v6.7.1 to v8.4 and upgraded linter setting gradle jvm toolchain version from 8 to 17 --- kotlin/build.gradle.kts | 12 +++++++----- kotlin/gradle.properties | 2 +- kotlin/gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/kotlin/build.gradle.kts b/kotlin/build.gradle.kts index f89bfcddc..de225da65 100644 --- a/kotlin/build.gradle.kts +++ b/kotlin/build.gradle.kts @@ -2,7 +2,7 @@ group = "com.looker.sdk" defaultTasks = mutableListOf("jar") val kotlinVersion = providers.gradleProperty("kotlinVersion").get() -val ktorVersion = providers.gradleProperty("ktorVersion").get() +val googleHttpVersion = providers.gradleProperty("googleHttpVersion").get() plugins { kotlin("jvm") @@ -35,10 +35,12 @@ dependencies { implementation("io.github.cdimascio:dotenv-kotlin:6.2.2") implementation("org.ini4j:ini4j:0.5.4") - implementation("io.ktor:ktor-client:$ktorVersion") - implementation("io.ktor:ktor-client-okhttp:$ktorVersion") - implementation("io.ktor:ktor-client-json:$ktorVersion") - implementation("io.ktor:ktor-client-gson:$ktorVersion") + implementation("commons-configuration:commons-configuration:1.10") + + implementation(platform("com.google.http-client:google-http-client-bom:$googleHttpVersion")) + implementation("com.google.http-client:google-http-client") + implementation("com.google.http-client:google-http-client-apache-v2") + implementation("com.google.http-client:google-http-client-gson") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") implementation("com.google.code.gson:gson:2.8.5") diff --git a/kotlin/gradle.properties b/kotlin/gradle.properties index d73c586a9..ee71eb3ab 100644 --- a/kotlin/gradle.properties +++ b/kotlin/gradle.properties @@ -1,2 +1,2 @@ -kotlinVersion=1.7.10 +kotlinVersion=1.9.10 googleHttpVersion=1.43.3 diff --git a/kotlin/gradle/wrapper/gradle-wrapper.properties b/kotlin/gradle/wrapper/gradle-wrapper.properties index db9a6b825..e411586a5 100644 --- a/kotlin/gradle/wrapper/gradle-wrapper.properties +++ b/kotlin/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists