Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions .github/workflows/asf-allowlist.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

name: ASF GitHub Actions Allowlist

on:
push:
pull_request:

permissions:
contents: read

jobs:
asf-allowlist-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
with:
persist-credentials: false
- name: Check ASF GitHub Actions allowlist
uses: apache/infrastructure-actions/allowlist-check@bddab88ea4e4874c2c159c18f3017b51ec278d03
with:
scan-glob: ".github/**/*.y*ml"
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@ jobs:
with:
java-version: 11
distribution: "temurin"
- uses: sbt/setup-sbt@2e222825582620cc38d2a54e674f3c01b7c14f5d # v1.1.24
- uses: sbt/setup-sbt@9d56cf12e9b58d219605e1d8bfe69a8395fedde0 # v1.5.1
with:
disk-cache: false
- name: Install fory java
Expand All @@ -695,7 +695,7 @@ jobs:
uses: actions/setup-python@v5
with:
python-version: 3.11
- uses: sbt/setup-sbt@2e222825582620cc38d2a54e674f3c01b7c14f5d # v1.1.24
- uses: sbt/setup-sbt@9d56cf12e9b58d219605e1d8bfe69a8395fedde0 # v1.5.1
with:
disk-cache: false
- name: Run Scala Xlang Test
Expand Down Expand Up @@ -723,7 +723,7 @@ jobs:
uses: actions/setup-python@v5
with:
python-version: 3.11
- uses: sbt/setup-sbt@2e222825582620cc38d2a54e674f3c01b7c14f5d # v1.1.24
- uses: sbt/setup-sbt@9d56cf12e9b58d219605e1d8bfe69a8395fedde0 # v1.5.1
with:
disk-cache: false
- name: Install Fory Java
Expand Down Expand Up @@ -940,7 +940,7 @@ jobs:
python-version: 3.11
cache: "pip"
- name: Set up Dart
uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c # v1.7.1
uses: dart-lang/setup-dart@65eb853c7ba17dde3be364c3d2858773e7144260 # v1.7.2
with:
sdk: stable
- name: Cache Maven local repository
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-dart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ run-name: "Dart Release: ${{ github.ref_name }}"

on:
push:
tags: ['v*']
tags: ["v*"]

permissions:
contents: read
Expand All @@ -45,8 +45,8 @@ jobs:

- uses: actions/setup-python@v6
with:
python-version: '3.11'
cache: 'pip'
python-version: "3.11"
cache: "pip"

- name: Bump Dart package versions for the release tag
shell: bash
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
puts "Verified bumped Dart package versions for #{expected}"
RUBY

- uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c # v1.7.1
- uses: dart-lang/setup-dart@65eb853c7ba17dde3be364c3d2858773e7144260 # v1.7.2

- name: Install Dart package dependencies
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-rust.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ run-name: "Rust Release: ${{ github.ref_name }}"

on:
push:
tags: ['v*']
tags: ["v*"]

permissions:
contents: read
Expand All @@ -36,7 +36,7 @@ jobs:
steps:
- uses: actions/checkout@v5

- uses: dtolnay/rust-toolchain@4be7066ada62dd38de10e7b70166bc74ed198c30 # stable
- uses: dtolnay/rust-toolchain@4cda84d5c5c54efe2404f9d843567869ab1699d4 # stable

- name: Bump rust version
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

module(
name = "fory",
version = "1.4.0",
version = "1.5.0",
)

