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
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.5.0",
version = "1.6.0",
)

# Platforms (needed for platform-specific build configurations)
Expand Down
30 changes: 15 additions & 15 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.4.0-blue?logo=rust&style=for-the-badge)](https://crates.io/crates/fory)
[![Crates.io](https://img.shields.io/badge/crates.io-v1.5.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 @@ -150,14 +150,14 @@ Maven:
<dependency>
<groupId>org.apache.fory</groupId>
<artifactId>fory-core</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
</dependency>
```

Gradle:

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

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

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

**Kotlin**

Gradle:

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

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

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

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

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

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

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

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

**Dart**

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

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

```swift
dependencies: [
.package(url: "https://github.com/apache/fory.git", exact: "1.4.0")
.package(url: "https://github.com/apache/fory.git", exact: "1.5.0")
],
targets: [
.target(
Expand Down Expand Up @@ -839,14 +839,14 @@ Add Fory JSON to your project:
<dependency>
<groupId>org.apache.fory</groupId>
<artifactId>fory-json</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
</dependency>
```

**Gradle**

```gradle
implementation "org.apache.fory:fory-json:1.4.0"
implementation "org.apache.fory:fory-json:1.5.0"
```

Keep all Fory modules in the same application on the same version.
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.5.0
VERSION 1.6.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.5.0-alpha.0
github.com/apache/fory/go/fory v1.6.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.5.0-SNAPSHOT</version>
<version>1.6.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.5.0-SNAPSHOT</version>
<version>1.6.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 @@ -20,5 +20,5 @@ members = ["local", "xlang"]
resolver = "2"

[workspace.package]
version = "1.5.0-alpha.0"
version = "1.6.0-alpha.0"
edition = "2021"
30 changes: 16 additions & 14 deletions ci/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -1049,6 +1049,8 @@ def _update_dart_changelog(lines, v: str, workspace=False):
start_index = -1
for index, line in enumerate(lines):
if heading_pattern.match(line):
if line == heading:
return lines
start_index = index
break
if start_index == -1:
Expand All @@ -1059,7 +1061,17 @@ def _update_dart_changelog(lines, v: str, workspace=False):
if re.match(r"^##\s+", lines[index]):
end_index = index
break
return lines[:start_index] + [heading] + body + lines[end_index:]
updated = list(lines)
updated[start_index] = heading
dev_cycle = re.compile(
r"^- Start the next (?:Dart workspace )?development cycle after "
r"the \S+ release\.\s*$"
)
for index in range(start_index + 1, end_index):
if dev_cycle.match(updated[index]):
updated[index] = body[1]
break
return updated


def _update_dart_dev_changelog(lines, v: str, release_version: str, workspace=False):
Expand All @@ -1079,20 +1091,10 @@ def _update_dart_dev_changelog(lines, v: str, release_version: str, workspace=Fa
f"- Start the next development cycle after the {release_version} release.\n",
"\n",
]
start_index = -1
for index, line in enumerate(lines):
for line in lines:
if line == heading:
start_index = index
break
if start_index == -1:
return [heading] + body + lines

end_index = len(lines)
for index in range(start_index + 1, len(lines)):
if re.match(r"^##\s+", lines[index]):
end_index = index
break
return lines[:start_index] + [heading] + body + lines[end_index:]
return lines
return [heading] + body + lines


def _update_csharp_props_version(lines, v: str):
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.5.0.dev0"
__version__ = "1.6.0.dev0"

from fory_compiler.frontend.fbs import FBSFrontend
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.5.0.dev0"
version = "1.6.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.5.0
VERSION 1.6.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.5.0-dev</Version>
<Version>1.6.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 @@ -32,7 +32,7 @@ From NuGet, reference the single `Apache.Fory` package. It includes the Fory lib

```xml
<ItemGroup>
<PackageReference Include="Apache.Fory" Version="1.4.0" />
<PackageReference Include="Apache.Fory" Version="1.5.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.5.0-dev
## 1.6.0-dev

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

## 1.5.0

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

## 1.4.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,7 +17,7 @@

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

resolution: workspace

Expand All @@ -26,7 +26,7 @@ environment:

dependencies:
external_type_test_models: 1.0.0
fory: 1.5.0-dev
fory: 1.6.0-dev
inheritance_test_models: 1.0.0

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

- Start the next development cycle after the 1.4.0 release.
- Start the next development cycle after the 1.5.0 release.

## 1.5.0

- Release Apache Fory Dart 1.5.0.
- Add generated external-type serialization with direct target construction
and existing registration, carrier, reference, and schema-evolution support.
- Replace `ForyField.skip` with `ForyField.ignore`, remove `skip` from container
Expand Down
2 changes: 1 addition & 1 deletion dart/packages/fory/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Add `fory` to your package dependencies.

```yaml
dependencies:
fory: ^1.4.0
fory: ^1.5.0

dev_dependencies:
build_runner: ^2.4.13
Expand Down
2 changes: 1 addition & 1 deletion dart/packages/fory/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

name: fory
description: Cross-language Apache Fory runtime for Dart with generated serializers, schema evolution, and custom serializer support.
version: 1.5.0-dev
version: 1.6.0-dev
homepage: https://fory.apache.org
repository: https://github.com/apache/fory/tree/main/dart/packages/fory
issue_tracker: https://github.com/apache/fory/issues
Expand Down
4 changes: 2 additions & 2 deletions dart/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@

name: fory_dart
description: Apache Fory Dart workspace for the runtime package, generated serializers, and integration tests.
version: 1.5.0-dev
version: 1.6.0-dev
# repository: https://github.com/my_org/my_repo

environment:
sdk: ^3.7.0

# Add regular dependencies here.
dependencies:
fory: 1.5.0-dev
fory: 1.6.0-dev
build_runner: ">=2.7.0 <3.0.0"
dev_dependencies:
lints: ^6.1.0
Expand Down
4 changes: 2 additions & 2 deletions docs/compiler/compiler-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ Add the Fory dependency to `pubspec.yaml`:

```yaml
dependencies:
fory: ^1.4.0
fory: ^1.5.0

dev_dependencies:
build_runner: ^2.4.0
Expand Down Expand Up @@ -911,5 +911,5 @@ fory = "x.y.z"

```yaml
dependencies:
fory: ^1.4.0
fory: ^1.5.0
```
8 changes: 4 additions & 4 deletions docs/guide/cpp/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ include(FetchContent)
FetchContent_Declare(
fory
GIT_REPOSITORY https://github.com/apache/fory.git
GIT_TAG v1.4.0
GIT_TAG v1.5.0
SOURCE_SUBDIR cpp
)
FetchContent_MakeAvailable(fory)
Expand Down Expand Up @@ -93,11 +93,11 @@ module(

bazel_dep(name = "rules_cc", version = "0.1.1")

bazel_dep(name = "fory", version = "1.4.0")
bazel_dep(name = "fory", version = "1.5.0")
git_override(
module_name = "fory",
remote = "https://github.com/apache/fory.git",
commit = "v1.4.0", # Or use a specific commit hash for reproducibility
commit = "v1.5.0", # Or use a specific commit hash for reproducibility
)
```

Expand Down Expand Up @@ -129,7 +129,7 @@ bazel run //:my_app
For local development, you can use `local_path_override` instead:

```bazel
bazel_dep(name = "fory", version = "1.4.0")
bazel_dep(name = "fory", version = "1.5.0")
local_path_override(
module_name = "fory",
path = "/path/to/fory",
Expand Down
Loading
Loading