Skip to content

Commit c84b905

Browse files
committed
java 1.8 AL1 is deprecated
1 parent 14a7b83 commit c84b905

File tree

5 files changed

+8
-22
lines changed

5 files changed

+8
-22
lines changed

examples/powertools-examples-core/gradle/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ wrapper {
99
}
1010

1111
compileJava {
12-
sourceCompatibility = "1.8"
13-
targetCompatibility = "1.8"
12+
sourceCompatibility = "11"
13+
targetCompatibility = "11"
1414

1515
ajc {
1616
enabled = true

examples/powertools-examples-core/kotlin/build.gradle.kts

+3-16
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,6 @@ dependencies {
2121
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
2222
}
2323

24-
tasks.compileKotlin {
25-
kotlinOptions {
26-
jvmTarget = "1.8"
27-
}
28-
}
29-
30-
tasks.compileTestKotlin {
31-
kotlinOptions {
32-
jvmTarget = "1.8"
33-
}
34-
}
35-
36-
// If using JDK 11 or higher, use the following instead:
37-
//kotlin {
38-
// jvmToolchain(11)
39-
//}
24+
kotlin {
25+
jvmToolchain(11)
26+
}

examples/powertools-examples-core/sam/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
<properties>
1313
<log4j.version>2.22.1</log4j.version>
14-
<maven.compiler.source>1.8</maven.compiler.source>
15-
<maven.compiler.target>1.8</maven.compiler.target>
14+
<maven.compiler.source>11</maven.compiler.source>
15+
<maven.compiler.target>11</maven.compiler.target>
1616
</properties>
1717

1818
<dependencies>

powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/Infrastructure.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ private Builder() {
513513

514514
private JavaRuntime mapRuntimeVersion(String environmentVariableName) {
515515
String javaVersion = System.getenv(environmentVariableName); // must be set in GitHub actions
516-
JavaRuntime ret = null;
516+
JavaRuntime ret;
517517
if (javaVersion == null) {
518518
throw new IllegalArgumentException(environmentVariableName + " is not set");
519519
}

powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/JavaRuntime.java

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import software.amazon.awscdk.services.lambda.Runtime;
1818

1919
public enum JavaRuntime {
20-
JAVA8("java8", Runtime.JAVA_8, "1.8"),
2120
JAVA8AL2("java8.al2", Runtime.JAVA_8_CORRETTO, "1.8"),
2221
JAVA11("java11", Runtime.JAVA_11, "11"),
2322
JAVA17("java17", Runtime.JAVA_17, "17"),

0 commit comments

Comments
 (0)