Skip to content

Commit

Permalink
refactor(BE-122): retrieve-the-authenticated-user
Browse files Browse the repository at this point in the history
 - update kotlin to 2.0.0-Beta1
 - update junit to 5
 - add refreshVersions
  • Loading branch information
hanrw committed Nov 25, 2023
1 parent 211fd73 commit e724ced
Show file tree
Hide file tree
Showing 7 changed files with 63 additions and 36 deletions.
53 changes: 28 additions & 25 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,29 @@
## 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]

kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

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

#publishing
multiplatform-swiftpackage = { id = "io.github.luca992.multiplatform-swiftpackage", version.ref = "multiplatform-swiftpackage" }

[versions]
kotlin = "1.9.20"
junit = "4.13.2"

kotlin = "2.0.0-Beta1"
ktor = "2.3.6"
kotlinx-serialization = "1.6.0"
kotlinx-serialization = "1.6.1"
kover = "0.7.4"

jupiter = "5.10.1"
junit = "5.10.1"
mockito-junit-jupiter = "5.7.0"
mockito-kotlin = "5.1.0"
assertj-core = "3.24.2"
Expand All @@ -14,9 +32,7 @@ assertj-core = "3.24.2"
multiplatform-swiftpackage = "2.2.0"

[libraries]
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
junit = { group = "junit", name = "junit", version.ref = "junit" }

kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlin" }
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
Expand All @@ -28,25 +44,12 @@ ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negoti
#jvm-libraries
ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }

## testing
jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "jupiter" }
jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "jupiter" }
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }

junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
juinit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito-junit-jupiter" }
mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockito-kotlin" }
ktor-client-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" }
assertj-core = { module = "org.assertj:assertj-core", version.ref = "assertj-core" }

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


[plugins]
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

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

#publishing
multiplatform-swiftpackage = { id = "io.github.luca992.multiplatform-swiftpackage", version.ref = "multiplatform-swiftpackage" }
18 changes: 18 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,22 @@ dependencyResolutionManagement {
}
}

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

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

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


include(":shared")
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.snacks.lemonsqueezy.api

import org.junit.Assert.assertEquals
import org.junit.Test
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test

class LemonSqueezyTest {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
package com.snacks.lemonsqueezy.api.internal.network.ktor

import com.snacks.lemonsqueezy.api.mockHttpClient
import com.snacks.lemonsqueezy.api.internal.network.ktor.DefaultHttpRequester
import com.snacks.lemonsqueezy.api.internal.network.ktor.HttpRequester
import com.snacks.lemonsqueezy.api.internal.network.ktor.default
import com.snacks.lemonsqueezy.api.internal.network.ktor.performRequest
import io.ktor.client.*
import io.ktor.client.request.*
import kotlinx.coroutines.runBlocking
import org.junit.Test
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test

class DefaultHttpRequesterTest {
private lateinit var httpClient: HttpClient
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import io.ktor.client.request.*
import io.ktor.http.*
import io.ktor.util.reflect.*
import kotlinx.coroutines.runBlocking
import org.junit.Assert.assertEquals
import org.junit.Test
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
import org.mockito.Mockito.mock
import org.mockito.kotlin.any
import org.mockito.kotlin.argThat
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import io.ktor.client.request.*
import io.ktor.http.*
import io.ktor.util.reflect.*
import kotlinx.coroutines.runBlocking
import org.junit.Assert.assertEquals
import org.junit.Test
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
import org.mockito.Mockito
import org.mockito.kotlin.argThat
import org.mockito.kotlin.argumentCaptor
Expand Down
10 changes: 10 additions & 0 deletions versions.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#### Dependencies and Plugin versions with their available updates.
#### Generated by `./gradlew refreshVersions` version 0.60.3
####
#### Don't manually edit or split the comments that start with four hashtags (####),
#### they will be overwritten by refreshVersions.
####
#### suppress inspection "SpellCheckingInspection" for whole file
#### suppress inspection "UnusedProperty" for whole file
####
#### NOTE: Some versions are filtered by the rejectVersionIf predicate. See the settings.gradle.kts file.

0 comments on commit e724ced

Please sign in to comment.