Merge branch 'develop'

Author: aws-sam-cli-bot

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.56.0"
+__version__ = "1.57.0"
 RPC_PROTOCOL_VERSION = "0.3"

aws_lambda_builders/workflows/java_gradle/gradle.py

@@ -30,10 +30,10 @@ def __init__(self, gradle_binary, os_utils=None):
         self.os_utils = os_utils
 
     def build(self, source_dir, build_file, cache_dir=None, init_script_path=None, properties=None):
+        ## Note: build_file parameter is not supported anymore, but kept for backward compatibility
         if not self.os_utils.exists(build_file):
             raise BuildFileNotFoundError(build_file)
-
-        args = ["build", "--build-file", build_file]
+        args = ["build"]
         if cache_dir is not None:
             args.extend(["--project-cache-dir", cache_dir])
         if properties is not None:

aws_lambda_builders/workflows/java_gradle/resources/lambda-build-init.gradle

@@ -54,7 +54,8 @@ def assertExpectedBuildDir(p) {
 }
 
 def createArtifactDir(project) {
-    def distsDir = project.buildDir.toPath().resolve(project.distsDirName).resolve('lambda-build')
+    // In Gradle 9, distsDirName was removed. Use 'distributions' as the default directory name
+    def distsDir = project.buildDir.toPath().resolve('distributions').resolve('lambda-build')
     return makeDirs(distsDir)
 }
 

requirements/dev.txt

@@ -1,7 +1,7 @@
 coverage==7.9.2; python_version>="3.9"
 coverage==7.6.1; python_version<"3.9"
 flake8==3.8.4
-pytest-cov==6.1.1; python_version>="3.9"
+pytest-cov==6.2.1; python_version>="3.9"
 pytest-cov==5.0.0; python_version<"3.9"
 
 # Test requirements

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

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

tests/unit/workflows/java_gradle/test_gradle.py

@@ -60,7 +60,7 @@ def test_build_no_init_script(self):
         gradle = SubprocessGradle(gradle_binary=self.gradle_binary, os_utils=self.os_utils)
         gradle.build(self.source_dir, self.manifest_path)
         self.os_utils.popen.assert_called_with(
-            [self.gradle_path, "build", "--build-file", self.manifest_path],
+            [self.gradle_path, "build"],
             cwd=self.source_dir,
             stderr=subprocess.PIPE,
             stdout=subprocess.PIPE,
@@ -70,7 +70,7 @@ def test_gradlew_path_is_dummy_uses_gradle_binary(self):
         gradle = SubprocessGradle(gradle_binary=self.gradle_binary, os_utils=self.os_utils)
         gradle.build(self.source_dir, self.manifest_path)
         self.os_utils.popen.assert_called_with(
-            [self.gradle_path, "build", "--build-file", self.manifest_path],
+            [self.gradle_path, "build"],
             cwd=self.source_dir,
             stderr=subprocess.PIPE,
             stdout=subprocess.PIPE,
@@ -80,7 +80,7 @@ def test_build_with_init_script(self):
         gradle = SubprocessGradle(gradle_binary=self.gradle_binary, os_utils=self.os_utils)
         gradle.build(self.source_dir, self.manifest_path, init_script_path=self.init_script)
         self.os_utils.popen.assert_called_with(
-            [self.gradle_path, "build", "--build-file", self.manifest_path, "--init-script", self.init_script],
+            [self.gradle_path, "build", "--init-script", self.init_script],
             cwd=self.source_dir,
             stderr=subprocess.PIPE,
             stdout=subprocess.PIPE,
@@ -101,8 +101,6 @@ def test_includes_build_properties_in_command(self):
             [
                 self.gradle_path,
                 "build",
-                "--build-file",
-                self.manifest_path,
                 "-Dfoo=bar",
                 "--init-script",
                 self.init_script,