Skip to content

Commit

Permalink
chore(deps): update libs
Browse files Browse the repository at this point in the history
 - fix uts.
  • Loading branch information
hanrw committed Jul 16, 2024
1 parent 3616ac5 commit bd1ca5c
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 43 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ class DefaultMessagesApiTest : KoinTest {
// When
chatsApi.stream(request).test {
// Then
expectNoEvents()
cancel()
awaitComplete()
}
}

Expand Down
88 changes: 48 additions & 40 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,20 +1,56 @@
## Generated by $ ./gradlew refreshVersionsCatalog

[bundles]

ktor-client = ["ktor-client-core", "ktor-serialization-kotlinx-json", "ktor-client-logging", "ktor-client-auth", "ktor-client-content-negotiation"]
jvm-test = ["juinit-jupiter", "mockito-junit-jupiter", "mockito-kotlin", "ktor-client-mock", "assertj-core"]

[plugins]

#kotlin-gradle-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }

androidLibrary = { id = "com.android.library", version.ref = "agp" }
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

# Swift Kotlin Interface Enhancer
touchlab-skie = { id = "co.touchlab.skie", version.ref = "touchlab-skie" }

com-linecorp-build-recipe = { id = "com.linecorp.build-recipe-plugin", version.ref = "com-linecorp-build-recipe-plugin" }

kotlinx-binary-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.14.0" }
## ⬆ = "0.15.0" }
## ⬆ = "0.15.1" }

# Quality and coverage
kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }

# Publishing
touchlab-kmmbridge = { id = "co.touchlab.kmmbridge", version.ref = "touchlab-kmmbridge" }

build-dokka-plugin = { id = "org.jetbrains.dokka", version.ref = "dokka" }

# Formatting
gradle-kotlinter = { id = "org.jmailen.kotlinter", version.ref = "gradle-kotlinter" }

[versions]
agp = "8.1.0"

agp = "8.5.1"
kotlin = "2.0.0"

ktor = "2.3.11"
ktor = "2.3.12"
kotlinx-serialization = "1.7.1"
kover = "0.8.1"
kover = "0.8.2"
kotlinx-coroutines = "1.8.1"

#logging-versions
napier = "2.6.1"

#test-versions
junit = "5.10.1"
mockito-junit-jupiter = "5.8.0"
mockito-kotlin = "5.2.1"
assertj-core = "3.24.2"
junit = "5.10.3"
mockito-junit-jupiter = "5.12.0"
mockito-kotlin = "5.4.0"
assertj-core = "3.26.3"
app-cash-turbine = "1.0.0"

#formatting-versions
Expand All @@ -27,15 +63,18 @@ koin-core = "3.5.6"
touchlab-skie = "0.8.2"

touchlab-kmmbridge = "0.5.3"
## ⬆ = "0.5.4"
## ⬆ = "0.5.5"

com-linecorp-build-recipe-plugin = "1.1.1"

dokka = "1.9.10"
dokka = "1.9.20"

android-minSdk = "24"
android-compileSdk = "34"

[libraries]

kotlin-gradle-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
Expand Down Expand Up @@ -75,38 +114,7 @@ assertj-core = { module = "org.assertj:assertj-core", version.ref = "assertj-cor
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }

app-cash-turbine = { module = "app.cash.turbine:turbine", version = "1.0.0" }
## ⬆ = "1.1.0" }

# Formatting
gradle-kotlinter = { module = "org.jmailen.gradle:kotlinter-gradle", version.ref = "gradle-kotlinter" }

[plugins]
#kotlin-gradle-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }

androidLibrary = { id = "com.android.library", version.ref = "agp" }
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

# Swift Kotlin Interface Enhancer
touchlab-skie = { id = "co.touchlab.skie", version.ref = "touchlab-skie" }

com-linecorp-build-recipe = { id = "com.linecorp.build-recipe-plugin", version.ref = "com-linecorp-build-recipe-plugin" }

kotlinx-binary-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.14.0" }

# Quality and coverage
kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }

# Publishing
touchlab-kmmbridge = { id = "co.touchlab.kmmbridge", version.ref = "touchlab-kmmbridge" }

build-dokka-plugin = { id = "org.jetbrains.dokka", version.ref = "dokka" }



# Formatting
gradle-kotlinter = { id = "org.jmailen.kotlinter", version.ref = "gradle-kotlinter" }

[bundles]
ktor-client = ["ktor-client-core", "ktor-serialization-kotlinx-json", "ktor-client-logging", "ktor-client-auth", "ktor-client-content-negotiation"]
jvm-test = ["juinit-jupiter", "mockito-junit-jupiter", "mockito-kotlin", "ktor-client-mock", "assertj-core"]

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.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
19 changes: 19 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,25 @@ dependencyResolutionManagement {
rootProject.name = "openai-kotlin"
enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")


plugins {
id("de.fayard.refreshVersions") version "0.60.5"
}

fun String.isNonStable(): Boolean {
val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { uppercase().contains(it) }
val regex = "^[0-9,.v-]+(-r)?$".toRegex()
val isStable = stableKeyword || regex.matches(this)
return isStable.not()
}

refreshVersions {
rejectVersionIf {
candidate.value.isNonStable()
}
}


include(":common")

//include(":library")
Expand Down

0 comments on commit bd1ca5c

Please sign in to comment.