Skip to content

Commit f21fdd2

Browse files
chore(deps): Updated Kotlin from v1.7.0 to v1.9.10, Gradle from v6.7.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
1 parent f778389 commit f21fdd2

21 files changed

+5778
-5457
lines changed

.editorconfig

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ end_of_line = lf
44
insert_final_newline = true
55
trim_trailing_whitespace = true
66

7-
[*.{kt,gradle}]
7+
[*.{kt,kts}]
88
indent_style = space
99
indent_size = 4
10+
ktlint_standard_no-wildcard-imports = disabled
11+
ktlint_standard_filename = disabled
12+
ktlint_standard_enum-entry-name-case = disabled

kotlin/build.gradle

Lines changed: 0 additions & 83 deletions
This file was deleted.

kotlin/build.gradle.kts

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
group = "com.looker.sdk"
2+
defaultTasks = mutableListOf("jar")
3+
4+
val kotlinVersion = providers.gradleProperty("kotlinVersion").get()
5+
val ktorVersion = providers.gradleProperty("ktorVersion").get()
6+
7+
plugins {
8+
kotlin("jvm")
9+
id("com.diffplug.spotless")
10+
}
11+
12+
sourceSets {
13+
main {
14+
kotlin {
15+
setSrcDirs(listOf("src/main/"))
16+
}
17+
}
18+
test {
19+
kotlin {
20+
setSrcDirs(listOf("src/test"))
21+
}
22+
}
23+
}
24+
25+
repositories {
26+
mavenCentral()
27+
maven { url = uri("https://dl.bintray.com/kotlin/ktor") }
28+
maven { url = uri("https://dl.bintray.com/kotlin/kotlinx") }
29+
maven { url = uri("https://jitpack.io") }
30+
}
31+
32+
dependencies {
33+
implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
34+
35+
implementation("io.github.cdimascio:dotenv-kotlin:6.2.2")
36+
implementation("org.ini4j:ini4j:0.5.4")
37+
38+
implementation("io.ktor:ktor-client:$ktorVersion")
39+
implementation("io.ktor:ktor-client-okhttp:$ktorVersion")
40+
implementation("io.ktor:ktor-client-json:$ktorVersion")
41+
implementation("io.ktor:ktor-client-gson:$ktorVersion")
42+
43+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
44+
implementation("com.google.code.gson:gson:2.8.5")
45+
46+
testImplementation("org.junit.jupiter:junit-jupiter-api:5.3.1")
47+
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.3.1")
48+
testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion")
49+
}
50+
51+
spotless {
52+
kotlin {
53+
ktlint("0.50.0").setEditorConfigPath("$projectDir/../.editorconfig")
54+
}
55+
}
56+
57+
kotlin {
58+
jvmToolchain(17)
59+
}
60+
61+
tasks.test {
62+
testLogging {
63+
exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
64+
}
65+
}

kotlin/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
kotlinVersion=1.7.10
1+
kotlinVersion=1.9.10
22
ktorVersion=1.6.7
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

kotlin/settings.gradle

Lines changed: 0 additions & 7 deletions
This file was deleted.

kotlin/settings.gradle.kts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
rootProject.name = "looker-kotlin-sdk"
2+
3+
pluginManagement {
4+
val kotlinVersion = providers.gradleProperty("kotlinVersion").get()
5+
plugins {
6+
kotlin("jvm") version kotlinVersion
7+
id("com.diffplug.spotless") version "6.20.0"
8+
id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
9+
}
10+
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import io.ktor.http.*
2929

3030
open class AuthSession(
3131
open val apiSettings: ConfigurationProvider,
32-
open val transport: Transport = Transport(apiSettings)
32+
open val transport: Transport = Transport(apiSettings),
3333
) {
3434

3535
var authToken: AuthToken = AuthToken()
@@ -148,15 +148,15 @@ open class AuthSession(
148148
Parameters.build {
149149
append(client_id, clientId)
150150
append(client_secret, clientSecret)
151-
}
151+
},
152152
)
153153
val token = ok<AuthToken>(
154154
transport.request<AuthToken>(
155155
HttpMethod.POST,
156156
"$apiPath/login",
157157
emptyMap(),
158-
body
159-
)
158+
body,
159+
),
160160
)
161161
authToken = token
162162
}
@@ -165,7 +165,7 @@ open class AuthSession(
165165
val token = activeToken()
166166
val sudoToken = transport.request<AuthToken>(
167167
HttpMethod.POST,
168-
"/login/$newId"
168+
"/login/$newId",
169169
) { requestSettings ->
170170
val headers = requestSettings.headers.toMutableMap()
171171
if (token.accessToken.isNotBlank()) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ data class AuthToken(
4040
@SerializedName("expires_in")
4141
var expiresIn: Long = 0L,
4242
@SerializedName("refresh_token")
43-
var refreshToken: String? = null
43+
var refreshToken: String? = null,
4444
) {
4545

4646
var expiresAt: LocalDateTime = LocalDateTime.now()
@@ -53,7 +53,7 @@ data class AuthToken(
5353
token.access_token!!,
5454
token.token_type!!,
5555
token.expires_in!!.toLong(),
56-
token.refresh_token
56+
token.refresh_token,
5757
)
5858

5959
init {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ fun unQuote(value: String?): String {
9595
enum class ResponseMode {
9696
String,
9797
Binary,
98-
Unknown
98+
Unknown,
9999
}
100100

101101
fun responseMode(contentType: String): ResponseMode {

0 commit comments

Comments
 (0)