Upgrade to Gradle 8.8 and Java 17 (#382)

* Upgrade to Gradle 8 * Upgrade to Gradle 8 * Upgrade to Gradle 8 * Upgrade java
moia-oss · Jun 3, 2024 · 7126439 · 7126439
1 parent 4da662e
commit 7126439
Show file tree

Hide file tree

Showing 14 changed files with 409 additions and 299 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -25,7 +25,7 @@ repositories {
 }
 
 dependencies {
-    implementation(kotlin("stdlib-jdk8"))
+    implementation(kotlin("stdlib"))
     implementation(kotlin("reflect"))
 }
 

diff --git a/router-openapi-request-validator/build.gradle.kts b/router-openapi-request-validator/build.gradle.kts
@@ -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")

diff --git a/router-protobuf/build.gradle.kts b/router-protobuf/build.gradle.kts
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-    implementation(kotlin("stdlib-jdk8"))
+    implementation(kotlin("stdlib"))
     implementation(kotlin("reflect"))
 
     implementation("org.slf4j:slf4j-api:2.0.13")

diff --git a/router/build.gradle.kts b/router/build.gradle.kts
@@ -1,7 +1,7 @@
 
 
 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")

diff --git a/samples/lambda-kotlin-request-router-sample-proto/build.gradle.kts b/samples/lambda-kotlin-request-router-sample-proto/build.gradle.kts
@@ -20,7 +20,7 @@ plugins {
     idea
     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"
+    id("com.google.protobuf") version "0.8.13"
 }
 
 
@@ -34,7 +34,7 @@ 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.10.2")
@@ -52,7 +52,7 @@ dependencies {
 
 tasks {
     withType<KotlinCompile> {
-        kotlinOptions.jvmTarget = "1.8"
+        kotlinOptions.jvmTarget = "17"
     }
 
     withType<Test> {

diff --git a/samples/lambda-kotlin-request-router-sample-proto/gradle/wrapper/gradle-wrapper.jar b/samples/lambda-kotlin-request-router-sample-proto/gradle/wrapper/gradle-wrapper.jar
diff --git a/samples/lambda-kotlin-request-router-sample-proto/gradle/wrapper/gradle-wrapper.properties b/samples/lambda-kotlin-request-router-sample-proto/gradle/wrapper/gradle-wrapper.properties
@@ -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