Skip to content

Commit 6f0b169

Browse files
committed
Updated Kotlin to 2.1.0, Essenty to 2.4.0, AGP to 8.7.3, Gradle to 8.11.1
1 parent ee006e1 commit 6f0b169

File tree

17 files changed

+59
-90
lines changed

17 files changed

+59
-90
lines changed

decompose/build.gradle.kts

+4-3
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,6 @@ kotlin {
5858
common.test.dependencies {
5959
implementation(deps.jetbrains.kotlinx.kotlinxCoroutinesCore)
6060
implementation(deps.jetbrains.kotlinx.kotlinxSerializationJson)
61-
62-
// Workaround: https://github.com/Kotlin/kotlinx.coroutines/issues/3968
63-
implementation("org.jetbrains.kotlinx:atomicfu:0.23.1")
6461
}
6562

6663
android.main.dependencies {
@@ -74,6 +71,10 @@ kotlin {
7471
web.main.dependencies {
7572
implementation(deps.jetbrains.kotlinx.kotlinxSerializationJson)
7673
}
74+
75+
wasmJs.main.dependencies {
76+
implementation(deps.jetbrains.kotlinx.kotlinxBrowser)
77+
}
7778
}
7879
}
7980

decompose/src/commonTest/kotlin/com/arkivanov/decompose/router/stack/ChildStackIntegrationTest.kt

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.arkivanov.decompose.router.stack
33
import com.arkivanov.decompose.ComponentContext
44
import com.arkivanov.decompose.DecomposeExperimentFlags
55
import com.arkivanov.decompose.DefaultComponentContext
6+
import com.arkivanov.decompose.DelicateDecomposeApi
67
import com.arkivanov.decompose.consume
78
import com.arkivanov.decompose.register
89
import com.arkivanov.decompose.router.TestInstance
@@ -26,6 +27,7 @@ import kotlin.test.assertFalse
2627
import kotlin.test.assertNotEquals
2728
import kotlin.test.assertTrue
2829

30+
@OptIn(DelicateDecomposeApi::class)
2931
@Suppress("TestFunctionName")
3032
class ChildStackIntegrationTest {
3133

decompose/src/commonTest/kotlin/com/arkivanov/decompose/router/stack/RouterPushTest.kt

+2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package com.arkivanov.decompose.router.stack
22

3+
import com.arkivanov.decompose.DelicateDecomposeApi
34
import kotlin.test.Test
45
import kotlin.test.assertEquals
56
import kotlin.test.assertTrue
67

8+
@OptIn(DelicateDecomposeApi::class)
79
@Suppress("TestFunctionName")
810
class RouterPushTest {
911

deps.versions.toml

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
[versions]
22

33
decompose = "3.3.0-alpha02"
4-
kotlin = "2.0.20"
5-
essenty = "2.3.0"
4+
kotlin = "2.1.0"
5+
essenty = "2.4.0"
66
reaktive = "2.2.0"
77
junit = "4.13.2"
88
jetbrainsCompose = "1.7.0"
99
jetbrainsKotlinWrappers = "1.0.0-pre.608"
10-
jetbrainsKotlinxCoroutines = "1.8.1"
10+
jetbrainsKotlinxCoroutines = "1.9.0"
1111
jetbrainsKotlinxSerialization = "1.6.3"
12+
jetbrainsKotlinxBrowser = "0.3"
1213
jetbrainsBinaryCompatibilityValidator = "0.16.3"
1314
robolectric = "4.9.1"
14-
androidGradle = "8.2.0"
15+
androidGradle = "8.7.3"
1516
androidMaterial = "1.6.1"
1617
androidPlay = "1.10.3"
1718
androidxCore = "1.9.0"
@@ -46,6 +47,7 @@ jetbrains-kotlinx-kotlinxCoroutinesSwing = { group = "org.jetbrains.kotlinx", na
4647
jetbrains-kotlin-serializationGradlePlug = { group = "org.jetbrains.kotlin", name = "kotlin-serialization", version.ref = "kotlin" }
4748
jetbrains-kotlinx-kotlinxSerializationCore = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version.ref = "jetbrainsKotlinxSerialization" }
4849
jetbrains-kotlinx-kotlinxSerializationJson = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "jetbrainsKotlinxSerialization" }
50+
jetbrains-kotlinx-kotlinxBrowser = { group = "org.jetbrains.kotlinx", name = "kotlinx-browser", version.ref = "jetbrainsKotlinxBrowser" }
4951

5052
robolectric-robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" }
5153

extensions-compose-experimental/api/android/extensions-compose-experimental.api

-8
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,6 @@ public abstract interface class com/arkivanov/decompose/extensions/compose/exper
2121

2222
public final class com/arkivanov/decompose/extensions/compose/experimental/panels/ComposableSingletons$ChildPanelsKt {
2323
public static final field INSTANCE Lcom/arkivanov/decompose/extensions/compose/experimental/panels/ComposableSingletons$ChildPanelsKt;
24-
public static field lambda-1 Lkotlin/jvm/functions/Function2;
25-
public static field lambda-2 Lkotlin/jvm/functions/Function3;
26-
public static field lambda-3 Lkotlin/jvm/functions/Function2;
27-
public static field lambda-4 Lkotlin/jvm/functions/Function3;
28-
public static field lambda-5 Lkotlin/jvm/functions/Function2;
29-
public static field lambda-6 Lkotlin/jvm/functions/Function2;
30-
public static field lambda-7 Lkotlin/jvm/functions/Function2;
31-
public static field lambda-8 Lkotlin/jvm/functions/Function2;
3224
public fun <init> ()V
3325
public final fun getLambda-1$extensions_compose_experimental_release ()Lkotlin/jvm/functions/Function2;
3426
public final fun getLambda-2$extensions_compose_experimental_release ()Lkotlin/jvm/functions/Function3;

extensions-compose-experimental/api/jvm/extensions-compose-experimental.api

-8
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,6 @@ public abstract interface class com/arkivanov/decompose/extensions/compose/exper
2121

2222
public final class com/arkivanov/decompose/extensions/compose/experimental/panels/ComposableSingletons$ChildPanelsKt {
2323
public static final field INSTANCE Lcom/arkivanov/decompose/extensions/compose/experimental/panels/ComposableSingletons$ChildPanelsKt;
24-
public static field lambda-1 Lkotlin/jvm/functions/Function2;
25-
public static field lambda-2 Lkotlin/jvm/functions/Function3;
26-
public static field lambda-3 Lkotlin/jvm/functions/Function2;
27-
public static field lambda-4 Lkotlin/jvm/functions/Function3;
28-
public static field lambda-5 Lkotlin/jvm/functions/Function2;
29-
public static field lambda-6 Lkotlin/jvm/functions/Function2;
30-
public static field lambda-7 Lkotlin/jvm/functions/Function2;
31-
public static field lambda-8 Lkotlin/jvm/functions/Function2;
3224
public fun <init> ()V
3325
public final fun getLambda-1$extensions_compose_experimental ()Lkotlin/jvm/functions/Function2;
3426
public final fun getLambda-2$extensions_compose_experimental ()Lkotlin/jvm/functions/Function3;

extensions-compose-experimental/src/jvmTest/kotlin/com/arkivanov/decompose/extensions/compose/experimental/stack/ChildStackTest.kt

-1
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,6 @@ class ChildStackTest(
293293
}
294294
}
295295

296-
// Can be enum, workaround https://issuetracker.google.com/issues/195185633
297296
sealed class Config {
298297
data object A : Config()
299298
data object B : Config()

extensions-compose/api/android/extensions-compose.api

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ public final class com/arkivanov/decompose/extensions/compose/pages/ChildPagesKt
1111

1212
public final class com/arkivanov/decompose/extensions/compose/pages/ComposableSingletons$ChildPagesKt {
1313
public static final field INSTANCE Lcom/arkivanov/decompose/extensions/compose/pages/ComposableSingletons$ChildPagesKt;
14-
public static field lambda-1 Lkotlin/jvm/functions/Function6;
15-
public static field lambda-2 Lkotlin/jvm/functions/Function6;
1614
public fun <init> ()V
1715
public final fun getLambda-1$extensions_compose_release ()Lkotlin/jvm/functions/Function6;
1816
public final fun getLambda-2$extensions_compose_release ()Lkotlin/jvm/functions/Function6;

extensions-compose/api/jvm/extensions-compose.api

-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ public final class com/arkivanov/decompose/extensions/compose/pages/ChildPagesKt
1515

1616
public final class com/arkivanov/decompose/extensions/compose/pages/ComposableSingletons$ChildPagesKt {
1717
public static final field INSTANCE Lcom/arkivanov/decompose/extensions/compose/pages/ComposableSingletons$ChildPagesKt;
18-
public static field lambda-1 Lkotlin/jvm/functions/Function6;
19-
public static field lambda-2 Lkotlin/jvm/functions/Function6;
2018
public fun <init> ()V
2119
public final fun getLambda-1$extensions_compose ()Lkotlin/jvm/functions/Function6;
2220
public final fun getLambda-2$extensions_compose ()Lkotlin/jvm/functions/Function6;

extensions-compose/src/jvmTest/kotlin/com/arkivanov/decompose/extensions/compose/stack/ChildrenTest.kt

-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@ class ChildrenTest(
270270
)
271271
}
272272

273-
// Can be enum, workaround https://issuetracker.google.com/issues/195185633
274273
sealed class Config {
275274
data object A : Config()
276275
data object B : Config()

extensions-compose/src/jvmTest/kotlin/com/arkivanov/decompose/extensions/compose/stack/animation/StackAnimationDirectionsTest.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ class StackAnimationDirectionsTest(
9393
Params(from = listOf("a", "b", "c"), to = listOf("a", "d"), expected = mapOf("d" to ENTER_FRONT, "c" to EXIT_BACK)),
9494
Params(from = listOf("a", "b"), to = listOf("c", "d"), expected = mapOf("d" to ENTER_FRONT, "b" to EXIT_BACK)),
9595
Params(from = listOf("a", "b"), to = listOf("b", "a"), expected = mapOf("a" to ENTER_FRONT, "b" to EXIT_BACK)),
96-
Params(from = listOf("a", "b"), to = listOf("b"), expected = emptyMap()),
97-
Params(from = listOf("a", "b"), to = listOf("c", "b"), expected = emptyMap()),
98-
Params(from = listOf("b", "c"), to = listOf("a", "b", "c"), expected = emptyMap()),
96+
Params(from = listOf("a", "b"), to = listOf("b"), expected = mapOf("b" to ENTER_FRONT)),
97+
Params(from = listOf("a", "b"), to = listOf("c", "b"), expected = mapOf("b" to ENTER_FRONT)),
98+
Params(from = listOf("b", "c"), to = listOf("a", "b", "c"), expected = mapOf("c" to ENTER_FRONT)),
9999
)
100100
}
101101

gradle/wrapper/gradle-wrapper.jar

19.4 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

+8-9
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ done
8383
# This is normally unused
8484
# shellcheck disable=SC2034
8585
APP_BASE_NAME=${0##*/}
86-
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
86+
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
8887

8988
# Use the maximum available, or set MAX_FD != -1 to use that value.
9089
MAX_FD=maximum
@@ -145,15 +144,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
145144
case $MAX_FD in #(
146145
max*)
147146
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
148-
# shellcheck disable=SC2039,SC3045
147+
# shellcheck disable=SC3045
149148
MAX_FD=$( ulimit -H -n ) ||
150149
warn "Could not query maximum file descriptor limit"
151150
esac
152151
case $MAX_FD in #(
153152
'' | soft) :;; #(
154153
*)
155154
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
156-
# shellcheck disable=SC2039,SC3045
155+
# shellcheck disable=SC3045
157156
ulimit -n "$MAX_FD" ||
158157
warn "Could not set maximum file descriptor limit to $MAX_FD"
159158
esac
@@ -202,11 +201,11 @@ fi
202201
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203202
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204203

205-
# Collect all arguments for the java command:
206-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207-
# and any embedded shellness will be escaped.
208-
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209-
# treated as '${Hostname}' itself on the command line.
204+
# Collect all arguments for the java command;
205+
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
206+
# shell script including quotes and variable substitutions, so put them in
207+
# double quotes to make sure that they get re-expanded; and
208+
# * put everything else in single quotes, so that it's not re-expanded.
210209

211210
set -- \
212211
"-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

+10-10
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
4343
%JAVA_EXE% -version >NUL 2>&1
4444
if %ERRORLEVEL% equ 0 goto execute
4545

46-
echo. 1>&2
47-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
48-
echo. 1>&2
49-
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
50-
echo location of your Java installation. 1>&2
46+
echo.
47+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48+
echo.
49+
echo Please set the JAVA_HOME variable in your environment to match the
50+
echo location of your Java installation.
5151

5252
goto fail
5353

@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5757

5858
if exist "%JAVA_EXE%" goto execute
5959

60-
echo. 1>&2
61-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
62-
echo. 1>&2
63-
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
64-
echo location of your Java installation. 1>&2
60+
echo.
61+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62+
echo.
63+
echo Please set the JAVA_HOME variable in your environment to match the
64+
echo location of your Java installation.
6565

6666
goto fail
6767

kotlin-js-store/yarn.lock

+22-37
Original file line numberDiff line numberDiff line change
@@ -554,27 +554,6 @@
554554
resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080"
555555
integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==
556556

557-
"@types/eslint-scope@^3.7.3":
558-
version "3.7.4"
559-
resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16"
560-
integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==
561-
dependencies:
562-
"@types/eslint" "*"
563-
"@types/estree" "*"
564-
565-
"@types/eslint@*":
566-
version "8.2.2"
567-
resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.2.2.tgz#b64dbdb64b1957cfc8a698c68297fcf8983e94c7"
568-
integrity sha512-nQxgB8/Sg+QKhnV8e0WzPpxjIGT3tuJDDzybkDi8ItE/IgTlHo07U0shaIjzhcvQxlq9SDRE42lsJ23uvEgJ2A==
569-
dependencies:
570-
"@types/estree" "*"
571-
"@types/json-schema" "*"
572-
573-
"@types/estree@*":
574-
version "0.0.50"
575-
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"
576-
integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==
577-
578557
"@types/estree@^1.0.5":
579558
version "1.0.5"
580559
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
@@ -612,7 +591,7 @@
612591
dependencies:
613592
"@types/node" "*"
614593

615-
"@types/json-schema@*", "@types/json-schema@^7.0.8":
594+
"@types/json-schema@^7.0.8":
616595
version "7.0.9"
617596
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
618597
integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
@@ -1584,7 +1563,7 @@ engine.io@~6.5.2:
15841563
engine.io-parser "~5.2.1"
15851564
ws "~8.11.0"
15861565

1587-
enhanced-resolve@^5.17.0:
1566+
enhanced-resolve@^5.17.1:
15881567
version "5.17.1"
15891568
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
15901569
integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
@@ -2372,10 +2351,10 @@ [email protected]:
23722351
minimatch "^9.0.3"
23732352
webpack-merge "^4.1.5"
23742353

2375-
2376-
version "6.4.3"
2377-
resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.3.tgz#763e500f99597218bbb536de1a14acc4ceea7ce8"
2378-
integrity sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q==
2354+
2355+
version "6.4.4"
2356+
resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.4.tgz#dfa5a426cf5a8b53b43cd54ef0d0d09742351492"
2357+
integrity sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w==
23792358
dependencies:
23802359
"@colors/colors" "1.5.0"
23812360
body-parser "^1.19.0"
@@ -2407,6 +2386,13 @@ kind-of@^6.0.2:
24072386
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
24082387
integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
24092388

2389+
2390+
version "2.0.0"
2391+
resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-2.0.0.tgz#b112096b273c1e733e0b86560998235c09a19286"
2392+
integrity sha512-xkVGl60Ygn/zuLkDPx+oHj7jeLR7hCvoNF99nhwXMn8a3ApB4lLiC9pk4ol4NHPjyoCbvQctBqvzUcp8pkqyWw==
2393+
dependencies:
2394+
format-util "^1.0.5"
2395+
24102396
launch-editor@^2.6.0:
24112397
version "2.9.1"
24122398
resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.9.1.tgz#253f173bd441e342d4344b4dae58291abb425047"
@@ -2587,10 +2573,10 @@ mkdirp@^0.5.5:
25872573
dependencies:
25882574
minimist "^1.2.6"
25892575

2590-
2591-
version "10.7.0"
2592-
resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.0.tgz#9e5cbed8fa9b37537a25bd1f7fb4f6fc45458b9a"
2593-
integrity sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA==
2576+
2577+
version "10.7.3"
2578+
resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.3.tgz#ae32003cabbd52b59aece17846056a68eb4b0752"
2579+
integrity sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==
25942580
dependencies:
25952581
ansi-colors "^4.1.3"
25962582
browser-stdout "^1.3.1"
@@ -3667,12 +3653,11 @@ webpack-sources@^3.2.3:
36673653
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
36683654
integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
36693655

3670-
webpack@5.93.0:
3671-
version "5.93.0"
3672-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.93.0.tgz#2e89ec7035579bdfba9760d26c63ac5c3462a5e5"
3673-
integrity sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA==
3656+
webpack@5.94.0:
3657+
version "5.94.0"
3658+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f"
3659+
integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==
36743660
dependencies:
3675-
"@types/eslint-scope" "^3.7.3"
36763661
"@types/estree" "^1.0.5"
36773662
"@webassemblyjs/ast" "^1.12.1"
36783663
"@webassemblyjs/wasm-edit" "^1.12.1"
@@ -3681,7 +3666,7 @@ [email protected]:
36813666
acorn-import-attributes "^1.9.5"
36823667
browserslist "^4.21.10"
36833668
chrome-trace-event "^1.0.2"
3684-
enhanced-resolve "^5.17.0"
3669+
enhanced-resolve "^5.17.1"
36853670
es-module-lexer "^1.2.1"
36863671
eslint-scope "5.1.1"
36873672
events "^3.2.0"

settings.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pluginManagement {
1515
resolutionStrategy {
1616
eachPlugin {
1717
if (requested.id.toString() == "com.arkivanov.gradle.setup") {
18-
useModule("com.github.arkivanov:gradle-setup-plugin:8eb6bb973c")
18+
useModule("com.github.arkivanov:gradle-setup-plugin:4cef58cc3b")
1919
}
2020
}
2121
}

0 commit comments

Comments
 (0)