Skip to content

Commit

Permalink
chore(deps): Updated Kotlin from v1.7.0 to v1.9.0, Gradle from v6.7.1…
Browse files Browse the repository at this point in the history
… to v8.2.1 and upgraded linter
  • Loading branch information
daniel-lopes-optimizely committed Jul 21, 2023
1 parent 6b1abb9 commit c44a5ff
Show file tree
Hide file tree
Showing 7 changed files with 79 additions and 93 deletions.
4 changes: 3 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ 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
83 changes: 0 additions & 83 deletions kotlin/build.gradle

This file was deleted.

65 changes: 65 additions & 0 deletions kotlin/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
group = "com.looker.sdk"
defaultTasks = mutableListOf("jar")

val kotlinVersion = providers.gradleProperty("kotlinVersion").get()
val ktorVersion = providers.gradleProperty("ktorVersion").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("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("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(8)
}

tasks.test {
testLogging {
exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
}
}
2 changes: 1 addition & 1 deletion kotlin/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
kotlinVersion=1.7.10
kotlinVersion=1.9.0
ktorVersion=1.5.4
2 changes: 1 addition & 1 deletion kotlin/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
7 changes: 0 additions & 7 deletions kotlin/settings.gradle

This file was deleted.

9 changes: 9 additions & 0 deletions kotlin/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
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"
}
}

0 comments on commit c44a5ff

Please sign in to comment.