Skip to content

Commit 4fc8efa

Browse files
chore(deps): update kotlin core dependencies to v1.8.0 (#470)
### What's done: * update kotlin core dependencies to v1.8.0
1 parent ae96d32 commit 4fc8efa

File tree

9 files changed

+693
-37
lines changed

9 files changed

+693
-37
lines changed

detekt.yml

Lines changed: 665 additions & 4 deletions
Large diffs are not rendered by default.

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
kotlin = "1.7.22"
2+
kotlin = "1.8.0"
33
okio = "3.2.0"
44
serialization = "1.4.1"
55
diktat = "1.2.4.1"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

save-cli/src/commonNonJsMain/kotlin/com/saveourtool/save/cli/config/SavePropertiesExt.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ private fun SaveProperties.validate(): SaveProperties {
4848
} catch (e: FileNotFoundException) {
4949
return logErrorAndExit(
5050
ExitCodes.INVALID_CONFIGURATION, "Not able to find configuration file '$fullConfigPath'." +
51-
" Please provide a valid path to the test config via command-line or using the file with properties."
51+
" Please provide a valid path to the test config via command-line or using the file with properties. " +
52+
" Error: ${e.message}"
5253
)
5354
}
5455
return this

save-common/src/commonMain/kotlin/com/saveourtool/save/core/utils/CustomSerializer.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,13 @@ package com.saveourtool.save.core.utils
55
import okio.Path
66
import okio.Path.Companion.toPath
77

8-
import kotlinx.serialization.ExperimentalSerializationApi
98
import kotlinx.serialization.KSerializer
10-
import kotlinx.serialization.Serializer
119
import kotlinx.serialization.descriptors.PrimitiveKind
1210
import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
1311
import kotlinx.serialization.descriptors.SerialDescriptor
1412
import kotlinx.serialization.encoding.Decoder
1513
import kotlinx.serialization.encoding.Encoder
1614

17-
@OptIn(ExperimentalSerializationApi::class)
18-
@Serializer(forClass = Regex::class)
1915
object RegexSerializer : KSerializer<Regex> {
2016
override val descriptor: SerialDescriptor =
2117
PrimitiveSerialDescriptor("regex", PrimitiveKind.STRING)
@@ -27,8 +23,6 @@ object RegexSerializer : KSerializer<Regex> {
2723
override fun deserialize(decoder: Decoder): Regex = Regex(decoder.decodeString())
2824
}
2925

30-
@OptIn(ExperimentalSerializationApi::class)
31-
@Serializer(forClass = Regex::class)
3226
object PathSerializer : KSerializer<Path> {
3327
override val descriptor: SerialDescriptor =
3428
PrimitiveSerialDescriptor("path", PrimitiveKind.STRING)

save-common/src/nativeMain/kotlin/com/saveourtool/save/core/files/FileUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ actual val fs: FileSystem = FileSystem.SYSTEM
2727
*
2828
* @param path a path to a directory
2929
*/
30-
@Suppress("MAGIC_NUMBER")
30+
@Suppress("MAGIC_NUMBER", "MagicNumber")
3131
actual fun FileSystem.myDeleteRecursively(path: Path) {
3232
nftw(path.toString(), staticCFunction<CPointer<ByteVar>?, CPointer<stat>?, Int, CPointer<FTW>?, Int> { pathName, _, _, _ ->
3333
val fileName = pathName!!.toKString()

save-common/src/nativeMain/kotlin/com/saveourtool/save/core/utils/PlatformUtils.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,35 @@ import platform.posix.stdout
1818
* Atomic values
1919
*/
2020
actual class AtomicInt actual constructor(value: Int) {
21-
private val atomicInt = kotlin.native.concurrent.AtomicInt(value)
21+
private val holder = kotlin.native.concurrent.AtomicInt(value)
2222

2323
/**
2424
* @return value
2525
*/
26-
actual fun get(): Int = atomicInt.value
26+
actual fun get(): Int = holder.value
2727

2828
/**
2929
* @param delta increments the value_ by delta
3030
* @return the new value
3131
*/
32-
actual fun addAndGet(delta: Int): Int = atomicInt.addAndGet(delta)
32+
actual fun addAndGet(delta: Int): Int = holder.addAndGet(delta)
3333
}
3434

3535
@Suppress("FUNCTION_BOOLEAN_PREFIX")
3636
actual class AtomicBoolean actual constructor(value: Boolean) {
37-
private val atomicBoolean = kotlin.native.concurrent.AtomicReference(value)
37+
private val holder = kotlin.native.concurrent.AtomicReference(value)
3838

3939
/**
4040
* @return value
4141
*/
42-
actual fun get(): Boolean = atomicBoolean.value
42+
actual fun get(): Boolean = holder.value
4343

4444
/**
4545
* @param expect expected value
4646
* @param update updated value
4747
* @return the result of the comparison
4848
*/
49-
actual fun compareAndSet(expect: Boolean, update: Boolean): Boolean = atomicBoolean.compareAndSet(expect, update)
49+
actual fun compareAndSet(expect: Boolean, update: Boolean): Boolean = holder.compareAndSet(expect, update)
5050
}
5151

5252
@Suppress("USE_DATA_CLASS")

save-core/src/commonNonJsMain/kotlin/com/saveourtool/save/core/Save.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class Save(
6262
* @return Reporter
6363
* @throws PluginException when we receive invalid type of PluginConfig
6464
*/
65-
@Suppress("TOO_LONG_FUNCTION")
65+
@Suppress("TOO_LONG_FUNCTION", "LongMethod")
6666
fun performAnalysis(): Reporter {
6767
logInfo("Welcome to SAVE version $SAVE_VERSION")
6868
val rootTestConfigPath = testRootPath.resolveSaveTomlConfig()

yarn.lock

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -239,10 +239,10 @@ acorn-import-assertions@^1.7.6:
239239
resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
240240
integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
241241

242-
acorn@^8.4.1:
243-
version "8.7.0"
244-
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
245-
integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
242+
acorn@^8.7.1:
243+
version "8.8.2"
244+
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
245+
integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
246246

247247
ajv-keywords@^3.5.2:
248248
version "3.5.2"
@@ -623,10 +623,10 @@ engine.io@~6.2.0:
623623
engine.io-parser "~5.0.3"
624624
ws "~8.2.3"
625625

626-
enhanced-resolve@^5.9.3:
627-
version "5.10.0"
628-
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz#0dc579c3bb2a1032e357ac45b8f3a6f3ad4fb1e6"
629-
integrity sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==
626+
enhanced-resolve@^5.10.0:
627+
version "5.12.0"
628+
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634"
629+
integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==
630630
dependencies:
631631
graceful-fs "^4.2.4"
632632
tapable "^2.2.0"
@@ -1692,7 +1692,7 @@ void-elements@^2.0.0:
16921692
resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
16931693
integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
16941694

1695-
watchpack@^2.3.1:
1695+
watchpack@^2.4.0:
16961696
version "2.4.0"
16971697
resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
16981698
integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
@@ -1738,21 +1738,21 @@ webpack-sources@^3.2.3:
17381738
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
17391739
integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
17401740

1741-
webpack@5.73.0:
1742-
version "5.73.0"
1743-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.73.0.tgz#bbd17738f8a53ee5760ea2f59dce7f3431d35d38"
1744-
integrity sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==
1741+
webpack@5.74.0:
1742+
version "5.74.0"
1743+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.74.0.tgz#02a5dac19a17e0bb47093f2be67c695102a55980"
1744+
integrity sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==
17451745
dependencies:
17461746
"@types/eslint-scope" "^3.7.3"
17471747
"@types/estree" "^0.0.51"
17481748
"@webassemblyjs/ast" "1.11.1"
17491749
"@webassemblyjs/wasm-edit" "1.11.1"
17501750
"@webassemblyjs/wasm-parser" "1.11.1"
1751-
acorn "^8.4.1"
1751+
acorn "^8.7.1"
17521752
acorn-import-assertions "^1.7.6"
17531753
browserslist "^4.14.5"
17541754
chrome-trace-event "^1.0.2"
1755-
enhanced-resolve "^5.9.3"
1755+
enhanced-resolve "^5.10.0"
17561756
es-module-lexer "^0.9.0"
17571757
eslint-scope "5.1.1"
17581758
events "^3.2.0"
@@ -1765,7 +1765,7 @@ [email protected]:
17651765
schema-utils "^3.1.0"
17661766
tapable "^2.1.1"
17671767
terser-webpack-plugin "^5.1.3"
1768-
watchpack "^2.3.1"
1768+
watchpack "^2.4.0"
17691769
webpack-sources "^3.2.3"
17701770

17711771
which@^1.2.1:

0 commit comments

Comments
 (0)