Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/gradle/whiskers-ktor/plugin.seria…
Browse files Browse the repository at this point in the history
…lization-1.9.0
  • Loading branch information
jesperancinha authored Aug 6, 2023
2 parents 0d2748d + 82f9f20 commit 6d36aaf
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 33 deletions.
33 changes: 16 additions & 17 deletions e2e/package-lock.json

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

2 changes: 1 addition & 1 deletion e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"author": "João Esperancinha",
"license": "ISC",
"devDependencies": {
"cypress": "12.17.1",
"cypress": "12.17.3",
"ts-node": "10.9.1",
"typescript": "5.1.6"
},
Expand Down
14 changes: 7 additions & 7 deletions e2e/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@
version "1.0.3"
resolved "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz"

"@types/node@*", "@types/node@^14.14.31":
version "14.18.31"
resolved "https://registry.npmjs.org/@types/node/-/node-14.18.31.tgz"
"@types/node@*", "@types/node@^16.18.39":
version "16.18.39"
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.39.tgz#aa39a1a87a40ef6098ee69689a1acb0c1b034832"

"@types/[email protected]":
version "8.1.1"
Expand Down Expand Up @@ -338,13 +338,13 @@ crypto@^1.0.1:
version "1.0.1"
resolved "https://registry.npmjs.org/crypto/-/crypto-1.0.1.tgz"

[email protected].1:
version "12.17.1"
resolved "https://registry.yarnpkg.com/cypress/-/cypress-12.17.1.tgz#777fdcceec4ecd642fc90795f5994853b6ea03f8"
[email protected].3:
version "12.17.3"
resolved "https://registry.yarnpkg.com/cypress/-/cypress-12.17.3.tgz#1e2b19037236fc60e4a4b3a14f0846be17a1fc0e"
dependencies:
"@cypress/request" "^2.88.11"
"@cypress/xvfb" "^1.2.4"
"@types/node" "^14.14.31"
"@types/node" "^16.18.39"
"@types/sinonjs__fake-timers" "8.1.1"
"@types/sizzle" "^2.3.2"
arch "^2.2.0"
Expand Down
6 changes: 3 additions & 3 deletions whiskers-cloudnative/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.springframework.boot.gradle.tasks.bundling.BootBuildImage

plugins {
id("org.springframework.boot") version "3.1.1"
id("io.spring.dependency-management") version "1.1.0"
id("org.springframework.boot") version "3.1.2"
id("io.spring.dependency-management") version "1.1.2"
// id("org.springframework.experimental.aot") version "0.12.1"
id("org.graalvm.buildtools.native") version "0.9.23"
kotlin("jvm") version "1.9.0"
Expand Down Expand Up @@ -32,7 +32,7 @@ dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
implementation("jakarta.validation:jakarta.validation-api:3.0.2")
implementation("io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE")
implementation("org.springframework.boot:spring-boot-starter-validation:3.1.1")
implementation("org.springframework.boot:spring-boot-starter-validation:3.1.2")
testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("io.projectreactor:reactor-test")
testImplementation("org.testcontainers:junit-jupiter")
Expand Down
6 changes: 3 additions & 3 deletions whiskers-graalvm/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
id("org.springframework.boot") version "3.1.1"
id("io.spring.dependency-management") version "1.1.0"
id("org.springframework.boot") version "3.1.2"
id("io.spring.dependency-management") version "1.1.2"
// id("org.springframework.experimental.aot") version "0.12.1"
id("org.graalvm.buildtools.native") version "0.9.23"
kotlin("jvm") version "1.8.22"
Expand Down Expand Up @@ -30,7 +30,7 @@ dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
implementation("jakarta.validation:jakarta.validation-api:3.0.2")
implementation("io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE")
implementation("org.springframework.boot:spring-boot-starter-validation:3.1.1")
implementation("org.springframework.boot:spring-boot-starter-validation:3.1.2")
testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("io.projectreactor:reactor-test")
testImplementation("org.testcontainers:junit-jupiter")
Expand Down
2 changes: 1 addition & 1 deletion whiskers-ktor-no-db/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ kotlin {
}
}
}
val ktorVersion="2.3.2"
val ktorVersion="2.3.3"
sourceSets {
val nativeMain by getting {
dependencies {
Expand Down
2 changes: 1 addition & 1 deletion whiskers-ktor/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ kotlin {
}

}
val ktorVersion = "2.3.2"
val ktorVersion = "2.3.3"
sourceSets {
val nativeMain by getting {
dependencies {
Expand Down

0 comments on commit 6d36aaf

Please sign in to comment.