From c2c19092d1576af018d2cce4c75c3a1973182fb4 Mon Sep 17 00:00:00 2001 From: Mudit Chaudhary Date: Thu, 13 Mar 2025 09:18:52 -0400 Subject: [PATCH 1/2] Adds Zig version validation for publishing task (#306) Signed-off-by: Mudit Chaudhary --- CedarJava/CHANGELOG.md | 4 ++++ CedarJava/build.gradle | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/CedarJava/CHANGELOG.md b/CedarJava/CHANGELOG.md index 216cf267..1d340bf4 100644 --- a/CedarJava/CHANGELOG.md +++ b/CedarJava/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 4.3.0 +### Added +* Added Zig version validation for publishing artifacts [#306](https://github.com/cedar-policy/cedar-java/pull/306) + ## 4.3.0 ### Added * Introduced new model classes for improved type safety and functionality: diff --git a/CedarJava/build.gradle b/CedarJava/build.gradle index 7a912b6f..3f7f3718 100644 --- a/CedarJava/build.gradle +++ b/CedarJava/build.gradle @@ -124,6 +124,26 @@ tasks.register('installCargoZigbuild', Exec) { commandLine 'cargo', '+' + RustVersion, 'install', 'cargo-zigbuild@0.19.7' } +def ZigVersion = '0.11' +tasks.register('validateZigVersion') { + group = 'Build' + description = 'Validates that the correct zig version is installed' + + doLast { + def output = new ByteArrayOutputStream() + exec { + commandLine 'zig', 'version' + standardOutput = output + } + def version = output.toString().trim() + println "Detected Zig version: ${version}" + if (!version.startsWith(ZigVersion)) { + throw new GradleException("Zig version must be ${ZigVersion} but found: ${version}") + } + println "Zig version validation successful" + } +} + tasks.register('compileFFI') { dependsOn('installCargoZigbuild') group 'Build' @@ -252,6 +272,7 @@ java { /* Configures Maven publishing */ +publish.dependsOn('validateZigVersion') publishing { publications { mavenJava(MavenPublication) { From 05f2478683b0a9f7ca34c155ada688789ddf8c84 Mon Sep 17 00:00:00 2001 From: Mudit Chaudhary Date: Thu, 13 Mar 2025 13:35:48 +0000 Subject: [PATCH 2/2] bumps version numbers for the patch release Signed-off-by: Mudit Chaudhary --- CedarJava/CHANGELOG.md | 2 +- CedarJava/build.gradle | 2 +- CedarJavaFFI/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CedarJava/CHANGELOG.md b/CedarJava/CHANGELOG.md index 1d340bf4..c513754a 100644 --- a/CedarJava/CHANGELOG.md +++ b/CedarJava/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 4.3.0 +## 4.3.1 ### Added * Added Zig version validation for publishing artifacts [#306](https://github.com/cedar-policy/cedar-java/pull/306) diff --git a/CedarJava/build.gradle b/CedarJava/build.gradle index 3f7f3718..d5fec35c 100644 --- a/CedarJava/build.gradle +++ b/CedarJava/build.gradle @@ -279,7 +279,7 @@ publishing { from components.java groupId = 'com.cedarpolicy' artifactId = 'cedar-java' - version = '4.3.0' + version = '4.3.1' artifacts { jar diff --git a/CedarJavaFFI/Cargo.toml b/CedarJavaFFI/Cargo.toml index f32d16e7..66fe807a 100644 --- a/CedarJavaFFI/Cargo.toml +++ b/CedarJavaFFI/Cargo.toml @@ -6,7 +6,7 @@ description = "Java FFI for Cedar (from the cedar-policy crate)." edition = "2021" -version = "4.3.0" +version = "4.3.1" [dependencies] serde = { version = "1.0", features = ["derive", "rc"] }