diff --git a/.github/workflows/Conveyor.yml b/.github/workflows/Conveyor.yml index 7c11926..5314a8e 100644 --- a/.github/workflows/Conveyor.yml +++ b/.github/workflows/Conveyor.yml @@ -44,7 +44,7 @@ jobs: tar xzf .keys.tar.gz - name: Run Conveyor - uses: hydraulic-software/conveyor/actions/build@v14.2 + uses: hydraulic-software/conveyor/actions/build@v14.3 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} APPLE_ISSUER_ID: ${{ secrets.APPLE_ISSUER_ID }} diff --git a/build.gradle.kts b/build.gradle.kts index 8b268cd..7df45ee 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,9 +7,9 @@ plugins { val kotlinVersion = "1.9.23" kotlin("jvm") version kotlinVersion kotlin("plugin.serialization") version kotlinVersion - id("org.jetbrains.compose") version "1.6.2" - id("io.gitlab.arturbosch.detekt") version "1.23.6" - id("dev.hydraulic.conveyor") version "1.10" + id("org.jetbrains.compose") version "1.6.11" + id("io.gitlab.arturbosch.detekt") version "1.23.7" + id("dev.hydraulic.conveyor") version "1.11" } group = "org.datepollsystems.waiterrobot.mediator" @@ -31,7 +31,7 @@ dependencies { implementation(compose.materialIconsExtended) - val ktorVersion = "2.3.11" + val ktorVersion = "2.3.12" 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.6") implementation("io.insert-koin:koin-compose:1.1.5") - val kermitVersion = "2.0.3" + val kermitVersion = "2.0.4" implementation("co.touchlab:kermit:$kermitVersion") - implementation("io.sentry:sentry:7.9.0") + implementation("io.sentry:sentry:7.14.0") - implementation("org.apache.pdfbox:pdfbox:3.0.2") + implementation("org.apache.pdfbox:pdfbox:3.0.3") runtimeOnly("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.8.1") // Adds a Main Dispatcher for Desktop - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.2") implementation(kotlin("reflect")) testImplementation(kotlin("test")) testImplementation("co.touchlab:kermit-test:$kermitVersion") - detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.6") + detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.7") } tasks.withType { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e644113..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23..0aaefbc 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.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 7101f8e..9b42019 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ##########################################################################