From 360d02cc8c7dd2bdac20f0b735c780e7b2b2fd9b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Dec 2023 13:31:48 +0000 Subject: [PATCH 1/2] Bump com.willowtreeapps.assertk:assertk-jvm from 0.27.0 to 0.28.0 Bumps [com.willowtreeapps.assertk:assertk-jvm](https://github.com/willowtreeapps/assertk) from 0.27.0 to 0.28.0. - [Release notes](https://github.com/willowtreeapps/assertk/releases) - [Changelog](https://github.com/willowtreeapps/assertk/blob/main/CHANGELOG.md) - [Commits](https://github.com/willowtreeapps/assertk/compare/v0.27.0...v0.28.0) --- updated-dependencies: - dependency-name: com.willowtreeapps.assertk:assertk-jvm dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 14f74df..7477092 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -28,7 +28,7 @@ kotlinx-metadata = "org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.8.0" junit-jupiter = "org.junit.jupiter:junit-jupiter:5.10.1" -assertk = "com.willowtreeapps.assertk:assertk-jvm:0.27.0" +assertk = "com.willowtreeapps.assertk:assertk-jvm:0.28.0" compileTesting-core = { module = "com.github.tschuchortdev:kotlin-compile-testing", version.ref = "compileTesting" } compileTesting-ksp = { module = "com.github.tschuchortdev:kotlin-compile-testing-ksp", version.ref = "compileTesting" } From ab941328ee2d21ca0290de92208d8589f5bc7a8c Mon Sep 17 00:00:00 2001 From: Nicklas Ansman Date: Fri, 29 Dec 2023 08:34:23 -0500 Subject: [PATCH 2/2] Fix the deprecations --- api/build.gradle.kts | 4 ++-- .../se/ansman/kotshi/ManuallyRegisteredAdapterTest.kt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 4b4a1a1..dc3b3d3 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -8,13 +8,13 @@ dependencies { api(libs.moshi.oldestSupported) } -val packagesMarkdown = buildDir.resolve("generated/docs/packages.md") +val packagesMarkdown = layout.buildDirectory.file("generated/docs/packages.md") val buildPackagesDocs by tasks.registering { val readme = rootDir.resolve("README.md") inputs.file(readme) outputs.file(packagesMarkdown) doFirst { - packagesMarkdown.writer().use { writer -> + packagesMarkdown.get().asFile.writer().use { writer -> writer.write("# Module kotshi\n\n") readme.reader().use { reader -> reader.copyTo(writer) diff --git a/tests/src/test/kotlin/se/ansman/kotshi/ManuallyRegisteredAdapterTest.kt b/tests/src/test/kotlin/se/ansman/kotshi/ManuallyRegisteredAdapterTest.kt index e21337d..c27077c 100644 --- a/tests/src/test/kotlin/se/ansman/kotshi/ManuallyRegisteredAdapterTest.kt +++ b/tests/src/test/kotlin/se/ansman/kotshi/ManuallyRegisteredAdapterTest.kt @@ -5,7 +5,7 @@ import assertk.assertThat import assertk.assertions.containsExactly import assertk.assertions.isInstanceOf import assertk.assertions.isNotInstanceOf -import assertk.assertions.isSameAs +import assertk.assertions.isSameInstanceAs import com.squareup.moshi.Moshi import com.squareup.moshi.adapter import org.junit.jupiter.api.Test @@ -20,7 +20,7 @@ class ManuallyRegisteredAdapterTest { @Test fun testRegistersRegularAdapter() { assertThat(moshi.adapter(ManuallyRegisteredAdapter.Type::class.java)) - .isSameAs(ManuallyRegisteredAdapter) + .isSameInstanceAs(ManuallyRegisteredAdapter) } @OptIn(ExperimentalStdlibApi::class) @@ -63,7 +63,7 @@ class ManuallyRegisteredAdapterTest { assertThat(adapter) .isInstanceOf>() .given { - assertThat(it.moshi).isSameAs(moshi) + assertThat(it.moshi).isSameInstanceAs(moshi) assertThat(it.types).containsExactly(Int::class.javaObjectType) } }