Merge branch 'master' into fix-optional-primitive-decoder

Author: vyazelenko

.github/workflows/ci.yml

@@ -124,41 +124,6 @@ jobs:
       - name: Pack
         run: ./csharp/pack.sh
 
-  cpp-gcc-2004-build:
-    name: C++ GCC ${{ matrix.version }} (Ubuntu 20.04)
-    runs-on: ubuntu-20.04
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      matrix:
-        version: [ '6', '7', '8', '9', '10' ]
-    env:
-      CC: gcc-${{ matrix.version }}
-      CXX: g++-${{ matrix.version }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.sha }}
-      - name: Install compiler
-        run: |
-          sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu/ bionic main universe"
-          sudo apt-get install -y g++-${{ matrix.version }} libsparsehash-dev libidn11
-      - name: Setup java to run Gradle script
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: ${{ env.JAVA_VERSION }}
-      - name: Setup BUILD_JAVA_HOME & BUILD_JAVA_VERSION
-        run: |
-          java -Xinternalversion
-          echo "BUILD_JAVA_HOME=${JAVA_HOME}" >> $GITHUB_ENV
-          echo "BUILD_JAVA_VERSION=${{ env.JAVA_VERSION }}" >> $GITHUB_ENV
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
-      - name: Build
-        run: ./cppbuild/cppbuild
-
   cpp-gcc-2404-build:
     name: C++ GCC ${{ matrix.version }} (Ubuntu 24.04)
     runs-on: ubuntu-24.04
@@ -195,52 +160,14 @@ jobs:
       - name: Build
         run: ./cppbuild/cppbuild
 
-  cpp-clang-2004-build:
-    name: C++ Clang ${{ matrix.version }} (Ubuntu 20.04)
-    runs-on: ubuntu-20.04
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      matrix:
-        version: [ '9', '10', '11', '12' ]
-    env:
-      CC: clang-${{ matrix.version }}
-      CXX: clang++-${{ matrix.version }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.sha }}
-      - name: Install compiler
-        run: |
-          sudo mkdir -p /etc/apt/keyrings/
-          curl https://apt.llvm.org/llvm-snapshot.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/llvm-snapshot.gpg
-          echo "deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg] http://apt.llvm.org/focal/ llvm-toolchain-focal-${{ matrix.version }} main" | sudo tee /etc/apt/sources.list.d/llvm.list
-          sudo apt-get update
-          sudo apt-get install -y clang-${{ matrix.version }} libsparsehash-dev libidn11
-      - name: Setup java to run Gradle script
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: ${{ env.JAVA_VERSION }}
-      - name: Setup BUILD_JAVA_HOME & BUILD_JAVA_VERSION
-        run: |
-          java -Xinternalversion
-          echo "BUILD_JAVA_HOME=${JAVA_HOME}" >> $GITHUB_ENV
-          echo "BUILD_JAVA_VERSION=${{ env.JAVA_VERSION }}" >> $GITHUB_ENV
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
-      - name: Build
-        run: ./cppbuild/cppbuild
-
   cpp-clang-2404-build:
     name: C++ Clang ${{ matrix.version }} (Ubuntu 24.04)
     runs-on: ubuntu-24.04
     timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
-        version: [ '13', '14', '15', '16', '17', '18' ]
+        version: [ '13', '14', '15', '16', '17', '18', '19', '20' ]
     env:
       CC: clang-${{ matrix.version }}
       CXX: clang++-${{ matrix.version }}
@@ -371,7 +298,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [ '1.22.x' ]
+        version: [ '1.23.x', '1.24.x' ]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

.github/workflows/release.yml

@@ -57,9 +57,9 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Publish with Gradle
-        run: ./gradlew publish
+        run: ./gradlew publish uploadArtifactsToCentralPortal
         env:
-          ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.SONATYPE_CENTRAL_USERNAME }}
-          ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.SONATYPE_CENTRAL_PASSWORD }}
-          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_RSA_SIGN_KEY }}
-          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_RSA_SIGN_KEYPASS }}
+          SIGNING_GPG_SECRET_KEY: ${{ secrets.GPG_RSA_SIGN_KEY }}
+          SIGNING_GPG_PASSWORD: ${{ secrets.GPG_RSA_SIGN_KEYPASS }}
+          SONATYPE_CENTRAL_PORTAL_USERNAME: ${{ secrets.SONATYPE_CENTRAL_PORTAL_USERNAME }}
+          SONATYPE_CENTRAL_PORTAL_PASSWORD: ${{ secrets.SONATYPE_CENTRAL_PORTAL_PASSWORD }}

