chore(deps): Updated Kotlin from v1.7.0 to v1.9.10, Gradle from v6.7.… (

#1379)

…1 to v8.3 and upgraded linter (#1343)

* chore(deps): Updated Kotlin from v1.7.0 to v1.9.10, Gradle from v6.7.1
to v8.3 and upgraded linter

* chore(deps): upgraded kotlin linter formatted code

* chore(deps): Updated Kotlin from v1.7.0 to v1.9.10, Gradle from v6.7.1
to v8.3 and upgraded linter

adding foojay-resolver-convention gradle plugin

* chore(deps): Updated Kotlin from v1.7.0 to v1.9.10, Gradle from v6.7.1
to v8.3 and upgraded linter

setting gradle jvm toolchain version from 8 to 17

* chore(deps): upgraded kotlin linter formatted code

from #1343

.editorconfig

@@ -4,6 +4,9 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.{kt,gradle}]
+[*.{kt,kts}]
 indent_style = space
 indent_size = 4
+ktlint_standard_no-wildcard-imports = disabled
+ktlint_standard_filename = disabled
+ktlint_standard_enum-entry-name-case = disabled

kotlin/build.gradle.kts

@@ -0,0 +1,67 @@
+group = "com.looker.sdk"
+defaultTasks = mutableListOf("jar")
+
+val kotlinVersion = providers.gradleProperty("kotlinVersion").get()
+val googleHttpVersion = providers.gradleProperty("googleHttpVersion").get()
+
+plugins {
+    kotlin("jvm")
+    id("com.diffplug.spotless")
+}
+
+sourceSets {
+    main {
+        kotlin {
+            setSrcDirs(listOf("src/main/"))
+        }
+    }
+    test {
+        kotlin {
+            setSrcDirs(listOf("src/test"))
+        }
+    }
+}
+
+repositories {
+    mavenCentral()
+    maven { url = uri("https://dl.bintray.com/kotlin/ktor") }
+    maven { url = uri("https://dl.bintray.com/kotlin/kotlinx") }
+    maven { url = uri("https://jitpack.io") }
+}
+
+dependencies {
+    implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
+
+    implementation("io.github.cdimascio:dotenv-kotlin:6.2.2")
+    implementation("org.ini4j:ini4j:0.5.4")
+
+    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")
+
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.3.1")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.3.1")
+    testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion")
+}
+
+spotless {
+    kotlin {
+        ktlint("0.50.0").setEditorConfigPath("$projectDir/../.editorconfig")
+    }
+}
+
+kotlin {
+    jvmToolchain(17)
+}
+
+tasks.test {
+    testLogging {
+        exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
+    }
+}

kotlin/gradle.properties

@@ -1,2 +1,2 @@
-kotlinVersion=1.7.10
+kotlinVersion=1.9.10
 googleHttpVersion=1.43.3

kotlin/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

kotlin/settings.gradle.kts

@@ -0,0 +1,10 @@
+rootProject.name = "looker-kotlin-sdk"
+
+pluginManagement {
+    val kotlinVersion = providers.gradleProperty("kotlinVersion").get()
+    plugins {
+        kotlin("jvm") version kotlinVersion
+        id("com.diffplug.spotless") version "6.20.0"
+        id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
+    }
+}

kotlin/src/main/com/looker/rtl/AuthToken.kt

@@ -40,7 +40,7 @@ data class AuthToken(
     @SerializedName("expires_in")
     var expiresIn: Long = 0L,
     @SerializedName("refresh_token")
-    var refreshToken: String? = null
+    var refreshToken: String? = null,
 ) {
 
     var expiresAt: LocalDateTime = LocalDateTime.now()
@@ -53,7 +53,7 @@ data class AuthToken(
         token.access_token!!,
         token.token_type!!,
         token.expires_in!!.toLong(),
-        token.refresh_token
+        token.refresh_token,
     )
 
     init {

kotlin/src/main/com/looker/rtl/Constants.kt

@@ -96,7 +96,7 @@ fun unQuote(value: String?): String {
 enum class ResponseMode {
     String,
     Binary,
-    Unknown
+    Unknown,
 }
 
 fun responseMode(contentType: String): ResponseMode {

kotlin/src/main/com/looker/rtl/ErrorDoc.kt

@@ -33,10 +33,13 @@ typealias ErrorCodeIndex = HashMap<String, ErrorDocItem>
 interface IErrorDocLink {
     /** base redirector url */
     var redirector: String
+
     /** api version of the error link */
     var apiVersion: String
+
     /** HTTP status code */
     var statusCode: String
+
     /** REST API Path */
     var apiPath: String
 }
@@ -143,7 +146,7 @@ class ErrorDoc(val sdk: APIMethods, val cdnUrl: String = ErrorCodesUrl) : IError
             match.groupValues[1],
             match.groupValues[2],
             match.groupValues[3],
-            match.groupValues[4]
+            match.groupValues[4],
         )
     }
 
@@ -182,7 +185,10 @@ class ErrorDoc(val sdk: APIMethods, val cdnUrl: String = ErrorCodesUrl) : IError
 
     override fun specPath(path: String): String {
         val rx = Regex("""(:\w+)""")
-        val result = path.replace(rx) { val x = it.value.substring(1); "{$x}" }
+        val result = path.replace(rx) {
+            val x = it.value.substring(1)
+            "{$x}"
+        }
         return result
     }
 
@@ -220,5 +226,5 @@ class ErrorDocLink(
     override var redirector: String = "",
     override var apiVersion: String = "",
     override var statusCode: String = "",
-    override var apiPath: String = ""
+    override var apiPath: String = "",
 ) : IErrorDocLink

kotlin/src/main/com/looker/rtl/OAuthSession.kt

@@ -36,7 +36,7 @@ fun base64UrlEncode(bytes: ByteArray): String {
 @ExperimentalUnsignedTypes
 class OAuthSession(
     override val apiSettings: ConfigurationProvider,
-    override val transport: Transport = Transport(apiSettings)
+    override val transport: Transport = Transport(apiSettings),
 ) :
     AuthSession(apiSettings, transport) {
     private var random = SecureRandom()
@@ -52,7 +52,7 @@ class OAuthSession(
             HttpMethod.POST,
             "/api/token",
             emptyMap(),
-            body
+            body,
         )
         val token = this.ok<AccessToken>(response)
         this.authToken.setToken(token)
@@ -69,8 +69,8 @@ class OAuthSession(
                         "grant_type" to "refresh_token",
                         "refresh_token" to this.activeToken().refreshToken,
                         "client_id" to config["client_id"],
-                        "redirect_uri" to config["redirect_uri"]
-                    )
+                        "redirect_uri" to config["redirect_uri"],
+                    ),
                 )
             }
         }
@@ -94,8 +94,8 @@ class OAuthSession(
                 "scope" to scope,
                 "state" to state,
                 "code_challenge_method" to "S256",
-                "code_challenge" to codeChallenge
-            )
+                "code_challenge" to codeChallenge,
+            ),
         )
     }
 
@@ -107,7 +107,7 @@ class OAuthSession(
             "code" to authCode,
             "code_verifier" to verifier,
             "client_id" to (config["client_id"] ?: error("")),
-            "redirect_uri" to (config["redirect_uri"] ?: error(""))
+            "redirect_uri" to (config["redirect_uri"] ?: error("")),
         )
     }