Skip to content

Commit faac017

Browse files
avan1235avan1235
committed
update versions
1 parent 4b162d4 commit faac017

File tree

11 files changed

+349
-521
lines changed

11 files changed

+349
-521
lines changed

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
VERSION: ${{ env.MAJOR }}.${{ env.MINOR }}.${{ env.PATCH }}
7676

7777
- name: Upload deb artifact file to workflow run results
78-
uses: actions/upload-artifact@v3
78+
uses: actions/upload-artifact@v4
7979
if: runner.os == 'Linux'
8080
with:
8181
name: Shin-${{ env.MAJOR }}.${{ env.MINOR }}.${{ env.PATCH }}.deb
@@ -93,7 +93,7 @@ jobs:
9393
asset_content_type: application/x-deb
9494

9595
- name: Upload msi installer file to workflow run results
96-
uses: actions/upload-artifact@v3
96+
uses: actions/upload-artifact@v4
9797
if: runner.os == 'Windows'
9898
with:
9999
name: Shin-${{ env.MAJOR }}.${{ env.MINOR }}.${{ env.PATCH }}.msi
@@ -111,7 +111,7 @@ jobs:
111111
asset_content_type: application/x-ms-dos-executable
112112

113113
- name: Upload dmg image file to workflow run results
114-
uses: actions/upload-artifact@v3
114+
uses: actions/upload-artifact@v4
115115
if: runner.os == 'macOS'
116116
with:
117117
name: Shin-${{ env.MAJOR }}.${{ env.MINOR }}.${{ env.PATCH }}.dmg
@@ -175,19 +175,19 @@ jobs:
175175
VERSION: ${{ env.MAJOR }}.${{ env.MINOR }}.${{ env.PATCH }}
176176

177177
- name: Upload debug artifact file to workflow run results
178-
uses: actions/upload-artifact@v3
178+
uses: actions/upload-artifact@v4
179179
with:
180180
name: Shin-Debug-${{ env.MAJOR }}.${{ env.MINOR }}.${{ env.PATCH }}.apk
181181
path: composeApp/build/outputs/apk/debug/composeApp-debug.apk
182182

183183
- name: Upload release artifact file to workflow run results
184-
uses: actions/upload-artifact@v3
184+
uses: actions/upload-artifact@v4
185185
with:
186186
name: Shin-Release-${{ env.MAJOR }}.${{ env.MINOR }}.${{ env.PATCH }}.apk
187187
path: composeApp/build/outputs/apk/release/composeApp-release.apk
188188

189189
- name: Upload release bundle file to workflow run results
190-
uses: actions/upload-artifact@v3
190+
uses: actions/upload-artifact@v4
191191
with:
192192
name: Shin-Release-${{ env.MAJOR }}.${{ env.MINOR }}.${{ env.PATCH }}.aab
193193
path: composeApp/build/outputs/bundle/release/composeApp-release.aab

‎composeApp/compose-desktop.pro‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@
1313
-dontwarn javafx.scene.image.WritableImage
1414
-dontwarn javafx.scene.image.PixelFormat
1515
-dontwarn javafx.scene.image.PixelWriter
16+
-dontwarn io.ktor.network.sockets.SocketBase$attachFor$1

