Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/gradle/whiskers-cloudnative/plugi…
Browse files Browse the repository at this point in the history
…n.spring-1.9.20
  • Loading branch information
jesperancinha authored Jan 5, 2024
2 parents 87ca7ce + 9cc6f8d commit 47fb430
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 39 deletions.
29 changes: 14 additions & 15 deletions e2e/package-lock.json

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

4 changes: 2 additions & 2 deletions e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"license": "ISC",
"devDependencies": {
"cypress": "13.5.1",
"ts-node": "10.9.1",
"typescript": "5.3.2"
"ts-node": "10.9.2",
"typescript": "5.3.3"
},
"dependencies": {
"client-oauth2": "^4.3.3",
Expand Down
12 changes: 6 additions & 6 deletions e2e/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1165,9 +1165,9 @@ ts-expect@^1.1.0:
version "1.3.0"
resolved "https://registry.npmjs.org/ts-expect/-/ts-expect-1.3.0.tgz"

[email protected].1:
version "10.9.1"
resolved "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz"
[email protected].2:
version "10.9.2"
resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f"
dependencies:
"@cspotcode/source-map-support" "^0.8.0"
"@tsconfig/node10" "^1.0.7"
Expand Down Expand Up @@ -1201,9 +1201,9 @@ type-fest@^0.21.3:
version "0.21.3"
resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz"

[email protected].2:
version "5.3.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.2.tgz#00d1c7c1c46928c5845c1ee8d0cc2791031d4c43"
[email protected].3:
version "5.3.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"

universalify@^0.2.0:
version "0.2.0"
Expand Down
2 changes: 1 addition & 1 deletion plus/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
kotlin("multiplatform") version "1.9.21"
kotlin("multiplatform") version "1.9.22"
}

group = "me.jesperancinha"
Expand Down
8 changes: 4 additions & 4 deletions whiskers-cloudnative/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.springframework.boot.gradle.tasks.bundling.BootBuildImage

plugins {
id("org.springframework.boot") version "3.1.5"
id("org.springframework.boot") version "3.2.0"
id("io.spring.dependency-management") version "1.1.4"
// id("org.springframework.experimental.aot") version "0.12.1"
id("org.graalvm.buildtools.native") version "0.9.28"
kotlin("jvm") version "1.9.20"
kotlin("plugin.spring") version "1.9.20"
kotlin("jvm") version "1.9.21"
kotlin("plugin.spring") version "1.9.21"
}

group = "org.jesperancinha.native"
Expand All @@ -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.5")
implementation("org.springframework.boot:spring-boot-starter-validation:3.2.1")
testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("io.projectreactor:reactor-test")
testImplementation("org.testcontainers:junit-jupiter")
Expand Down
4 changes: 2 additions & 2 deletions whiskers-graalvm/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
id("org.springframework.boot") version "3.2.0"
id("org.springframework.boot") version "3.2.1"
id("io.spring.dependency-management") version "1.1.4"
// id("org.springframework.experimental.aot") version "0.12.1"
id("org.graalvm.buildtools.native") version "0.9.28"
kotlin("jvm") version "1.9.21"
kotlin("plugin.spring") version "1.9.21"
kotlin("plugin.spring") version "1.9.22"
}

group = "org.jesperancinha.knative"
Expand Down
8 changes: 4 additions & 4 deletions whiskers-ktor-no-db/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
application
kotlin("multiplatform") version "1.9.20"
kotlin("plugin.serialization") version "1.9.20"
kotlin("multiplatform") version "1.9.22"
kotlin("plugin.serialization") version "1.9.22"
}

group = "org.jesperancinha.native"
Expand Down Expand Up @@ -29,15 +29,15 @@ kotlin {
}
}
}
val ktorVersion="2.3.6"
val ktorVersion="2.3.7"
sourceSets {
val nativeMain by getting {
dependencies {
implementation("io.ktor:ktor-server-core:$ktorVersion")
implementation("io.ktor:ktor-server-cio:$ktorVersion")
implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
implementation("io.ktor:ktor-server-content-negotiation:$ktorVersion")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.1")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2")
}
}
val nativeTest by getting {
Expand Down
10 changes: 5 additions & 5 deletions whiskers-ktor/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
application
kotlin("multiplatform") version "1.9.21"
kotlin("plugin.serialization") version "1.9.21"
kotlin("multiplatform") version "1.9.22"
kotlin("plugin.serialization") version "1.9.22"
}

group = "org.jesperancinha.native"
Expand Down Expand Up @@ -42,16 +42,16 @@ kotlin {
}

}
val ktorVersion = "2.3.6"
val ktorVersion = "2.3.7"
sourceSets {
val nativeMain by getting {
dependencies {
implementation("io.ktor:ktor-server-core:$ktorVersion")
implementation("io.ktor:ktor-server-cio:$ktorVersion")
implementation("io.ktor:ktor-server-content-negotiation:$ktorVersion")
implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.1")
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.1")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2")
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.5.0")
implementation("app.cash.sqldelight:runtime:2.0.0-alpha05")
}
}
Expand Down

0 comments on commit 47fb430

Please sign in to comment.