# Platforms (needed for platform-specific build configurations)
Expand Down
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[![Slack Channel](https://img.shields.io/badge/slack-join-3f0e40?logo=slack&style=for-the-badge)](https://join.slack.com/t/fory-project/shared_invite/zt-36g0qouzm-kcQSvV_dtfbtBKHRwT5gsw)
[![X](https://img.shields.io/badge/@ApacheFory-follow-blue?logo=x&style=for-the-badge)](https://x.com/ApacheFory)
[![Maven Version](https://img.shields.io/maven-central/v/org.apache.fory/fory-core?style=for-the-badge)](https://search.maven.org/#search|gav|1|g:"org.apache.fory"%20AND%20a:"fory-core")
[![Crates.io](https://img.shields.io/badge/crates.io-v1.3.0-blue?logo=rust&style=for-the-badge)](https://crates.io/crates/fory)
[![Crates.io](https://img.shields.io/badge/crates.io-v1.4.0-blue?logo=rust&style=for-the-badge)](https://crates.io/crates/fory)
[![PyPI](https://img.shields.io/pypi/v/pyfory.svg?logo=PyPI&style=for-the-badge)](https://pypi.org/project/pyfory/)
[![npm](https://img.shields.io/npm/v/%40apache-fory%2Fcore?logo=npm&style=for-the-badge)](https://www.npmjs.com/package/@apache-fory/core)
[![NuGet](https://img.shields.io/nuget/v/Apache.Fory?logo=nuget&style=for-the-badge)](https://www.nuget.org/packages/Apache.Fory)
Expand Down Expand Up @@ -132,14 +132,14 @@ Maven:
<dependency>
<groupId>org.apache.fory</groupId>
<artifactId>fory-core</artifactId>
<version>1.3.0</version>
<version>1.4.0</version>
</dependency>
```

Gradle:

```gradle
implementation "org.apache.fory:fory-core:1.3.0"
implementation "org.apache.fory:fory-core:1.4.0"
```

On JDK25+, open `java.lang.invoke` to Fory. Use `ALL-UNNAMED` when Fory is on
Expand All @@ -160,15 +160,15 @@ Use the Fory core module name when Fory is on the module path:
sbt:

```scala
libraryDependencies += "org.apache.fory" %% "fory-scala" % "1.3.0"
libraryDependencies += "org.apache.fory" %% "fory-scala" % "1.4.0"
```

**Kotlin**

Gradle:

```kotlin
implementation("org.apache.fory:fory-kotlin:1.3.0")
implementation("org.apache.fory:fory-kotlin:1.4.0")
```

Maven:
Expand All @@ -177,7 +177,7 @@ Maven:
<dependency>
<groupId>org.apache.fory</groupId>
<artifactId>fory-kotlin</artifactId>
<version>1.3.0</version>
<version>1.4.0</version>
</dependency>
```

Expand All @@ -199,7 +199,7 @@ pip install "pyfory[format]"

```toml
[dependencies]
fory = "1.3.0"
fory = "1.4.0"
```

**C++**
Expand All @@ -211,7 +211,7 @@ include(FetchContent)
FetchContent_Declare(
fory
GIT_REPOSITORY https://github.com/apache/fory.git
GIT_TAG v1.3.0
GIT_TAG v1.4.0
SOURCE_SUBDIR cpp
)
FetchContent_MakeAvailable(fory)
Expand All @@ -222,8 +222,8 @@ Bazel:

```bazel
# MODULE.bazel
bazel_dep(name = "fory", version = "1.3.0")
git_override(module_name = "fory", remote = "https://github.com/apache/fory.git", commit = "v1.3.0")
bazel_dep(name = "fory", version = "1.4.0")
git_override(module_name = "fory", remote = "https://github.com/apache/fory.git", commit = "v1.4.0")

# BUILD
deps = ["@fory//cpp/fory/serialization:fory_serialization"]
Expand Down Expand Up @@ -256,13 +256,13 @@ npm install @apache-fory/core @apache-fory/hps
**C#**

```bash
dotnet add package Apache.Fory --version 1.3.0
dotnet add package Apache.Fory --version 1.4.0
```

**Dart**

```bash
dart pub add fory:^1.3.0
dart pub add fory:^1.4.0
dart pub add dev:build_runner
```

Expand All @@ -272,7 +272,7 @@ Add Fory to `Package.swift`:

```swift
dependencies: [
.package(url: "https://github.com/apache/fory.git", exact: "1.3.0")
.package(url: "https://github.com/apache/fory.git", exact: "1.4.0")
],
targets: [
.target(
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ if(POLICY CMP0169)
endif()

project(fory_cpp_benchmark
VERSION 1.4.0
VERSION 1.5.0
DESCRIPTION "C++ Benchmark comparing Fory, Protobuf, and Msgpack serialization"
LANGUAGES CXX
)
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/go/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module github.com/apache/fory/benchmarks/go
go 1.25.0

require (
github.com/apache/fory/go/fory v1.4.0-alpha.0
github.com/apache/fory/go/fory v1.5.0-alpha.0
github.com/vmihailenco/msgpack/v5 v5.4.1
google.golang.org/protobuf v1.36.0
)
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<artifactId>fory-parent</artifactId>
<groupId>org.apache.fory</groupId>
<version>1.4.0-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
</parent>

<artifactId>benchmark</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/java25/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<groupId>org.apache.fory.benchmark</groupId>
<artifactId>java25-memory-access-benchmark</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

[package]
name = "fory-benchmarks"
version = "1.4.0-alpha.0"
version = "1.5.0-alpha.0"
edition = "2021"

[[bin]]
Expand Down
13 changes: 10 additions & 3 deletions ci/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
RELEASE_DOC_ROOTS = (
"README.md",
"java/README.md",
"java/fory-json/README.md",
"rust/README.md",
"scala/README.md",
"csharp/README.md",
Expand Down Expand Up @@ -531,7 +532,7 @@ def bump_version(**kwargs):
elif lang == "kotlin":
bump_kotlin_version(_normalize_java_version(new_version))
elif lang == "rust":
bump_rust_version(new_version)
bump_rust_version(new_version, kwargs.get("release_version"))
elif lang == "python":
bump_python_version(new_version)
elif lang == "javascript":
Expand Down Expand Up @@ -641,8 +642,9 @@ def bump_python_version(new_version):
)


def bump_rust_version(new_version):
def bump_rust_version(new_version, release_version=None):
rust_version = _normalize_rust_version(new_version)
release_version = _resolve_release_doc_version(new_version, release_version)
_bump_version("rust", "Cargo.toml", rust_version, _update_rust_version)
_bump_version(
"benchmarks/rust",
Expand All @@ -668,7 +670,12 @@ def bump_rust_version(new_version):
rust_version,
_update_cargo_lock_version,
)
_bump_version("rust/fory/src", "lib.rs", rust_version, _update_rust_doc_version)
_bump_version(
"rust/fory/src",
"lib.rs",
release_version or rust_version,
_update_rust_doc_version,
)


def bump_kotlin_version(new_version):
Expand Down
2 changes: 1 addition & 1 deletion compiler/fory_compiler/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

"""Fory IDL compiler for Apache Fory."""

__version__ = "1.4.0.dev0"
__version__ = "1.5.0.dev0"

from fory_compiler.ir.ast import Schema, Message, Enum, Field, EnumValue, Import
from fory_compiler.frontend.fdl import FDLFrontend
Expand Down
2 changes: 1 addition & 1 deletion compiler/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "fory-compiler"
version = "1.4.0.dev0"
version = "1.5.0.dev0"
description = "FDL (Fory Definition Language) compiler for Apache Fory cross-language serialization"
readme = "README.md"
license = {text = "Apache-2.0"}
Expand Down
2 changes: 1 addition & 1 deletion cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
cmake_minimum_required(VERSION 3.16)

project(fory
VERSION 1.4.0
VERSION 1.5.0
DESCRIPTION "Apache Fory - A blazingly fast multi-language serialization framework"
LANGUAGES CXX
)
Expand Down
2 changes: 1 addition & 1 deletion csharp/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Version>1.4.0-dev</Version>
<Version>1.5.0-dev</Version>
<Authors>Apache Software Foundation</Authors>
<Company>Apache Software Foundation</Company>
<Description>Apache Fory for .NET provides high-performance cross-language serialization with source-generated serializers and schema evolution support.</Description>
Expand Down
2 changes: 1 addition & 1 deletion csharp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ From NuGet, reference the single `Apache.Fory` package. It includes the Fory lib

```xml
<ItemGroup>
<PackageReference Include="Apache.Fory" Version="1.3.0" />
<PackageReference Include="Apache.Fory" Version="1.4.0" />
</ItemGroup>
```

Expand Down
8 changes: 6 additions & 2 deletions dart/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
## 1.4.0-dev
## 1.5.0-dev

- Start the next Dart workspace development cycle after the 1.3.0 release.
- Start the next Dart workspace development cycle after the 1.4.0 release.

## 1.4.0

- Align the Dart workspace version with the Apache Fory 1.4.0 release.

## 1.3.0

Expand Down
4 changes: 2 additions & 2 deletions dart/packages/fory-test/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@

name: fory_test
description: Apache Fory Dart consumer and integration tests
version: 1.4.0-dev
version: 1.5.0-dev

resolution: workspace

environment:
sdk: ^3.7.0

dependencies:
fory: 1.4.0-dev
fory: 1.5.0-dev

dev_dependencies:
build_runner: '>=2.7.0 <3.0.0'
Expand Down
Loading
Loading