Skip to content

Commit

Permalink
chore(deps): update dependencies (minor/patch)
Browse files Browse the repository at this point in the history
  • Loading branch information
renovate[bot] authored Aug 16, 2023
1 parent c27eebc commit 1f69c96
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ WORKDIR /app
COPY package.json pnpm-lock.yaml* ./
RUN yarn global add pnpm && pnpm i

FROM gradle:8.1.1-jdk11 AS kdeps
FROM gradle:8.2.1-jdk11 AS kdeps
WORKDIR /app
COPY kotlin/*gradle* kotlin/kotlin-js-store ./kotlin/
WORKDIR /app/kotlin
Expand Down
12 changes: 6 additions & 6 deletions kotlin/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
kotlin("multiplatform") version "1.8.22"
kotlin("plugin.serialization") version "1.8.22"
id("org.jmailen.kotlinter") version "3.15.0"
kotlin("multiplatform") version "1.9.0"
kotlin("plugin.serialization") version "1.9.0"
id("org.jmailen.kotlinter") version "3.16.0"
}

group = "net.turtton"
Expand Down Expand Up @@ -32,19 +32,19 @@ kotlin {
sourceSets {
val commonMain by getting {
dependencies {
implementation("org.jetbrains:markdown:0.4.1")
implementation("org.jetbrains:markdown:0.5.0")
}
}
val jsMain by getting {
dependencies {
implementation(enforcedPlatform("org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:1.0.0-pre.565"))
implementation(enforcedPlatform("org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:1.0.0-pre.616"))
implementation("org.jetbrains.kotlin-wrappers:kotlin-react")
implementation("org.jetbrains.kotlin-wrappers:kotlin-react-dom")
implementation("org.jetbrains.kotlin-wrappers:kotlin-emotion")
implementation("org.jetbrains.kotlin-wrappers:kotlin-react-router-dom")

implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")

implementation("io.github.xxfast:kstore:0.6.0")?.version?.also {
implementation("io.github.xxfast:kstore-file:$it")
Expand Down
Binary file modified kotlin/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion kotlin/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
5 changes: 4 additions & 1 deletion kotlin/gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,13 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,5 @@
"tailwindcss": "^3.2.4",
"typescript": "^5.0.0"
},
"packageManager": "[email protected].1"
"packageManager": "[email protected].12"
}
4 changes: 4 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1f69c96

Please sign in to comment.