Skip to content

Commit 283d110

Browse files
authored
Merge pull request #21 from DatepollSystems/chore/update-dependencies
Update dependencies
2 parents f67b9bc + fec4943 commit 283d110

File tree

7 files changed

+28
-27
lines changed

7 files changed

+28
-27
lines changed

.github/workflows/CheckStyle.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v1
14+
uses: actions/checkout@v4
1515

1616
- name: Setup JDK 17
17-
uses: actions/setup-java@v3
17+
uses: actions/setup-java@v4
1818
with:
1919
java-version: '17'
2020
distribution: 'adopt'
@@ -33,7 +33,7 @@ jobs:
3333

3434
- name: Upload detekt SARIF files
3535
if: success() || failure() # do not use always as this would also upload on workflow cancel
36-
uses: github/codeql-action/upload-sarif@v2
36+
uses: github/codeql-action/upload-sarif@v3
3737
with:
3838
sarif_file: 'build/reports/detekt/merge.sarif'
3939
category: detekt

.github/workflows/Conveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
uses: actions/checkout@v4
1313

1414
- name: set up JDK 17
15-
uses: actions/setup-java@v3
15+
uses: actions/setup-java@v4
1616
with:
1717
java-version: '17'
1818
distribution: 'adopt'
@@ -44,7 +44,7 @@ jobs:
4444
tar xzf .keys.tar.gz
4545
4646
- name: Run Conveyor
47-
uses: hydraulic-software/conveyor/actions/build@v12.1
47+
uses: hydraulic-software/conveyor/actions/build@v13.0
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
@@ -9,10 +9,10 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout repo
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313

1414
- name: set up JDK 17
15-
uses: actions/setup-java@v3
15+
uses: actions/setup-java@v4
1616
with:
1717
java-version: '17'
1818
distribution: 'adopt'

build.gradle.kts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import io.gitlab.arturbosch.detekt.report.ReportMergeTask
33
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
44

55
plugins {
6-
val kotlinVersion = "1.9.0"
6+
val kotlinVersion = "1.9.21"
77
kotlin("jvm") version kotlinVersion
88
kotlin("plugin.serialization") version kotlinVersion
9-
id("org.jetbrains.compose") version "1.4.3"
10-
id("io.gitlab.arturbosch.detekt") version "1.23.1"
9+
id("org.jetbrains.compose") version "1.5.11"
10+
id("io.gitlab.arturbosch.detekt") version "1.23.4"
1111
id("dev.hydraulic.conveyor") version "1.6"
1212
}
1313

@@ -30,7 +30,7 @@ dependencies {
3030

3131
implementation(compose.materialIconsExtended)
3232

33-
val ktorVersion = "2.3.2"
33+
val ktorVersion = "2.3.7"
3434
implementation("io.ktor:ktor-client-core:$ktorVersion")
3535
implementation("io.ktor:ktor-client-cio:$ktorVersion")
3636
implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
@@ -43,23 +43,23 @@ dependencies {
4343
implementation("dev.icerock.moko:mvvm-core:${mokoMvvmVersion}")
4444
implementation("dev.icerock.moko:mvvm-compose:${mokoMvvmVersion}")
4545

46-
implementation("io.insert-koin:koin-core:3.4.3")
47-
implementation("io.insert-koin:koin-compose:1.0.4")
46+
implementation("io.insert-koin:koin-core:3.5.3")
47+
implementation("io.insert-koin:koin-compose:1.1.2")
4848

49-
val kermitVersion = "2.0.0-RC5"
49+
val kermitVersion = "2.0.2"
5050
implementation("co.touchlab:kermit:$kermitVersion")
51-
implementation("io.sentry:sentry:6.27.0")
51+
implementation("io.sentry:sentry:7.2.0")
5252

53-
implementation("org.apache.pdfbox:pdfbox:3.0.0-RC1")
53+
implementation("org.apache.pdfbox:pdfbox:3.0.1")
5454
runtimeOnly("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.7.3") // Adds a Main Dispatcher for Desktop
5555

56-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1")
56+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2")
5757
implementation(kotlin("reflect"))
5858

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

62-
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.1")
62+
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.4")
6363
}
6464

6565
tasks.withType<KotlinCompile> {

gradle/wrapper/gradle-wrapper.jar

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

gradlew

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ done
8383
# This is normally unused
8484
# shellcheck disable=SC2034
8585
APP_BASE_NAME=${0##*/}
86-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
86+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
8788

8889
# Use the maximum available, or set MAX_FD != -1 to use that value.
8990
MAX_FD=maximum
@@ -144,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144145
case $MAX_FD in #(
145146
max*)
146147
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147-
# shellcheck disable=SC3045
148+
# shellcheck disable=SC2039,SC3045
148149
MAX_FD=$( ulimit -H -n ) ||
149150
warn "Could not query maximum file descriptor limit"
150151
esac
151152
case $MAX_FD in #(
152153
'' | soft) :;; #(
153154
*)
154155
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155-
# shellcheck disable=SC3045
156+
# shellcheck disable=SC2039,SC3045
156157
ulimit -n "$MAX_FD" ||
157158
warn "Could not set maximum file descriptor limit to $MAX_FD"
158159
esac
@@ -201,11 +202,11 @@ fi
201202
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
202203
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
203204

204-
# Collect all arguments for the java command;
205-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
206-
# shell script including quotes and variable substitutions, so put them in
207-
# double quotes to make sure that they get re-expanded; and
208-
# * put everything else in single quotes, so that it's not re-expanded.
205+
# Collect all arguments for the java command:
206+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207+
# and any embedded shellness will be escaped.
208+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209+
# treated as '${Hostname}' itself on the command line.
209210

210211
set -- \
211212
"-Dorg.gradle.appname=$APP_BASE_NAME" \

0 commit comments

Comments
 (0)