Skip to content

Commit bc90eba

Browse files
authored
Merge pull request #522 from JetBrains/version-maintenance
Update dependencies and clean up warnings
2 parents 9db355a + 5405f49 commit bc90eba

File tree

24 files changed

+132
-3073
lines changed

24 files changed

+132
-3073
lines changed

.github/workflows/build-all.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
distribution: 'zulu'
6767
java-version: 21
6868
- name: Build web app
69-
run: ./gradlew buildWebApp
69+
run: ./gradlew composeCompatibilityBrowserDistribution
7070

7171
build-backend:
7272
name: Build backend

.github/workflows/web-deploy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@ jobs:
2121
uses: actions/checkout@v3
2222

2323
- name: Run Gradle Tasks
24-
run: ./gradlew buildWebApp
24+
run: ./gradlew composeCompatibilityBrowserDistribution
2525

2626
- name: Fix permissions
2727
run: |
28-
chmod -v -R +rX "shared/build/webApp/" | while read line; do
28+
chmod -v -R +rX "shared/build/dist/composeWebCompatibility/productionExecutable/" | while read line; do
2929
echo "::warning title=Invalid file permissions automatically fixed::$line"
3030
done
3131
3232
- name: Upload Pages artifact
3333
uses: actions/upload-pages-artifact@v3
3434
with:
35-
path: shared/build/webApp/
35+
path: shared/build/dist/composeWebCompatibility/productionExecutable/
3636

3737
deploy:
3838
# Add a dependency to the build job

androidApp/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ kotlin {
1919

2020
androidUnitTest.dependencies {
2121
implementation(libs.junit)
22-
implementation(libs.androidx.test.junit)
23-
implementation(libs.androidx.espresso.core)
2422
}
2523
}
2624

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ kotlin.mpp.enableCInteropCommonization=true
2222

2323
#Native
2424
kotlin.native.binary.gc=cms
25+
kotlin.native.binary.smallBinary=true
26+
kotlin.incremental.native=true
2527

2628
# Compose Multiplatform
2729
compose.resources.always.generate.accessors=true

gradle/libs.versions.toml

Lines changed: 25 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,38 @@
11
[versions]
2-
aboutlibraries = "12.2.3"
3-
agp = "8.7.3"
4-
android-compileSdk = "35"
2+
aboutlibraries = "12.2.4"
3+
agp = "8.11.2"
4+
android-compileSdk = "36"
55
android-minSdk = "26"
66
android-svg = "1.4"
7-
android-targetSdk = "35"
8-
androidx-activityCompose = "1.10.1"
9-
androidx-core-ktx = "1.16.0"
7+
android-targetSdk = "36"
8+
androidx-activityCompose = "1.11.0"
9+
androidx-core-ktx = "1.17.0"
1010
androidx-core-splashscreen = "1.0.1"
11-
androidx-espresso-core = "3.6.1"
12-
androidx-lifecycle = "2.9.1"
13-
androidx-navigation = "2.9.0-beta03"
11+
androidx-lifecycle = "2.9.4"
12+
androidx-navigation = "2.9.0"
1413
androidx-preference = "1.2.1"
15-
androidx-test-junit = "1.2.1"
16-
androidx-work-runtime = "2.10.0"
17-
coil = "3.2.0"
18-
compose-android = "1.8.2"
14+
coil = "3.3.0"
15+
compose-android = "1.9.0"
1916
compose-hot-reload = "1.0.0-beta09"
20-
compose-multiplatform = "1.8.2"
21-
coroutines = "1.10.1"
17+
compose-multiplatform = "1.9.0"
18+
coroutines = "1.10.2"
2219
doistx-normalize = "1.2.0"
23-
exposed = "0.59.0"
24-
google-services = "4.4.2"
25-
h2 = "2.2.224"
26-
hikaricp = "5.1.0"
27-
jib = "3.4.4"
20+
exposed = "0.61.0"
21+
google-services = "4.4.3"
22+
h2 = "2.3.232"
23+
hikaricp = "7.0.2"
24+
jib = "3.4.5"
2825
junit = "4.13.2"
29-
kmpnotifier = "1.5.1"
30-
koin = "4.1.0"
31-
kotlin = "2.2.0"
32-
kotlinx-datetime = "0.7.0"
26+
kmpnotifier = "1.6.0"
27+
koin = "4.1.1"
28+
kotlin = "2.2.20"
29+
kotlinx-datetime = "0.7.1"
3330
kotlinxSerializationCore = "1.9.0"
34-
ktor = "3.2.1"
31+
ktor = "3.3.0"
3532
logbackClassic = "1.5.18"
36-
markdown = "0.35.0"
33+
markdown = "0.37.0"
3734
multiplatform-settings = "1.3.0"
38-
postgresql = "42.7.3"
35+
postgresql = "42.7.7"
3936
slf4jNop = "2.0.17"
4037

