Skip to content

Commit

Permalink
Upgrade libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisKruegerDev committed Nov 16, 2024
1 parent bcefd40 commit 4fc43bd
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 44 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/captures
.externalNativeBuild
.cxx
.kotlin
local.properties
xcuserdata/
project.xcworkspace/
Expand Down
30 changes: 10 additions & 20 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,30 +1,23 @@
[versions]
kotlin = "1.9.23"
kotlin = "2.0.21"
spotless = "6.23.3"
ben-manes-versions = "0.50.0"
ben-manes-versions = "0.51.0"
dokka = "1.9.20"
nexus = "1.3.0"
kotlinx-datetime = "0.5.0"
kotlinx-serialization = "1.6.3"
coroutines = "1.8.0"
ktor = "2.3.10"
ktlint = "0.49.1"
junit-jupiter = "5.10.2"
truth = "1.4.2"
kotlinx-datetime = "0.6.1"
kotlinx-serialization = "1.7.3"
coroutines = "1.9.0"
ktor = "3.0.1"
ktlint = "1.1.1"
junit-jupiter = "5.11.3"
truth = "1.4.4"
junit = "4.13.2"
mockito-kotlin = "5.1.0"
mockito-inline = "5.2.0"
maven-publish = "0.25.3"
maven-publish = "0.30.0"

[plugins]
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
kotlin-gradle-plugin = { id = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
ben-manes-versions = { id = "com.github.ben-manes.versions", version.ref = "ben-manes-versions" }
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
nexus = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexus" }
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "maven-publish" }

Expand All @@ -51,7 +44,4 @@ junit = { module = "junit:junit", version.ref = "junit" }

junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit-jupiter" }
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit-jupiter" }
junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit-jupiter" }
truth = { module = "com.google.truth:truth", version.ref = "truth" }
mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "mockito-inline" }
mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockito-kotlin" }
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import io.ktor.client.HttpClientConfig
import io.ktor.client.engine.HttpClientEngineConfig
import io.ktor.client.engine.HttpClientEngineFactory
import io.ktor.client.plugins.auth.providers.BearerTokens
import io.ktor.client.plugins.logging.Logging
import io.ktor.client.plugins.logging.LoggingConfig

@TraktDsl
class TraktClientConfig {
Expand All @@ -23,13 +23,13 @@ class TraktClientConfig {

internal var httpClientConfigBlock: (HttpClientConfig<*>.() -> Unit)? = null
internal var httpClientBuilder: (() -> HttpClient)? = null
internal var httpClientLoggingBlock: (Logging.Config.() -> Unit)? = null
internal var httpClientLoggingBlock: (LoggingConfig.() -> Unit)? = null

fun userAuthentication(block: TraktAuthCredentials.() -> Unit) {
traktAuthCredentials = TraktAuthCredentials().apply(block)
}

fun logging(block: Logging.Config.() -> Unit) {
fun logging(block: LoggingConfig.() -> Unit) {
httpClientLoggingBlock = block
}

Expand Down

This file was deleted.

0 comments on commit 4fc43bd

Please sign in to comment.