Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/gradle/jvm-2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
blockvote authored Jun 3, 2024
2 parents 5a5d196 + 7126439 commit ccd1f65
Show file tree
Hide file tree
Showing 15 changed files with 455 additions and 320 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
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ repositories {
}

dependencies {
implementation(kotlin("stdlib-jdk8"))
implementation(kotlin("stdlib"))
implementation(kotlin("reflect"))
}

Expand Down
2 changes: 1 addition & 1 deletion router-openapi-request-validator/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ repositories {
}

dependencies {
implementation(kotlin("stdlib-jdk8"))
implementation(kotlin("stdlib"))
implementation(kotlin("reflect"))

api("com.atlassian.oai:swagger-request-validator-core:2.40.0")
Expand Down
2 changes: 1 addition & 1 deletion router-protobuf/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repositories {
}

dependencies {
implementation(kotlin("stdlib-jdk8"))
implementation(kotlin("stdlib"))
implementation(kotlin("reflect"))

implementation("org.slf4j:slf4j-api:2.0.13")
Expand Down
4 changes: 2 additions & 2 deletions router/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@


dependencies {
implementation(kotlin("stdlib-jdk8"))
implementation(kotlin("stdlib"))
implementation(kotlin("reflect"))
api("com.amazonaws:aws-lambda-java-core:1.2.3")
api("com.amazonaws:aws-lambda-java-events:3.11.5")

implementation("org.slf4j:slf4j-api:2.0.13")
api("com.fasterxml.jackson.core:jackson-databind:2.17.0")
api("com.fasterxml.jackson.core:jackson-databind:2.17.1")
api("com.fasterxml.jackson.module:jackson-module-kotlin:2.17.1")
api("com.google.guava:guava:33.2.1-jre")

Expand Down
24 changes: 12 additions & 12 deletions samples/lambda-kotlin-request-router-sample-proto/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ 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.google.protobuf") version "0.8.7"
id("com.github.johnrengelman.shadow") version "8.1.1"
id("org.jmailen.kotlinter") version "4.3.0"
id("com.google.protobuf") version "0.8.13"
}


Expand All @@ -34,25 +34,25 @@ repositories {

val proto = "3.11.1"
dependencies {
implementation(kotlin("stdlib-jdk8"))
implementation(kotlin("stdlib"))
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-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("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 {
withType<KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.jvmTarget = "17"
}

withType<Test> {
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit ccd1f65

Please sign in to comment.