diff --git a/.github/workflows/CheckStyle.yml b/.github/workflows/CheckStyle.yml index 69f03b1..ed84a3b 100644 --- a/.github/workflows/CheckStyle.yml +++ b/.github/workflows/CheckStyle.yml @@ -20,10 +20,10 @@ jobs: distribution: 'adopt' - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/actions/setup-gradle@v3 - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 + uses: gradle/wrapper-validation-action@v2 - name: Grant execute permission for gradlew run: chmod +x gradlew diff --git a/.github/workflows/Conveyor.yml b/.github/workflows/Conveyor.yml index 01e4b1f..c9b088c 100644 --- a/.github/workflows/Conveyor.yml +++ b/.github/workflows/Conveyor.yml @@ -18,10 +18,10 @@ jobs: distribution: 'adopt' - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/actions/setup-gradle@v3 - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 + uses: gradle/wrapper-validation-action@v2 - name: Grant execute permission for gradlew run: chmod +x gradlew @@ -44,7 +44,7 @@ jobs: tar xzf .keys.tar.gz - name: Run Conveyor - uses: hydraulic-software/conveyor/actions/build@v13.0 + uses: hydraulic-software/conveyor/actions/build@v13.1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} APPLE_ISSUER_ID: ${{ secrets.APPLE_ISSUER_ID }} diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index 52754c0..5297db4 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -18,13 +18,13 @@ jobs: distribution: 'adopt' - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/actions/setup-gradle@v3 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 + uses: gradle/wrapper-validation-action@v2 - name: Test run: ./gradlew test --stacktrace diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index ae3f30a..8d81632 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 940fc06..1b4d86a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,12 +4,12 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import java.io.ByteArrayOutputStream plugins { - val kotlinVersion = "1.9.21" + val kotlinVersion = "1.9.22" kotlin("jvm") version kotlinVersion kotlin("plugin.serialization") version kotlinVersion - id("org.jetbrains.compose") version "1.5.11" - id("io.gitlab.arturbosch.detekt") version "1.23.4" - id("dev.hydraulic.conveyor") version "1.6" + id("org.jetbrains.compose") version "1.5.12" + id("io.gitlab.arturbosch.detekt") version "1.23.5" + id("dev.hydraulic.conveyor") version "1.8" } group = "org.datepollsystems.waiterrobot.mediator" @@ -31,7 +31,7 @@ dependencies { implementation(compose.materialIconsExtended) - val ktorVersion = "2.3.7" + val ktorVersion = "2.3.8" implementation("io.ktor:ktor-client-core:$ktorVersion") implementation("io.ktor:ktor-client-cio:$ktorVersion") implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion") @@ -47,20 +47,20 @@ dependencies { implementation("io.insert-koin:koin-core:3.5.3") implementation("io.insert-koin:koin-compose:1.1.2") - val kermitVersion = "2.0.2" + val kermitVersion = "2.0.3" implementation("co.touchlab:kermit:$kermitVersion") - implementation("io.sentry:sentry:7.2.0") + implementation("io.sentry:sentry:7.3.0") implementation("org.apache.pdfbox:pdfbox:3.0.1") - runtimeOnly("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.7.3") // Adds a Main Dispatcher for Desktop + runtimeOnly("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.8.0") // Adds a Main Dispatcher for Desktop - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3") implementation(kotlin("reflect")) testImplementation(kotlin("test")) testImplementation("co.touchlab:kermit-test:$kermitVersion") - detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.4") + detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.5") } tasks.withType { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1af9e09..a80b22c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 6689b85..7101f8e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail