Skip to content

Commit c44a5ff

Browse files
chore(deps): Updated Kotlin from v1.7.0 to v1.9.0, Gradle from v6.7.1 to v8.2.1 and upgraded linter
1 parent 6b1abb9 commit c44a5ff

File tree

7 files changed

+79
-93
lines changed

7 files changed

+79
-93
lines changed

.editorconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ 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

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(8)
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.0
22
ktorVersion=1.5.4
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.2.1-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: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
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+
}
9+
}

0 commit comments

Comments
 (0)