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.1.0",
version = "1.2.0",
)

# Platforms (needed for platform-specific build configurations)
Expand Down
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,30 +132,30 @@ Maven:
<dependency>
<groupId>org.apache.fory</groupId>
<artifactId>fory-core</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
</dependency>
```

Gradle:

```gradle
implementation "org.apache.fory:fory-core:1.0.0"
implementation "org.apache.fory:fory-core:1.1.0"
```

**Scala**

sbt:

```scala
libraryDependencies += "org.apache.fory" %% "fory-scala" % "1.0.0"
libraryDependencies += "org.apache.fory" %% "fory-scala" % "1.1.0"
```

**Kotlin**

Gradle:

```kotlin
implementation("org.apache.fory:fory-kotlin:1.0.0")
implementation("org.apache.fory:fory-kotlin:1.1.0")
```

Maven:
Expand All @@ -164,7 +164,7 @@ Maven:
<dependency>
<groupId>org.apache.fory</groupId>
<artifactId>fory-kotlin</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
</dependency>
```

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

```toml
[dependencies]
fory = "1.0.0"
fory = "1.1.0"
```

**C++**
Expand All @@ -198,7 +198,7 @@ include(FetchContent)
FetchContent_Declare(
fory
GIT_REPOSITORY https://github.com/apache/fory.git
GIT_TAG v1.0.0
GIT_TAG v1.1.0
SOURCE_SUBDIR cpp
)
FetchContent_MakeAvailable(fory)
Expand All @@ -209,8 +209,8 @@ Bazel:

```bazel
# MODULE.bazel
bazel_dep(name = "fory", version = "1.0.0")
git_override(module_name = "fory", remote = "https://github.com/apache/fory.git", commit = "v1.0.0")
bazel_dep(name = "fory", version = "1.1.0")
git_override(module_name = "fory", remote = "https://github.com/apache/fory.git", commit = "v1.1.0")

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

```bash
dotnet add package Apache.Fory --version 1.0.0
dotnet add package Apache.Fory --version 1.1.0
```

**Dart**

```bash
dart pub add fory:^1.0.0
dart pub add fory:^1.1.0
dart pub add dev:build_runner
```

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

```swift
dependencies: [
.package(url: "https://github.com/apache/fory.git", exact: "1.0.0")
.package(url: "https://github.com/apache/fory.git", exact: "1.1.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.1.0
VERSION 1.2.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.24.0

require (
github.com/apache/fory/go/fory v1.1.0-alpha.0
github.com/apache/fory/go/fory v1.2.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.1.0-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
</parent>

<artifactId>benchmark</artifactId>
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.1.0-alpha.0"
version = "1.2.0-alpha.0"
edition = "2021"

[[bin]]
Expand Down
49 changes: 47 additions & 2 deletions ci/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,12 @@ def bump_version(**kwargs):
_normalize_js_version(new_version),
_update_js_version,
)
_bump_version(
"integration_tests/idl_tests/javascript",
"package.json",
_normalize_js_version(new_version),
_update_js_version,
)
elif lang == "cpp":
bump_cpp_version(new_version)
elif lang == "go":
Expand Down Expand Up @@ -213,13 +219,13 @@ def bump_java_version(new_version):
new_version = _normalize_java_version(new_version)
for p in [
"integration_tests/graalvm_tests",
"integration_tests/grpc_tests/java",
"integration_tests/jdk_compatibility_tests",
"integration_tests/jpms_tests",
"integration_tests/idl_tests/java",
"benchmarks/java",
"java/fory-core",
"java/fory-format",
"java/fory-simd",
"java/fory-extensions",
"java/fory-graalvm-feature",
"java/fory-test-core",
Expand Down Expand Up @@ -253,6 +259,12 @@ def bump_python_version(new_version):
new_version,
_update_pyproject_version,
)
_bump_version(
"integration_tests/grpc_tests/python",
"pyproject.toml",
new_version,
_update_pyproject_version,
)


def bump_rust_version(new_version):
Expand All @@ -278,6 +290,7 @@ def bump_kotlin_version(new_version):
"kotlin/fory-kotlin",
"kotlin/fory-kotlin-ksp",
"kotlin/fory-kotlin-tests",
"integration_tests/idl_tests/kotlin",
]:
_bump_version(p, "pom.xml", new_version, _update_pom_parent_version)

Expand All @@ -289,6 +302,7 @@ def bump_cpp_version(new_version):
"integration_tests/idl_tests/cpp",
]:
_bump_version(p, "CMakeLists.txt", new_version, _update_cmake_project_version)
_bump_version("", "MODULE.bazel", new_version, _update_bazel_module_version)


