From 8fc95c7fd3a7a61ee41da4d8542ef719455c8ca9 Mon Sep 17 00:00:00 2001 From: Matthew Nelson Date: Fri, 30 Aug 2024 08:53:30 -0400 Subject: [PATCH 1/2] Update dependencies --- .kotlin-js-store/yarn.lock | 6 +++--- build-logic/src/main/kotlin/-KmpConfigurationExtension.kt | 5 ++--- gradle/libs.versions.toml | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.kotlin-js-store/yarn.lock b/.kotlin-js-store/yarn.lock index d1b22bf..a3a1ff3 100644 --- a/.kotlin-js-store/yarn.lock +++ b/.kotlin-js-store/yarn.lock @@ -151,9 +151,9 @@ emoji-regex@^8.0.0: integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== escalade@^3.1.1: - version "3.1.2" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27" - integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA== + version "3.2.0" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5" + integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA== escape-string-regexp@4.0.0: version "4.0.0" diff --git a/build-logic/src/main/kotlin/-KmpConfigurationExtension.kt b/build-logic/src/main/kotlin/-KmpConfigurationExtension.kt index 02b9ea5..5bd28d4 100644 --- a/build-logic/src/main/kotlin/-KmpConfigurationExtension.kt +++ b/build-logic/src/main/kotlin/-KmpConfigurationExtension.kt @@ -32,10 +32,9 @@ fun KmpConfigurationExtension.configureShared( js { target { nodejs { - @Suppress("RedundantSamConstructor") - testTask(Action { + testTask { useMocha { timeout = "30s" } - }) + } } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5b2c1fa..a5d8d6a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,9 +4,9 @@ androidx-test-runner = "1.5.2" gradle-android = "8.2.2" gradle-binary-compat = "0.14.0" -gradle-kmp-configuration = "0.2.2" +gradle-kmp-configuration = "0.3.2" gradle-kotlin = "1.9.24" -gradle-publish-maven = "0.28.0" +gradle-publish-maven = "0.29.0" # tests encoding = "2.2.1" From da60d43cd691ade4d10cca4e1b88f120dd40a727 Mon Sep 17 00:00:00 2001 From: Matthew Nelson Date: Fri, 30 Aug 2024 08:56:20 -0400 Subject: [PATCH 2/2] Enable build option useUniqueModuleNames --- library/file/build.gradle.kts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/library/file/build.gradle.kts b/library/file/build.gradle.kts index 992e723..90a8410 100644 --- a/library/file/build.gradle.kts +++ b/library/file/build.gradle.kts @@ -23,6 +23,10 @@ private val testConfig = TestConfigInject() kmpConfiguration { configureShared(publish = true) { + options { + useUniqueModuleNames = true + } + jvm { @OptIn(ExperimentalKmpConfigurationApi::class) java9ModuleInfoName = "io.matthewnelson.kmp.file"