Merge branch 'develop'

.github/workflows/build.yml

@@ -125,6 +125,7 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
         npm:
           - 8
           - 9
@@ -158,6 +159,7 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
@@ -185,6 +187,7 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
@@ -193,7 +196,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
 
@@ -215,6 +218,7 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
@@ -223,7 +227,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
 
@@ -243,6 +247,7 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
@@ -267,11 +272,16 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
+      - run: |
+          python -m pip install --upgrade pip
+          pip install --upgrade setuptools
+        if: ${{ matrix.os }} == 'ubuntu-latest' && ${{ matrix.python }} == '3.12'
       - run: make init
       - run: pytest -vv tests/integration/workflows/python_pip
 
@@ -291,6 +301,7 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
@@ -321,6 +332,7 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4

aws_lambda_builders/__init__.py

@@ -5,5 +5,5 @@
 # Changing version will trigger a new release!
 # Please make the version change as the last step of your development.
 
-__version__ = "1.41.0"
+__version__ = "1.42.0"
 RPC_PROTOCOL_VERSION = "0.3"

aws_lambda_builders/validator.py

@@ -20,11 +20,13 @@
     "python3.9": [ARM64, X86_64],
     "python3.10": [ARM64, X86_64],
     "python3.11": [ARM64, X86_64],
+    "python3.12": [ARM64, X86_64],
     "ruby2.7": [ARM64, X86_64],
     "ruby3.2": [ARM64, X86_64],
     "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],

aws_lambda_builders/workflows/python_pip/DESIGN.md

@@ -49,7 +49,7 @@ def build_dependencies(artifacts_dir_path,
 
     :type runtime: str
     :param runtime: Python version to build dependencies for. This can
-        either be python3.7, python3.8, python3.9, python3.10 or python3.11. These are
+        either be python3.7, python3.8, python3.9, python3.10, python3.11 or python3.12. These are
         currently the only supported values.
 
     :type ui: :class:`lambda_builders.actions.python_pip.utils.UI`

aws_lambda_builders/workflows/python_pip/packager.py

@@ -87,6 +87,7 @@ def get_lambda_abi(runtime):
         "python3.9": "cp39",
         "python3.10": "cp310",
         "python3.11": "cp311",
+        "python3.12": "cp312",
     }
 
     if runtime not in supported:
@@ -101,7 +102,7 @@ def __init__(self, runtime, osutils=None, dependency_builder=None, architecture=
 
         :type runtime: str
         :param runtime: Python version to build dependencies for. This can
-            either be python3.7, python3.8, python3.9, python3.10 or python3.11. These are currently the
+            either be python3.7, python3.8, python3.9, python3.10, python3.11 or python3.12. These are currently the
             only supported values.
 
         :type osutils: :class:`lambda_builders.utils.OSUtils`

setup.py

@@ -63,6 +63,7 @@ def read_version():
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Topic :: Internet",
         "Topic :: Software Development :: Build Tools",
         "Topic :: Utilities",

tests/integration/workflows/java_gradle/test_java_gradle.py

@@ -24,6 +24,7 @@
         ["java8"],
         ["java11"],
         ["java17"],
+        ["java21"],
     ],
 )
 class TestJavaGradle(TestCase):

tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/build.gradle

@@ -0,0 +1,5 @@
+allprojects {
+    repositories {
+        mavenCentral()
+    }
+}

tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/common/build.gradle

@@ -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

tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/common/src/main/java/aws/lambdabuilders/Foo.java

@@ -0,0 +1,7 @@
+package aws.lambdabuilders;
+
+public class Foo {
+    public void sayHello() {
+        System.out.println("Hello world!");
+    }
+}

tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/lambda1/build.gradle

@@ -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

tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java

@@ -0,0 +1,7 @@
+package aws.lambdabuilders;
+
+public class Lambda1_Main {
+    public static void main(String[] args) {
+        System.out.println("Hello AWS Lambda Builders!");
+    }
+}

tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/lambda2/build.gradle

@@ -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

tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java

@@ -0,0 +1,7 @@
+package aws.lambdabuilders;
+
+public class Lambda2_Main {
+    public static void main(String[] args) {
+        System.out.println("Hello AWS Lambda Builders!");
+    }
+}

tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/settings.gradle

@@ -0,0 +1,2 @@
+rootProject.name = 'multi-build'
+include 'lambda1', 'lambda2', 'common'

tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps/build.gradle

@@ -0,0 +1,5 @@
+allprojects {
+    repositories {
+        mavenCentral()
+    }
+}

tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps/lambda1/build.gradle

@@ -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

tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java

@@ -0,0 +1,7 @@
+package aws.lambdabuilders;
+
+public class Lambda1_Main {
+    public static void main(String[] args) {
+        System.out.println("Hello AWS Lambda Builders!");
+    }
+}

tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps/lambda2/build.gradle

@@ -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

tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java

@@ -0,0 +1,7 @@
+package aws.lambdabuilders;
+
+public class Lambda2_Main {
+    public static void main(String[] args) {
+        System.out.println("Hello AWS Lambda Builders!");
+    }
+}

tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps/settings.gradle

@@ -0,0 +1,2 @@
+rootProject.name = 'multi-build'
+include 'lambda1', 'lambda2'

tests/integration/workflows/java_gradle/testdata/single-build/java17/layer/build.gradle

@@ -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
 

tests/integration/workflows/java_gradle/testdata/single-build/java21/layer/build.gradle

@@ -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)
+        }
+    }
+}

tests/integration/workflows/java_gradle/testdata/single-build/java21/layer/settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'common-layer-gradle'

tests/integration/workflows/java_gradle/testdata/single-build/java21/layer/src/main/java/aws/lambdabuilders/CommonCode.java

@@ -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);
+    }
+}

tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-broken/build.gradle

@@ -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

tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-broken/src/main/java/aws/lambdabuilders/Main.java

@@ -0,0 +1,7 @@
+package aws.lambdabuilders;
+
+public class Main {
+    public static void main(String[] args) {
+        System.out.println("Hello AWS Lambda Builders!");
+    }
+}

tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-gradlew/build.gradle

@@ -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

tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-gradlew/gradle/wrapper/gradle-wrapper.properties

@@ -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