def bump_go_version(new_version):
Expand All @@ -297,13 +311,15 @@ def bump_go_version(new_version):
"integration_tests/idl_tests/go",
]:
_bump_version(p, "go.mod", new_version, _update_go_mod_version)
_bump_version("go/fory/cmd/fory", "main.go", new_version, _update_go_cli_version)


def bump_dart_version(new_version):
for p in [
"dart",
"dart/packages/fory",
"dart/packages/fory-test",
"integration_tests/idl_tests/dart",
]:
_bump_version(p, "pubspec.yaml", new_version, _update_pubspec_version)
_bump_version(
Expand Down Expand Up @@ -503,6 +519,24 @@ def _update_cmake_project_version(lines, v: str):
return lines


def _update_bazel_module_version(lines, v: str):
bazel_version = _normalize_cmake_version(v)
in_module = False
for index, line in enumerate(lines):
if re.search(r"^\s*module\(", line):
in_module = True
if in_module and re.search(r"^\s*version\s*=", line):
lines[index] = re.sub(
r'(version\s*=\s*")[^"]+(")',
r"\g<1>" + bazel_version + r"\2",
line,
)
return lines
if in_module and ")" in line:
in_module = False
raise ValueError("No MODULE.bazel module version found")


def _update_go_mod_version(lines, v: str):
go_version = _normalize_go_version(v)
for index, line in enumerate(lines):
Expand All @@ -516,12 +550,23 @@ def _update_go_mod_version(lines, v: str):
return lines


def _update_go_cli_version(lines, v: str):
v = v.strip()
if v.startswith("v"):
v = v[1:]
for index, line in enumerate(lines):
if line.startswith("const version = "):
lines[index] = f'const version = "{v}"\n'
return lines
raise ValueError("No Go CLI version constant found")


def _update_pubspec_version(lines, v: str):
for index, line in enumerate(lines):
if re.match(r"^version\s*:", line):
lines[index] = f"version: {v}\n"
continue
if re.match(r"^\s*fory\s*:", line):
if re.match(r"^\s*fory\s*:\s+\S+", line):
prefix = re.match(r"^(\s*fory\s*:)\s*.*", line)
if prefix:
lines[index] = f"{prefix.group(1)} {v}\n"
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.1.0.dev0"
__version__ = "1.2.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 @@ -21,7 +21,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "fory-compiler"
version = "1.1.0.dev0"
version = "1.2.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.1.0
VERSION 1.2.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.1.0-dev</Version>
<Version>1.2.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 runtime

```xml
<ItemGroup>
<PackageReference Include="Apache.Fory" Version="1.0.0" />
<PackageReference Include="Apache.Fory" Version="1.1.0" />
</ItemGroup>
```

Expand Down
8 changes: 8 additions & 0 deletions dart/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## 1.2.0-dev

- Start the next Dart workspace development cycle after the 1.1.0 release.

## 1.1.0

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

## 1.0.0

- Initial version.
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.1.0-dev
version: 1.2.0-dev

resolution: workspace

environment:
sdk: ^3.7.0

dependencies:
fory: 1.1.0-dev
fory: 1.2.0-dev

dev_dependencies:
build_runner: '>=2.7.0 <3.0.0'
Expand Down
6 changes: 5 additions & 1 deletion dart/packages/fory/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
## 1.1.0-dev
## 1.2.0-dev

- Start the next development cycle after the 1.1.0 release.

## 1.1.0

- Refresh pub.dev package metadata and documentation links.
- Update code generation dependencies for current stable Dart tooling.
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 @@ -23,7 +23,7 @@ Add `fory` to your package dependencies.

```yaml
dependencies:
fory: ^1.0.0
fory: ^1.1.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 type support.
version: 1.1.0-dev
version: 1.2.0-dev
homepage: https://github.com/apache/fory
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.1.0-dev
version: 1.2.0-dev
# repository: https://github.com/my_org/my_repo

environment:
sdk: ^3.7.0

# Add regular dependencies here.
dependencies:
fory: 1.1.0-dev
fory: 1.2.0-dev
build_runner: '>=2.7.0 <3.0.0'
dev_dependencies:
lints: ^6.1.0
Expand Down
Loading
Loading