Skip to content

Commit be09666

Browse files
authored
Merge pull request #25 from DatepollSystems/update
Update dependencies
2 parents b009707 + bb67c9c commit be09666

File tree

7 files changed

+29
-29
lines changed

7 files changed

+29
-29
lines changed

.github/workflows/CheckStyle.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
distribution: 'adopt'
2121

2222
- name: Setup Gradle
23-
uses: gradle/gradle-build-action@v2
23+
uses: gradle/actions/setup-gradle@v3
2424

2525
- name: Validate Gradle Wrapper
26-
uses: gradle/wrapper-validation-action@v1
26+
uses: gradle/wrapper-validation-action@v2
2727

2828
- name: Grant execute permission for gradlew
2929
run: chmod +x gradlew

.github/workflows/Conveyor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
distribution: 'adopt'
1919

2020
- name: Setup Gradle
21-
uses: gradle/gradle-build-action@v2
21+
uses: gradle/actions/setup-gradle@v3
2222

2323
- name: Validate Gradle Wrapper
24-
uses: gradle/wrapper-validation-action@v1
24+
uses: gradle/wrapper-validation-action@v2
2525

2626
- name: Grant execute permission for gradlew
2727
run: chmod +x gradlew
@@ -44,7 +44,7 @@ jobs:
4444
tar xzf .keys.tar.gz
4545
4646
- name: Run Conveyor
47-
uses: hydraulic-software/conveyor/actions/build@v13.0
47+
uses: hydraulic-software/conveyor/actions/build@v13.1
4848
env:
4949
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5050
APPLE_ISSUER_ID: ${{ secrets.APPLE_ISSUER_ID }}

.github/workflows/Test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ jobs:
1818
distribution: 'adopt'
1919

2020
- name: Setup Gradle
21-
uses: gradle/gradle-build-action@v2
21+
uses: gradle/actions/setup-gradle@v3
2222

2323
- name: Grant execute permission for gradlew
2424
run: chmod +x gradlew
2525

2626
- name: Validate Gradle Wrapper
27-
uses: gradle/wrapper-validation-action@v1
27+
uses: gradle/wrapper-validation-action@v2
2828

2929
- name: Test
3030
run: ./gradlew test --stacktrace

.idea/kotlinc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle.kts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
44
import java.io.ByteArrayOutputStream
55

66
plugins {
7-
val kotlinVersion = "1.9.21"
7+
val kotlinVersion = "1.9.22"
88
kotlin("jvm") version kotlinVersion
99
kotlin("plugin.serialization") version kotlinVersion
10-
id("org.jetbrains.compose") version "1.5.11"
11-
id("io.gitlab.arturbosch.detekt") version "1.23.4"
12-
id("dev.hydraulic.conveyor") version "1.6"
10+
id("org.jetbrains.compose") version "1.5.12"
11+
id("io.gitlab.arturbosch.detekt") version "1.23.5"
12+
id("dev.hydraulic.conveyor") version "1.8"
1313
}
1414

1515
group = "org.datepollsystems.waiterrobot.mediator"
@@ -31,7 +31,7 @@ dependencies {
3131

3232
implementation(compose.materialIconsExtended)
3333

34-
val ktorVersion = "2.3.7"
34+
val ktorVersion = "2.3.8"
3535
implementation("io.ktor:ktor-client-core:$ktorVersion")
3636
implementation("io.ktor:ktor-client-cio:$ktorVersion")
3737
implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
@@ -47,20 +47,20 @@ dependencies {
4747
implementation("io.insert-koin:koin-core:3.5.3")
4848
implementation("io.insert-koin:koin-compose:1.1.2")
4949

50-
val kermitVersion = "2.0.2"
50+
val kermitVersion = "2.0.3"
5151
implementation("co.touchlab:kermit:$kermitVersion")
52-
implementation("io.sentry:sentry:7.2.0")
52+
implementation("io.sentry:sentry:7.3.0")
5353

5454
implementation("org.apache.pdfbox:pdfbox:3.0.1")
55-
runtimeOnly("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.7.3") // Adds a Main Dispatcher for Desktop
55+
runtimeOnly("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.8.0") // Adds a Main Dispatcher for Desktop
5656

57-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2")
57+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
5858
implementation(kotlin("reflect"))
5959

6060
testImplementation(kotlin("test"))
6161
testImplementation("co.touchlab:kermit-test:$kermitVersion")
6262

63-
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.4")
63+
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.5")
6464
}
6565

6666
tasks.withType<KotlinCompile> {

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.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew.bat

Lines changed: 10 additions & 10 deletions
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.
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.
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
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.
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.
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
6565

6666
goto fail
6767

0 commit comments

Comments
 (0)