diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 8d664eac7..f83c32a9c 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -17,5 +17,5 @@ dependencies { implementation("io.github.gradle-nexus:publish-plugin:1.1.0") implementation("org.ajoberstar.reckon:reckon-gradle:0.16.1") implementation("com.squareup:kotlinpoet:1.12.0") - implementation("com.google.code.gson:gson:2.10") + implementation("com.google.code.gson:gson:2.10.1") } diff --git a/buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/kotlin-library.gradle.kts b/buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/kotlin-library.gradle.kts index b70a49296..ab04a988c 100644 --- a/buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/kotlin-library.gradle.kts +++ b/buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/kotlin-library.gradle.kts @@ -90,7 +90,7 @@ kotlin { dependsOn(commonNonJsTest) dependencies { implementation(kotlin("test-junit5")) - implementation("org.junit.jupiter:junit-jupiter-engine:5.9.1") + implementation("org.junit.jupiter:junit-jupiter-engine:5.9.2") } } val nativeMain by creating { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 19aa68ba5..e608f591c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,13 +1,13 @@ [versions] kotlin = "1.8.0" -okio = "3.2.0" +okio = "3.3.0" serialization = "1.4.1" diktat = "1.2.4.1" kotlinx-cli = "0.3.5" kotlinx-datetime = "0.4.0" kotlinx-coroutines = "1.6.3-native-mt" -junit = "5.9.1" -ktoml = "0.3.0" +junit = "5.9.2" +ktoml = "0.4.0" multiplatform-diff = "0.4.0" kotlinpoet = "1.12.0" kotest = "5.5.4" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 070cb702f..f398c33c4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/save-core/src/commonNonJsMain/kotlin/com/saveourtool/save/core/utils/TomlUtils.kt b/save-core/src/commonNonJsMain/kotlin/com/saveourtool/save/core/utils/TomlUtils.kt index c3b5c43b4..1b326dfb4 100644 --- a/save-core/src/commonNonJsMain/kotlin/com/saveourtool/save/core/utils/TomlUtils.kt +++ b/save-core/src/commonNonJsMain/kotlin/com/saveourtool/save/core/utils/TomlUtils.kt @@ -18,7 +18,7 @@ import com.akuleshov7.ktoml.TomlInputConfig import com.akuleshov7.ktoml.exceptions.TomlDecodingException import com.akuleshov7.ktoml.file.TomlFileReader import com.akuleshov7.ktoml.parsers.TomlParser -import com.akuleshov7.ktoml.tree.TomlTable +import com.akuleshov7.ktoml.tree.nodes.TomlTable import okio.FileSystem import okio.Path @@ -26,21 +26,23 @@ import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.serializer private fun Path.testConfigFactory(table: TomlTable) = - when (table.fullTableName.uppercase().replace("\"", "")) { + when (table.fullTableName() + .uppercase() + .replace("\"", "")) { TestConfigSections.FIX.name -> this.createPluginConfig( - table.fullTableName + table.fullTableName() ) TestConfigSections.`FIX AND WARN`.name -> this.createPluginConfig( - table.fullTableName + table.fullTableName() ) TestConfigSections.WARN.name -> this.createPluginConfig( - table.fullTableName + table.fullTableName() ) TestConfigSections.GENERAL.name -> this.createPluginConfig( - table.fullTableName + table.fullTableName() ) else -> throw PluginException( - "Received unknown plugin section name in the input: [${table.fullTableName}]." + + "Received unknown plugin section name in the input: [${table.fullTableName()}]." + " Please check your <$this> config" ) } @@ -67,6 +69,8 @@ private inline fun Path.createPluginConfig( throw e } +private fun TomlTable.fullTableName(): String = fullTableKey.toString() + /** * Create the list of plugins from toml file with plugin sections *