Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
aws-sam-cli-bot committed Nov 27, 2024
2 parents 6cf9d2f + 2b6ca52 commit dd7ccf8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion aws_lambda_builders/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.52.0"
__version__ = "1.53.0"
RPC_PROTOCOL_VERSION = "0.3"
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,5 @@ def _get_jvm_string(self, gradle_path):

for line in stdout.splitlines():
l_dec = decode(line)
if "JVM" in l_dec:
if l_dec.startswith("JVM") or l_dec.startswith("Launcher JVM"):
return l_dec
10 changes: 8 additions & 2 deletions tests/unit/workflows/java_gradle/test_gradle_validator.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,14 @@ def test_emits_warning_when_gradle_excutable_fails(self):
validator.validate(runtime_path=self.runtime_path)
self.mock_log.warning.assert_called_with(GradleValidator.VERSION_STRING_WARNING, self.runtime_path)

def test_emits_warning_when_version_string_not_found(self):
version_string = "The Java Version: 9.0.0".encode()
@parameterized.expand(
[
"The Java Version: 9.0.0",
"Daemon JVM: /Library/Java/JavaVirtualMachines/amazon-corretto-21.jdk/Contents/Home (no JDK specified, using current Java home)",
]
)
def test_emits_warning_when_version_string_not_found(self, path):
version_string = path.encode()
self.mock_os_utils.popen.side_effect = [FakePopen(stdout=version_string, returncode=0)]
validator = GradleValidator(
runtime=self.runtime, architecture=self.architecture, os_utils=self.mock_os_utils, log=self.mock_log
Expand Down

0 comments on commit dd7ccf8

Please sign in to comment.