diff --git a/.github/workflows/alpha-version.yml b/.github/workflows/alpha-version.yml index cf870f9ed..af98a050e 100644 --- a/.github/workflows/alpha-version.yml +++ b/.github/workflows/alpha-version.yml @@ -21,6 +21,7 @@ jobs: level: 'alpha' ref: ${{ github.ref }} merge_changelog: false + toolchain: nightly-2023-10-15 secrets: CRATE_RELEASE_TOKEN: ${{ secrets.CRATE_RELEASE_TOKEN }} GITHUB_RELEASE_TOKEN: ${{ secrets.RIBIR_RELEASE }} \ No newline at end of file diff --git a/.github/workflows/new-dev-cycle.yml b/.github/workflows/new-dev-cycle.yml index b5c7d5b17..fdca6a6e3 100644 --- a/.github/workflows/new-dev-cycle.yml +++ b/.github/workflows/new-dev-cycle.yml @@ -20,6 +20,7 @@ jobs: level: 'beta' ref: ${{ github.ref }} merge_changelog: true + toolchain: nightly-2023-10-15 secrets: CRATE_RELEASE_TOKEN: ${{ secrets.CRATE_RELEASE_TOKEN }} GITHUB_RELEASE_TOKEN: ${{ secrets.RIBIR_RELEASE }} diff --git a/.github/workflows/patch-version.yml b/.github/workflows/patch-version.yml index 2e832b438..f26713748 100644 --- a/.github/workflows/patch-version.yml +++ b/.github/workflows/patch-version.yml @@ -44,6 +44,7 @@ jobs: level: ${{ needs.release_level.outputs.level }} ref: ${{ github.ref }} merge_changelog: ${{ needs.release_level.outputs.level == 'patch' }} + toolchain: nightly-2023-10-15 secrets: CRATE_RELEASE_TOKEN: ${{ secrets.CRATE_RELEASE_TOKEN }} GITHUB_RELEASE_TOKEN: ${{ secrets.RIBIR_RELEASE }} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index ef6f9b197..1325a7619 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Please only add new entries below the [Unreleased](#unreleased---releasedate) he ## [@Unreleased] - @ReleaseDate + + ## 0.1.0-alpha.0 - 2024-01-29 🎉🎉🎉 The first version of Ribir. @@ -63,6 +65,4 @@ We are very happy to share it with you. We hope you can try it out and give us f [lyon]: https://github.com/nical/lyon -[@Unreleased]: https://github.com/RibirX/Ribir/compare/ribir-v0.1.0-alpha.0...HEAD - - +[@Unreleased]: https://github.com/RibirX/Ribir/compare/ribir-v0.1.0-alpha.0...HEAD \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml index 0f53ce545..a9b821579 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,7 @@ homepage = "https://ribir.org" keywords = ["gui", "ui", "declarative", "compose-ui"] license = "MIT" readme = "README.md" -version = "0.1.0-alpha.0" +version = "0.1.0-beta.5" [workspace.dependencies] Inflector = "0.11.4" diff --git a/core/Cargo.toml b/core/Cargo.toml index 0d6e23d51..678d435ef 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -25,11 +25,11 @@ lyon_geom.workspace = true once_cell.workspace = true paste.workspace = true pin-project-lite.workspace = true -ribir_algo = {path = "../algo", version = "0.1.0-alpha.0" } -ribir_geom = {path = "../geom", version = "0.1.0-alpha.0" } -ribir_macros = {path = "../macros", version = "0.1.0-alpha.0" } -ribir_painter = {path = "../painter", version = "0.1.0-alpha.0" } -ribir_text = {path = "../text", version = "0.1.0-alpha.0" } +ribir_algo = {path = "../algo", version = "0.1.0-beta.5" } +ribir_geom = {path = "../geom", version = "0.1.0-beta.5" } +ribir_macros = {path = "../macros", version = "0.1.0-beta.5" } +ribir_painter = {path = "../painter", version = "0.1.0-beta.5" } +ribir_text = {path = "../text", version = "0.1.0-beta.5" } rxrust.workspace = true smallvec.workspace = true winit.workspace = true diff --git a/dev-helper/Cargo.toml b/dev-helper/Cargo.toml index d1d8dcbce..f1af40a11 100644 --- a/dev-helper/Cargo.toml +++ b/dev-helper/Cargo.toml @@ -16,11 +16,11 @@ version.workspace = true [dependencies] dssim-core.workspace = true futures.workspace = true -ribir_geom = {path = "../geom", version = "0.1.0-alpha.0" } -ribir_gpu = {path = "../gpu", version = "0.1.0-alpha.0" } -ribir_painter = {path = "../painter", features = ["png"], version = "0.1.0-alpha.0" } +ribir_geom = {path = "../geom", version = "0.1.0-beta.5" } +ribir_gpu = {path = "../gpu", version = "0.1.0-beta.5" } +ribir_painter = {path = "../painter", features = ["png"], version = "0.1.0-beta.5" } [dev-dependencies] colored.workspace = true paste.workspace = true -ribir_core = {path = "../core", version = "0.1.0-alpha.0" } +ribir_core = {path = "../core", version = "0.1.0-beta.5" } diff --git a/docs/en/get_started/try_it.md b/docs/en/get_started/try_it.md index 9ffa43389..acd55c7fe 100644 --- a/docs/en/get_started/try_it.md +++ b/docs/en/get_started/try_it.md @@ -30,7 +30,7 @@ Next, edit the `Cargo.toml` file and add Ribir as a dependency: ```toml [dependencies] -ribir = "0.1.0-alpha.0" +ribir = "@RIBIR_VERSION" ``` Or you can directly run `cargo add --git "https://github.com/RibirX/Ribir" ribir` to let Cargo add the latest Ribir version that is under development for you. diff --git a/docs/zh/get_started/try_it.md b/docs/zh/get_started/try_it.md index 080d395ed..c0580e9e8 100644 --- a/docs/zh/get_started/try_it.md +++ b/docs/zh/get_started/try_it.md @@ -32,7 +32,7 @@ cd ribir-hello-world ```toml [dependencies] -ribir = "0.1.0-alpha.0" +ribir = "@RIBIR_VERSION" ``` 或者直接运行 `cargo add --git "https://github.com/RibirX/Ribir" ribir` 让 Cargo 为你添加正在开发中的最新 Ribir 版本. diff --git a/gpu/Cargo.toml b/gpu/Cargo.toml index 800f83220..f195bd187 100644 --- a/gpu/Cargo.toml +++ b/gpu/Cargo.toml @@ -18,9 +18,9 @@ futures = {workspace = true, optional = true} guillotiere.workspace = true log.workspace = true rayon.workspace = true -ribir_algo = {path = "../algo", version = "0.1.0-alpha.0" } -ribir_geom = {path = "../geom", version = "0.1.0-alpha.0" } -ribir_painter = {path = "../painter", features = ["tessellation"], version = "0.1.0-alpha.0" } +ribir_algo = {path = "../algo", version = "0.1.0-beta.5" } +ribir_geom = {path = "../geom", version = "0.1.0-beta.5" } +ribir_painter = {path = "../painter", features = ["tessellation"], version = "0.1.0-beta.5" } slab = "0.4.8" wgpu = {workspace = true, optional = true} zerocopy = {workspace=true, features = ["derive"]} diff --git a/macros/Cargo.toml b/macros/Cargo.toml index 386bf9d86..a41a57731 100644 --- a/macros/Cargo.toml +++ b/macros/Cargo.toml @@ -22,10 +22,10 @@ bitflags.workspace = true lazy_static.workspace = true proc-macro2.workspace = true quote.workspace = true -ribir_builtin = {path = "./builtin", version = "0.1.0-alpha.0" } -ribir_painter = {path = "../painter", version = "0.1.0-alpha.0" } +ribir_builtin = {path = "./builtin", version = "0.1.0-beta.5" } +ribir_painter = {path = "../painter", version = "0.1.0-beta.5" } smallvec.workspace = true syn = {workspace = true, features = ["fold", "full", "extra-traits"]} [build-dependencies] -ribir_builtin = {path = "./builtin", version = "0.1.0-alpha.0" } +ribir_builtin = {path = "./builtin", version = "0.1.0-beta.5" } diff --git a/painter/Cargo.toml b/painter/Cargo.toml index 17b6f475b..9c7f617fc 100644 --- a/painter/Cargo.toml +++ b/painter/Cargo.toml @@ -20,8 +20,8 @@ lyon_algorithms = {version = "1.0.3", features = ["serialization"]} lyon_tessellation = {version = "1.0.3", features = ["serialization"], optional = true} material-color-utilities-rs = {workspace = true} rctree.workspace = true -ribir_algo = {path = "../algo", version = "0.1.0-alpha.0" } -ribir_geom = {path = "../geom", version = "0.1.0-alpha.0" } +ribir_algo = {path = "../algo", version = "0.1.0-beta.5" } +ribir_geom = {path = "../geom", version = "0.1.0-beta.5" } serde = {version = "1.0", features = ["rc", "derive"]} serde_json.workspace = true tiny-skia-path = {workspace = true} diff --git a/painter/src/lib.rs b/painter/src/lib.rs index a16d491ae..bdee1282b 100644 --- a/painter/src/lib.rs +++ b/painter/src/lib.rs @@ -1,5 +1,3 @@ -#![feature(const_fn_floating_point_arithmetic, test)] - //! A 2d logic painter, generate the paint command pub mod color; mod painter; diff --git a/ribir/Cargo.toml b/ribir/Cargo.toml index cd26ee86b..bd7a2dbe5 100644 --- a/ribir/Cargo.toml +++ b/ribir/Cargo.toml @@ -15,10 +15,10 @@ version.workspace = true [dependencies] arboard = "3.2.0" once_cell.workspace = true -ribir_core = { path = "../core", version = "0.1.0-alpha.0" } -ribir_gpu = { path = "../gpu", version = "0.1.0-alpha.0" } -ribir_material = { path = "../themes/material", version = "0.1.0-alpha.0", optional = true } -ribir_widgets = { path = "../widgets", version = "0.1.0-alpha.0", optional = true } +ribir_core = { path = "../core", version = "0.1.0-beta.5" } +ribir_gpu = { path = "../gpu", version = "0.1.0-beta.5" } +ribir_material = { path = "../themes/material", version = "0.1.0-beta.5", optional = true } +ribir_widgets = { path = "../widgets", version = "0.1.0-beta.5", optional = true } rxrust.workspace = true wgpu = { workspace = true, optional = true } winit.workspace = true @@ -64,7 +64,4 @@ pre-release-replacements = [ {file="../CHANGELOG.md", search="@ReleaseDate", replace="{{date}}", prerelease = true}, {file="../CHANGELOG.md", search="", replace="\n\n## [@Unreleased] - @ReleaseDate", exactly=1, prerelease = true}, {file="../CHANGELOG.md", search="", replace="\n[@Unreleased]: https://github.com/RibirX/Ribir/compare/{{tag_name}}...HEAD", exactly=1, prerelease = true}, - {file="../docs/zh/get_started/try_it.md", search="@RIBIR_VERSION", replace="{{version}}", prerelease = true}, - {file="../docs/en/get_started/try_it.md", search="@RIBIR_VERSION", replace="{{version}}", prerelease = true}, ] -pre-release-hook = ["./rclog_hook.sh"] diff --git a/ribir/rclog_hook.sh b/ribir/rclog_hook.sh deleted file mode 100644 index be8851ae2..000000000 --- a/ribir/rclog_hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -if [ "$MERGE_CHANGELOG" = true ]; then - echo "$(rclog -t $NEW_VERSION -p ./CHANGELOG.md merge)" >| ./CHANGELOG.md -fi diff --git a/text/Cargo.toml b/text/Cargo.toml index 83cae892a..6d73681a3 100644 --- a/text/Cargo.toml +++ b/text/Cargo.toml @@ -20,9 +20,9 @@ fontdb.workspace = true log.workspace = true lyon_path.workspace = true ordered-float.workspace = true -ribir_algo = {path = "../algo", version = "0.1.0-alpha.0" } -ribir_geom = {path = "../geom", version = "0.1.0-alpha.0" } -ribir_painter = {path = "../painter", version = "0.1.0-alpha.0" } +ribir_algo = {path = "../algo", version = "0.1.0-beta.5" } +ribir_geom = {path = "../geom", version = "0.1.0-beta.5" } +ribir_painter = {path = "../painter", version = "0.1.0-beta.5" } rustybuzz.workspace = true unicode-bidi.workspace = true unicode-script.workspace = true diff --git a/themes/material/Cargo.toml b/themes/material/Cargo.toml index e61951e96..57fab43cd 100644 --- a/themes/material/Cargo.toml +++ b/themes/material/Cargo.toml @@ -13,5 +13,5 @@ repository = "https://github.com/RibirX/Ribir/themes/material" version.workspace = true [dependencies] -ribir_core = {path = "../../core", version = "0.1.0-alpha.0" } -ribir_widgets = {path = "../../widgets", version = "0.1.0-alpha.0" } +ribir_core = {path = "../../core", version = "0.1.0-beta.5" } +ribir_widgets = {path = "../../widgets", version = "0.1.0-beta.5" } diff --git a/widgets/Cargo.toml b/widgets/Cargo.toml index 5f288e8ca..9a3d0f339 100644 --- a/widgets/Cargo.toml +++ b/widgets/Cargo.toml @@ -17,8 +17,8 @@ version.workspace = true [dependencies] lyon_algorithms.workspace = true lyon_path.workspace = true -ribir_core = {path = "../core", version = "0.1.0-alpha.0" } -ribir_geom = {path = "../geom", version = "0.1.0-alpha.0" } +ribir_core = {path = "../core", version = "0.1.0-beta.5" } +ribir_geom = {path = "../geom", version = "0.1.0-beta.5" } webbrowser.workspace = true [dev-dependencies]