4138
[libraries]
@@ -44,13 +41,10 @@ android-svg = { module = "com.caverock:androidsvg-aar", version.ref = "android-s
4441
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
4542
androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core-ktx" }
4643
androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "androidx-core-splashscreen" }
47-
androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-espresso-core" }
48-
androidx-navigation-compose = { module = "org.jetbrains.androidx.navigation:navigation-compose", version.ref = "androidx-navigation" }
4944
androidx-lifecycle-runtime-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" }
5045
androidx-lifecycle-viewmodel-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
46+
androidx-navigation-compose = { module = "org.jetbrains.androidx.navigation:navigation-compose", version.ref = "androidx-navigation" }
5147
androidx-preference = { module = "androidx.preference:preference-ktx", version.ref = "androidx-preference" }
52-
androidx-test-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test-junit" }
53-
androidx-work-runtime = { module = "androidx.work:work-runtime-ktx", version.ref = "androidx-work-runtime" }
5448
coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" }
5549
coil-network-ktor3 = { module = "io.coil-kt.coil3:coil-network-ktor3", version.ref = "coil" }
5650
components-ui-tooling-preview = { module = "org.jetbrains.compose.components:components-ui-tooling-preview", version.ref = "compose-multiplatform" }

gradle/wrapper/gradle-wrapper.jar

181 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
3+
distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ done
8686
# shellcheck disable=SC2034
8787
APP_BASE_NAME=${0##*/}
8888
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90-
' "$PWD" ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9190

9291
# Use the maximum available, or set MAX_FD != -1 to use that value.
9392
MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in #(
115114
NONSTOP* ) nonstop=true ;;
116115
esac
117116

118-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
119118

120119

121120
# Determine the Java command to use to start the JVM.
@@ -206,15 +205,15 @@ fi
206205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
207206

208207
# Collect all arguments for the java command:
209-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
210209
# and any embedded shellness will be escaped.
211210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
212211
# treated as '${Hostname}' itself on the command line.
213212

214213
set -- \
215214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
216215
-classpath "$CLASSPATH" \
217-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
218217
"$@"
219218

220219
# Stop when "xargs" is not available.

gradlew.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7474

7575

7676
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7878

7979
:end
8080
@rem End local scope for the variables with windows NT shell

kotlin-js-store/wasm/yarn.lock

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
2+
# yarn lockfile v1
3+
4+
5+
"@js-joda/core@3.2.0":
6+
version "3.2.0"
7+
resolved "https://registry.yarnpkg.com/@js-joda/core/-/core-3.2.0.tgz#3e61e21b7b2b8a6be746df1335cf91d70db2a273"
8+
integrity sha512-PMqgJ0sw5B7FKb2d5bWYIoxjri+QlW/Pys7+Rw82jSH0QN3rB05jZ/VrrsUdh1w4+i2kw9JOejXGq/KhDOX7Kg==
9+
10+
"@js-joda/timezone@2.3.0":
11+
version "2.3.0"
12+
resolved "https://registry.yarnpkg.com/@js-joda/timezone/-/timezone-2.3.0.tgz#72878f6dc8afef20c29906e5d8d946f91618a2c3"
13+
integrity sha512-DHXdNs0SydSqC5f0oRJPpTcNfnpRojgBqMCFupQFv6WgeZAjU3DBx+A7JtaGPP3dHrP2Odi2N8Vf+uAm/8ynCQ==
14+
15+
format-util@^1.0.5:
16+
version "1.0.5"
17+
resolved "https://registry.yarnpkg.com/format-util/-/format-util-1.0.5.tgz#1ffb450c8a03e7bccffe40643180918cc297d271"
18+
integrity sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg==
19+
20+
ws@8.18.0:
21+
version "8.18.0"
22+
resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc"
23+
integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==
24+
25+
ws@8.18.3:
26+
version "8.18.3"
27+
resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.3.tgz#b56b88abffde62791c639170400c93dcb0c95472"
28+
integrity sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==

0 commit comments

Comments
 (0)