.gitignore

@@ -19,14 +19,16 @@
 build-local.properties
 deps
 */bin
-build
-.gradle
-target
+build/
+!buildSrc/
+!buildSrc/src/**/build
+.gradle/
+target/
 GTAGS
 GRTAGS
 GPATH
 prop
-out
+out/
 .vs/
 .vscode
 

CHANGELOG.md

@@ -0,0 +1,88 @@
+# Changelog
+
+## [1.35.3] - 2025-06-06
+### Changed
+* **Java:** Publish release artifacts to Central Portal using OSSRH Staging API service.
+* **Java:** Bump `Agrona` to 2.2.2.
+* **Java:** Bump `Checkstyle` to 10.25.0.
+* **Java:** Bump `Gradle` to 8.14.2.
+
+## [1.35.1] - 2025-06-02
+### Changed
+* Bump `Agrona` to 2.2.1.
+* Bump `JUnit` to 5.13.0.
+
+## [1.35.0] - 2025-05-26
+### Changed
+* Update `Implementation-Vendor`.
+* **Rust:** Elide explicit ActingVersion lifetime. ([#1053](https://github.com/aeron-io/simple-binary-encoding/pull/1053))
+* **CI:** Use `gradle/actions/setup-gradle` action for caching Gradle dependencies.
+* **CI:** Enable JDK 24 GA build.
+* **CI:** Simplify error log upload.
+* **CI:**  Remove Ubuntu 20.04 based builds.
+* **CI:** Bump Go build to use 1.23.x and 1.24.x.
+* Bump `Agrona` to 2.2.0.
+* Bump `Gradle` to 8.14.1.
+* Bump `Checkstyle` to 10.24.0.
+* Bump `json` to 20250517.
+* Bump `JUnit` to 5.12.2.
+* Bump `Mockito` to 5.18.0.
+* Bump `Shadow` to 8.3.6.
+* Bump `Versions` to 0.52.
+
+### Fixed
+* **Java:** include field 'deprecated' in ir encoding and decoding.
+* **Java:** Adjust Java DTO Choice Set Access. ([#1064](https://github.com/aeron-io/simple-binary-encoding/issues/1064))
+* **Rust:** get proper version for composite types. ([#1058](https://github.com/aeron-io/simple-binary-encoding/pull/1058))
+* **C#:** Read NuGet package version from version file ([#1061](https://github.com/aeron-io/simple-binary-encoding/pull/1061))
+* **C#:** Enable dual build for netstandard2.0 & netstandard2.1. ([#1062](https://github.com/aeron-io/simple-binary-encoding/pull/1062))
+
+## [1.34.1] - 2025-01-13
+### Changed
+* Bump `json` to 20250107.
+* Bump `Mockito` to 5.15.2.
+
+### Added
+* **Doc:** Add `--add-opens java.base/jdk.internal.misc=ALL-UNNAMED` to the example execution.
+* **Rust:** encoding primitive arrays now supports slice instead of array (issue [#1021](https://github.com/aeron-io/simple-binary-encoding/issues/)). ([#1040](https://github.com/aeron-io/simple-binary-encoding/pull/1040))
+
+### Fixed
+* **C++:** check for not wrapped state in `decodeLength()` when precedence checks are enabled. ([#1046](https://github.com/aeron-io/simple-binary-encoding/pull/1046))
+* **C++:** use `m_actingBlockLength` in `decodeLength()`. ([#1045](https://github.com/aeron-io/simple-binary-encoding/pull/1045))
+
+## [1.34.0] - 2024-12-17
+### Changed
+* **C++:** hide the m_codecStatePtr behind ifdefs to avoid overhead when precedence checking is disabled. ([#1036](https://github.com/aeron-io/simple-binary-encoding/pull/1036))
+* **C++:** use constexpr to define precedence checks lookup tables.
+* **Rust:** Enhance enum supporting fromstr and display and into. ([#1020](https://github.com/aeron-io/simple-binary-encoding/pull/1020))
+* **Rust:** codegen of primitive enums now implement 'From' instead of 'Into'. ([#1029](https://github.com/aeron-io/simple-binary-encoding/pull/1029))
+* **Java:** Update Checkstyle rules and apply them.
+* **Breaking:** Bump `Agrona` to 2.0.0.
+  _**Note:** `--add-opens java.base/jdk.internal.misc=ALL-UNNAMED` JVM option must be specified in order to generate codecs or use the generated Java classes. For example:_
+  ```shell
+  $ java --add-opens java.base/jdk.internal.misc=ALL-UNNAMED -Dsbe.generate.ir=true -Dsbe.target.language=Cpp -Dsbe.target.namespace=sbe -Dsbe.output.dir=include/gen -Dsbe.errorLog=yes -jar sbe-all/build/libs/sbe-all-${SBE_TOOL_VERSION}.jar my-sbe-messages.xml
+  ```
+* Bump `Gradle` to 8.11.1.
+* Bump `Checkstyle` to 10.21.0.
+* Bump `ByteBuddy` to 1.15.11.
+* Bump `JUnit` to 5.11.4.
+* Bump `jqwik` to 1.9.2.
+
+### Added
+* **C++:** Integrate std::span support for flyweight API. ([#1038](https://github.com/aeron-io/simple-binary-encoding/pull/1038), [#1027](https://github.com/aeron-io/simple-binary-encoding/pull/1027))
+* **Rust:** generate message schema level info in lib.rs. ([#1019](https://github.com/aeron-io/simple-binary-encoding/pull/1019))
+
+### Fixed
+* **C++:** Fix field precedence check issue [#1031](https://github.com/aeron-io/simple-binary-encoding/issues/1031). ([#1033](https://github.com/aeron-io/simple-binary-encoding/pull/1033))
+* **C++:** respect the package override option for C++ codecs and DTOs. ([#1024](https://github.com/aeron-io/simple-binary-encoding/pull/1024))
+* **C#:** respect the package override option for C# codecs and DTOs. ([#1024](https://github.com/aeron-io/simple-binary-encoding/pull/1024))
+* **Go:** Fix warning about used args in GolangFlyweightGenerator.
+* **Rust:** Updated code generator to resolve Issue [#1028](https://github.com/aeron-io/simple-binary-encoding/issues/1028). ([#1037](https://github.com/aeron-io/simple-binary-encoding/pull/1037))
+* **Java:** Prevent collision when field name is 'value'.
+* **Java:** Preserve byte order throughout IR transformations.
+
+[1.35.3]: https://github.com/aeron-io/simple-binary-encoding/releases/tag/1.35.3
+[1.35.1]: https://github.com/aeron-io/simple-binary-encoding/releases/tag/1.35.1
+[1.35.0]: https://github.com/aeron-io/simple-binary-encoding/releases/tag/1.35.0
+[1.34.1]: https://github.com/aeron-io/simple-binary-encoding/releases/tag/1.34.1
+[1.34.0]: https://github.com/aeron-io/simple-binary-encoding/releases/tag/1.34.0

build.gradle

@@ -53,26 +53,30 @@ def toolchainLauncher = javaToolchains.launcherFor {
 def sbeGroup = 'uk.co.real-logic'
 def sbeVersion = file('version.txt').text.trim()
 
-ext {
-    isReleaseVersion = !sbeVersion.endsWith('-SNAPSHOT')
-    releasesRepoUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
-    snapshotsRepoUrl = 'https://oss.sonatype.org/content/repositories/snapshots/'
-
-    if (!project.hasProperty('ossrhUsername')) {
-        ossrhUsername = ''
+def getConfigProperty(final String projectPropertyName, final String envVarName) {
+    String value = project.findProperty(projectPropertyName)
+    if (!value) {
+        value = System.getenv(envVarName)
+        if (!value) {
+            return null
+        }
     }
 
-    if (!project.hasProperty('ossrhPassword')) {
-        ossrhPassword = ''
-    }
+    value = value.trim()
 
-    if (!project.hasProperty('signingKey')) {
-        signingKey = null
-    }
+    return value ? value : null
+}
 
-    if (!project.hasProperty('signingPassword')) {
-        signingPassword = null
-    }
+ext {
+    isReleaseVersion = !sbeVersion.endsWith('-SNAPSHOT')
+
+    sonatypeCentralPortalReleasesRepoUrl = 'https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/'
+    sonatypeCentralPortalSnapshotsRepoUrl = 'https://central.sonatype.com/repository/maven-snapshots/'
+    sonatypeCentralPortalUsername = getConfigProperty('sonatypeCentralPortalUsername', 'SONATYPE_CENTRAL_PORTAL_USERNAME')
+    sonatypeCentralPortalPassword = getConfigProperty('sonatypeCentralPortalPassword', 'SONATYPE_CENTRAL_PORTAL_PASSWORD')
+
+    signingKey = getConfigProperty('signingKey', 'SIGNING_GPG_SECRET_KEY')         // NOTE: ASCII armored secret key
+    signingPassword = getConfigProperty('signingPassword', 'SIGNING_GPG_PASSWORD') // NOTE: Plain text
 }
 
 def projectPom = {
@@ -172,15 +176,15 @@ subprojects {
     group = sbeGroup
     version = sbeVersion
 
+    checkstyle.toolVersion = libs.versions.checkstyle.get()
+
     java {
         toolchain {
             languageVersion = JavaLanguageVersion.of(buildJavaVersion)
         }
         sourceCompatibility = JavaVersion.VERSION_17
     }
 
-    checkstyle.toolVersion = libs.versions.checkstyle.get()
-
     tasks.withType(Sign).configureEach {
         onlyIf {
             isReleaseVersion && gradle.taskGraph.hasTask(tasks.publish)
@@ -389,10 +393,10 @@ project(':sbe-tool') {
 
         repositories {
             maven {
-                url = !isReleaseVersion ? snapshotsRepoUrl : releasesRepoUrl
+                url = !isReleaseVersion ? sonatypeCentralPortalSnapshotsRepoUrl : sonatypeCentralPortalReleasesRepoUrl
                 credentials {
-                    username = ossrhUsername
-                    password = ossrhPassword
+                    username = sonatypeCentralPortalUsername
+                    password = sonatypeCentralPortalPassword
                 }
             }
         }
@@ -459,10 +463,10 @@ project(':sbe-all') {
         }
         repositories {
             maven {
-                url = !isReleaseVersion ? snapshotsRepoUrl : releasesRepoUrl
+                url = !isReleaseVersion ? sonatypeCentralPortalSnapshotsRepoUrl : sonatypeCentralPortalReleasesRepoUrl
                 credentials {
-                    username = ossrhUsername
-                    password = ossrhPassword
+                    username = sonatypeCentralPortalUsername
+                    password = sonatypeCentralPortalPassword
                 }
             }
         }
@@ -579,10 +583,10 @@ project(':sbe-samples') {
 
         repositories {
             maven {
-                url = !isReleaseVersion ? snapshotsRepoUrl : releasesRepoUrl
+                url = !isReleaseVersion ? sonatypeCentralPortalSnapshotsRepoUrl : sonatypeCentralPortalReleasesRepoUrl
                 credentials {
-                    username = ossrhUsername
-                    password = ossrhPassword
+                    username = sonatypeCentralPortalUsername
+                    password = sonatypeCentralPortalPassword
                 }
             }
         }
@@ -672,6 +676,7 @@ tasks.register('generateRustTestCodecs', JavaExec) {
             'sbe-tool/src/test/resources/issue984.xml',
             'sbe-tool/src/test/resources/issue987.xml',
             'sbe-tool/src/test/resources/issue1028.xml',
+            'sbe-tool/src/test/resources/issue1057.xml',
             'sbe-tool/src/test/resources/issue1066.xml',
             'sbe-tool/src/test/resources/fixed-sized-primitive-array-types.xml',
             'sbe-tool/src/test/resources/example-bigendian-test-schema.xml',
@@ -1115,8 +1120,14 @@ tasks.named('dependencyUpdates').configure {
     }
 }
 
+tasks.register('uploadArtifactsToCentralPortal', uk.co.real_logic.sbe.build.SonatypeCentralPortalUploadRepositoryTask) {
+    portalUsername.set(sonatypeCentralPortalUsername)
+    portalPassword.set(sonatypeCentralPortalPassword)
+    groupId.set(sbeGroup)
+    snapshotRelease.set(!isReleaseVersion)
+}
+
 wrapper {
-    gradleVersion = libs.versions.gradle.get()
     distributionType = 'ALL'
 }
 

buildSrc/build.gradle

@@ -0,0 +1,19 @@
+repositories {
+    mavenCentral()
+}
+
+configurations.configureEach {
+    resolutionStrategy {
+        failOnVersionConflict()
+    }
+}
+
+dependencies {
+    implementation libs.json
+}
+
+tasks.withType(JavaCompile).configureEach {
+    configure(options) {
+        options.compilerArgs << '-Xlint:deprecation' << '-Xlint:unchecked' // examples
+    }
+}

buildSrc/settings.gradle

@@ -0,0 +1,7 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}