Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/gradle/org.jmailen.kotlinter-4.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
blockvote committed Jun 3, 2024
2 parents 66197e1 + f9de4c1 commit 9e76ab1
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 19 deletions.
25 changes: 25 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,31 @@ updates:
open-pull-requests-limit: 99
schedule:
interval: monthly
- package-ecosystem: "gradle"
directory: "/router/"
open-pull-requests-limit: 99
schedule:
interval: monthly
- package-ecosystem: "gradle"
directory: "/router-protobuf/"
open-pull-requests-limit: 99
schedule:
interval: monthly
- package-ecosystem: "gradle"
directory: "/router-openapi-request-validator/"
open-pull-requests-limit: 99
schedule:
interval: monthly
- package-ecosystem: "gradle"
directory: "/samples/lambda-kotlin-request-router-sample/"
open-pull-requests-limit: 99
schedule:
interval: monthly
- package-ecosystem: "gradle"
directory: "/samples/lambda-kotlin-request-router-sample-proto"
open-pull-requests-limit: 99
schedule:
interval: monthly
- package-ecosystem: "github-actions"
directory: "/"
open-pull-requests-limit: 99
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ buildscript {

plugins {
java
kotlin("jvm") version "1.3.50"
kotlin("jvm") version "2.0.0"
idea
id("com.github.johnrengelman.shadow") version "5.1.0"
id("org.jmailen.kotlinter") version "1.22.0"
id("com.github.johnrengelman.shadow") version "8.1.1"
id("org.jmailen.kotlinter") version "4.3.0"
id("com.google.protobuf") version "0.8.7"
}

Expand All @@ -37,17 +37,17 @@ dependencies {
implementation(kotlin("stdlib-jdk8"))
implementation(kotlin("reflect"))

implementation("io.moia.lambda-kotlin-request-router:router-protobuf:0.9.7")
implementation("io.moia.lambda-kotlin-request-router:router-protobuf:0.10.2")

implementation("com.amazonaws:aws-lambda-java-core:1.2.0")
implementation("com.amazonaws:aws-lambda-java-core:1.2.3")
implementation("com.amazonaws:aws-lambda-java-log4j2:1.1.0")
implementation("com.fasterxml.jackson.core:jackson-databind:2.12.0")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.12.0")
implementation("com.fasterxml.jackson.core:jackson-databind:2.17.1")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.17.1")
implementation("com.google.guava:guava:23.0")
implementation("com.google.protobuf:protobuf-java:$proto")
implementation("com.google.protobuf:protobuf-java-util:$proto")

testImplementation("org.junit.jupiter:junit-jupiter-engine:5.3.1")
testImplementation("org.junit.jupiter:junit-jupiter-engine:5.10.2")
}

tasks {
Expand Down
22 changes: 11 additions & 11 deletions samples/lambda-kotlin-request-router-sample/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ buildscript {

plugins {
java
kotlin("jvm") version "1.3.50"
kotlin("jvm") version "2.0.0"
idea
id("com.github.johnrengelman.shadow") version "5.1.0"
id("org.jmailen.kotlinter") version "1.22.0"
id("com.github.johnrengelman.shadow") version "8.1.1"
id("org.jmailen.kotlinter") version "4.3.0"
}


Expand All @@ -33,18 +33,18 @@ dependencies {
implementation(kotlin("stdlib-jdk8"))
implementation(kotlin("reflect"))

implementation("io.moia.lambda-kotlin-request-router:router:0.9.7")
implementation("io.moia.lambda-kotlin-request-router:router:0.10.2")

implementation("com.amazonaws:aws-lambda-java-core:1.2.0")
implementation("com.amazonaws:aws-lambda-java-log4j2:1.1.0")
implementation("com.fasterxml.jackson.core:jackson-databind:2.12.0")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.12.0")
implementation("com.amazonaws:aws-lambda-java-core:1.2.3")
implementation("com.amazonaws:aws-lambda-java-log4j2:1.6.0")
implementation("com.fasterxml.jackson.core:jackson-databind:2.17.1")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.17.1")
implementation("com.google.guava:guava:23.0")

implementation("ch.qos.logback:logback-classic:1.2.3")
implementation("org.slf4j:log4j-over-slf4j:1.7.26")
implementation("ch.qos.logback:logback-classic:1.5.6")
implementation("org.slf4j:log4j-over-slf4j:2.0.13")

testImplementation("org.junit.jupiter:junit-jupiter-engine:5.3.1")
testImplementation("org.junit.jupiter:junit-jupiter-engine:5.10.2")
}

tasks {
Expand Down

0 comments on commit 9e76ab1

Please sign in to comment.