‎gradle/libs.versions.toml‎

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
11
[versions]
2-
agp = "8.2.2"
2+
agp = "8.8.0-alpha05"
33
# @keep
4-
android-compileSdk = "34"
4+
android-compileSdk = "35"
55
# @keep
66
android-minSdk = "26"
77
# @keep
8-
android-targetSdk = "34"
9-
androidx-activityCompose = "1.9.1"
8+
android-targetSdk = "35"
9+
androidx-activityCompose = "1.10.1"
1010
detekt = "1.23.6"
11-
jetbrains-compose = "1.6.11"
12-
exposed = "0.51.0"
11+
jetbrains-compose = "1.7.3"
12+
exposed = "0.60.0"
1313
# @pin
14-
kotlin = "2.0.10"
15-
ktor-server = "2.3.12"
16-
ktor-client = "3.0.0-wasm2"
17-
koin = "3.6.0-wasm-alpha2"
18-
kotlinxDatetime = "0.6.0"
19-
kotlinxCoroutines = "1.8.1"
20-
kotlinxSerialization = "1.7.1"
14+
kotlin = "2.1.20"
15+
ktor = "3.1.1"
16+
koin = "4.1.0-Beta6"
17+
kotlinxDatetime = "0.6.2"
18+
kotlinxCoroutines = "1.10.1"
19+
kotlinxSerialization = "1.8.0"
2120
qrose = "1.0.1"
2221
procyk-compose = "1.6.10.0"
23-
multiplatform-settings = "1.1.1"
24-
logback = "1.5.6"
22+
multiplatform-settings = "1.3.0"
23+
logback = "1.5.18"
2524
postgres = "42.7.3"
2625
dotenv = "6.4.1"
27-
decompose = "3.0.0"
28-
essenty = "2.0.0"
26+
decompose = "3.3.0"
27+
essenty = "2.5.0"
2928
dotenvGradle = "4.0.0"
3029
buildKonfig = "0.15.1"
3130
graalVM = "0.10.1"
@@ -42,22 +41,21 @@ exposed-dao = { module = "org.jetbrains.exposed:exposed-dao", version.ref = "exp
4241
exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "exposed" }
4342
exposed-kotlin-datetime = { module = "org.jetbrains.exposed:exposed-kotlin-datetime", version.ref = "exposed" }
4443
logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
45-
ktor-shared-resources = { module = "io.ktor:ktor-resources", version.ref = "ktor-client" }
46-
ktor-serialization-kotlinx-cbor = { module = "io.ktor:ktor-serialization-kotlinx-cbor", version.ref = "ktor-client" }
47-
ktor-server-core = { module = "io.ktor:ktor-server-core-jvm", version.ref = "ktor-server" }
48-
ktor-server-cors = { module = "io.ktor:ktor-server-cors", version.ref = "ktor-server" }
49-
ktor-server-cio = { module = "io.ktor:ktor-server-cio-jvm", version.ref = "ktor-server" }
50-
ktor-server-tests = { module = "io.ktor:ktor-server-tests-jvm", version.ref = "ktor-server" }
51-
ktor-server-resources = { module = "io.ktor:ktor-server-resources", version.ref = "ktor-server" }
52-
ktor-server-content-negotiation = { module = "io.ktor:ktor-server-content-negotiation", version.ref = "ktor-server" }
53-
ktor-server-auto-head-response = { module = "io.ktor:ktor-server-auto-head-response", version.ref = "ktor-server" }
54-
ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor-client" }
55-
ktor-client-android = { module = "io.ktor:ktor-client-android", version.ref = "ktor-client" }
56-
ktor-client-java = { module = "io.ktor:ktor-client-java", version.ref = "ktor-client" }
57-
ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktor-client" }
58-
ktor-client-js = { module = "io.ktor:ktor-client-js", version.ref = "ktor-client" }
59-
ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor-client" }
60-
koin-ktor = { module = "io.insert-koin:koin-ktor", version.ref = "koin" }
44+
ktor-shared-resources = { module = "io.ktor:ktor-resources", version.ref = "ktor" }
45+
ktor-serialization-kotlinx-cbor = { module = "io.ktor:ktor-serialization-kotlinx-cbor", version.ref = "ktor" }
46+
ktor-server-core = { module = "io.ktor:ktor-server-core-jvm", version.ref = "ktor" }
47+
ktor-server-cors = { module = "io.ktor:ktor-server-cors", version.ref = "ktor" }
48+
ktor-server-cio = { module = "io.ktor:ktor-server-cio-jvm", version.ref = "ktor" }
49+
ktor-server-resources = { module = "io.ktor:ktor-server-resources", version.ref = "ktor" }
50+
ktor-server-content-negotiation = { module = "io.ktor:ktor-server-content-negotiation", version.ref = "ktor" }
51+
ktor-server-auto-head-response = { module = "io.ktor:ktor-server-auto-head-response", version.ref = "ktor" }
52+
ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
53+
ktor-client-android = { module = "io.ktor:ktor-client-android", version.ref = "ktor" }
54+
ktor-client-java = { module = "io.ktor:ktor-client-java", version.ref = "ktor" }
55+
ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktor" }
56+
ktor-client-js = { module = "io.ktor:ktor-client-js", version.ref = "ktor" }
57+
ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
58+
koin-ktor = { module = "io.insert-koin:koin-ktor3", version.ref = "koin" }
6159
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetime" }
6260
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
6361
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" }
@@ -85,7 +83,7 @@ jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "jetbrains-comp
8583
composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
8684
kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
8785
kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
88-
ktor = { id = "io.ktor.plugin", version.ref = "ktor-server" }
86+
ktor = { id = "io.ktor.plugin", version.ref = "ktor" }
8987
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
9088
dotenvGradle = { id = "co.uzzu.dotenv.gradle", version.ref = "dotenvGradle" }
9189
buildKonfig = { id = "com.codingfeline.buildkonfig", version.ref = "buildKonfig" }

‎gradle/wrapper/gradle-wrapper.jar‎

-19.2 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
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.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎gradlew‎

Lines changed: 12 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gradlew.bat‎

Lines changed: 12 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)