diff --git a/Dockerfile b/Dockerfile index a9c9df85..fabdee81 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/kotlin/build.gradle.kts b/kotlin/build.gradle.kts index a3708eab..ae6e47d9 100644 --- a/kotlin/build.gradle.kts +++ b/kotlin/build.gradle.kts @@ -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" @@ -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.614")) 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") diff --git a/kotlin/gradle/wrapper/gradle-wrapper.jar b/kotlin/gradle/wrapper/gradle-wrapper.jar index c1962a79..033e24c4 100644 Binary files a/kotlin/gradle/wrapper/gradle-wrapper.jar and b/kotlin/gradle/wrapper/gradle-wrapper.jar differ diff --git a/kotlin/gradle/wrapper/gradle-wrapper.properties b/kotlin/gradle/wrapper/gradle-wrapper.properties index 37aef8d3..9f4197d5 100644 --- a/kotlin/gradle/wrapper/gradle-wrapper.properties +++ b/kotlin/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/kotlin/gradlew b/kotlin/gradlew index aeb74cbb..fcb6fca1 100755 --- a/kotlin/gradlew +++ b/kotlin/gradlew @@ -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. diff --git a/package.json b/package.json index 63b1bd7e..b7cf71c4 100644 --- a/package.json +++ b/package.json @@ -61,5 +61,5 @@ "tailwindcss": "^3.2.4", "typescript": "^5.0.0" }, - "packageManager": "pnpm@8.6.1" + "packageManager": "pnpm@8.6.12" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 972ae83a..12d2fbce 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,5 +1,9 @@ lockfileVersion: '6.0' +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + dependencies: '@emotion/cache': specifier: latest