Skip to content

Feat java21 runtime #574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: 'corretto'
java-version: '17'
java-version: '21'
- run: make init
- run: pytest -vv tests/integration/workflows/java_maven

Expand Down Expand Up @@ -223,7 +223,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '17'
java-version: '21'
- run: make init
- run: pytest -vv tests/integration/workflows/java_gradle

Expand Down
1 change: 1 addition & 0 deletions aws_lambda_builders/validator.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"java8": [ARM64, X86_64],
"java11": [ARM64, X86_64],
"java17": [ARM64, X86_64],
"java21": [ARM64, X86_64],
"go1.x": [ARM64, X86_64],
"dotnet6": [ARM64, X86_64],
"provided": [ARM64, X86_64],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
["java8"],
["java11"],
["java17"],
["java21"],
],
)
class TestJavaGradle(TestCase):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
allprojects {
repositories {
mavenCentral()
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
plugins {
id 'java'
}

repositories {
mavenCentral()
}

dependencies {
implementation 'software.amazon.awssdk:annotations:2.1.0'
}

java.sourceCompatibility = JavaVersion.VERSION_21
java.targetCompatibility = JavaVersion.VERSION_21
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package aws.lambdabuilders;

public class Foo {
public void sayHello() {
System.out.println("Hello world!");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
plugins {
id 'java'
}

repositories {
mavenCentral()
}

dependencies {
implementation 'software.amazon.awssdk:annotations:2.1.0'
implementation project(':common')
}

java.sourceCompatibility = JavaVersion.VERSION_21
java.targetCompatibility = JavaVersion.VERSION_21
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package aws.lambdabuilders;

public class Lambda1_Main {
public static void main(String[] args) {
System.out.println("Hello AWS Lambda Builders!");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
plugins {
id 'java'
}

repositories {
mavenCentral()
}

dependencies {
implementation 'software.amazon.awssdk:annotations:2.1.0'
}

java.sourceCompatibility = JavaVersion.VERSION_21
java.targetCompatibility = JavaVersion.VERSION_21
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package aws.lambdabuilders;

public class Lambda2_Main {
public static void main(String[] args) {
System.out.println("Hello AWS Lambda Builders!");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
rootProject.name = 'multi-build'
include 'lambda1', 'lambda2', 'common'
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
allprojects {
repositories {
mavenCentral()
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
plugins {
id 'java'
}

repositories {
mavenCentral()
}

dependencies {
implementation 'software.amazon.awssdk:annotations:2.1.0'
}

java.sourceCompatibility = JavaVersion.VERSION_21
java.targetCompatibility = JavaVersion.VERSION_21
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package aws.lambdabuilders;

public class Lambda1_Main {
public static void main(String[] args) {
System.out.println("Hello AWS Lambda Builders!");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
plugins {
id 'java'
}

repositories {
mavenCentral()
}

dependencies {
implementation 'software.amazon.awssdk:annotations:2.1.0'
}

java.sourceCompatibility = JavaVersion.VERSION_21
java.targetCompatibility = JavaVersion.VERSION_21
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package aws.lambdabuilders;

public class Lambda2_Main {
public static void main(String[] args) {
System.out.println("Hello AWS Lambda Builders!");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
rootProject.name = 'multi-build'
include 'lambda1', 'lambda2'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ dependencies {
group = 'aws.lambdabuilders'
version = '1.0'
description = 'common-layer-gradle'
java.sourceCompatibility = JavaVersion.VERSION_11
java.targetCompatibility = JavaVersion.VERSION_11
java.sourceCompatibility = JavaVersion.VERSION_17
java.targetCompatibility = JavaVersion.VERSION_17

build.finalizedBy publishToMavenLocal

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
plugins {
id 'java'
id 'java-library'
id 'maven-publish'
}

repositories {
mavenLocal()
maven {
url = uri('https://repo.maven.apache.org/maven2/')
}
}

dependencies {
api 'com.amazonaws:aws-lambda-java-core:1.2.0'
}

group = 'aws.lambdabuilders'
version = '1.0'
description = 'common-layer-gradle'
java.sourceCompatibility = JavaVersion.VERSION_21
java.targetCompatibility = JavaVersion.VERSION_21

build.finalizedBy publishToMavenLocal

publishing {
publications {
maven(MavenPublication) {
from(components.java)
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rootProject.name = 'common-layer-gradle'
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package aws.lambdabuilders;

import com.amazonaws.services.lambda.runtime.LambdaLogger;

public class CommonCode {

public static void doSomethingOnLayer(final LambdaLogger logger, final String s) {
logger.log("Doing something on layer" + s);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
plugins {
id 'java'
}

repositories {
mavenCentral()
}

dependencies {
implementation 'software.amazon.awssdk:does-not-exist:1.2.3'
}

java.sourceCompatibility = JavaVersion.VERSION_21
java.targetCompatibility = JavaVersion.VERSION_21
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package aws.lambdabuilders;

public class Main {
public static void main(String[] args) {
System.out.println("Hello AWS Lambda Builders!");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
plugins {
id 'java'
}

repositories {
mavenCentral()
}

dependencies {
implementation 'software.amazon.awssdk:annotations:2.1.0'
}

java.sourceCompatibility = JavaVersion.VERSION_21
java.targetCompatibility = JavaVersion.VERSION_21
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading