Update workflow

BUG:https://github.com/ArthurSonzogni/FTXUI/issues/1032

.bcr/README.md

@@ -1,9 +0,0 @@
-# Bazel Central Registry
-
-When the ruleset is released, we want it to be published to the
-Bazel Central Registry automatically:
-<https://registry.bazel.build>
-
-This folder contains configuration files to automate the publish step.
-See <https://github.com/bazel-contrib/publish-to-bcr/blob/main/templates/README.md>
-for authoritative documentation about these files.

.bcr/metadata.template.json

@@ -1,16 +0,0 @@
-{
-  "homepage": "https://github.com/ArthurSonzogni/FTXUI",
-  "maintainers": [
-    {
-      "name": "Arthur Sonzogni",
-      "email": "sonzogniarthur@gmail.com",
-      "github": "ArthurSonzogni",
-      "github_user_id": 4759106
-    }
-  ],
-  "repository": [
-    "github:ArthurSonzogni/FTXUI"
-  ],
-  "versions": [],
-  "yanked_versions": {}
-}

.bcr/presubmit.yml

@@ -1,24 +0,0 @@
-# Copyright 2025 Arthur Sonzogni. All rights reserved.
-# Use of this source code is governed by the MIT license that can be found in
-# the LICENSE file.
-matrix:
-  platform:
-  - centos7
-  - debian10
-  - ubuntu2004
-  - macos
-  - windows
-  bazel: [6.x, 7.x, 8.x]
-tasks:
-  verify_targets:
-    name: Build and test.
-    platform: ${{ platform }}
-    bazel: ${{ bazel }}
-    build_targets:
-    - '@ftxui//:ftxui'
-    - '@ftxui//:screen'
-    - '@ftxui//:dom'
-    - '@ftxui//:component'
-    test_targets:
-    - '@ftxui//:tests'
-

.bcr/source.template.json

@@ -1,5 +0,0 @@
-{
-  "integrity": "",
-  "strip_prefix": "",
-  "url": "https://github.com/ArthurSonzogni/FTXUI/releases/download/{TAG}/source.tar.gz"
-}

.github/workflows/build.yaml

@@ -12,24 +12,25 @@ on:
 jobs:
 
   test_bazel:
-    name: "Bazel, ${{ matrix.compiler }}, ${{ matrix.os }}"
+    name: "Test Bazel"
     strategy:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+          - name: Linux GCC
+            os: ubuntu-latest
             compiler: gcc
 
-          - os: ubuntu-latest
+          - name: Linux Clang
+            os: ubuntu-latest
             compiler: llvm
 
-          - os: macos-latest
+          - name: MacOS clang
+            os: macos-latest
             compiler: llvm
 
-          - os: macos-latest
-            compiler: gcc
-
-          - os: windows-latest
+          - name: Windows MSVC
+            os: windows-latest
             compiler: cl
 
     runs-on: ${{ matrix.os }}
@@ -37,6 +38,19 @@ jobs:
       - name: "Checkout repository"
         uses: actions/checkout@v3
 
+      - name: "Setup Cpp"
+        uses: aminya/setup-cpp@v1
+        with:
+          compiler: ${{ matrix.compiler }}
+          vcvarsall: ${{ contains(matrix.os, 'windows' )}}
+
+      - name: "Install Bazel"
+        uses: bazel-contrib/setup-bazel@0.14.0
+      
+      # Need on macos. See https://github.com/bazelbuild/bazel/issues/21718
+      - name: Clean Bazel cache
+        run: bazel clean --expunge
+
       - name: "Build with Bazel"
         run: bazel build ...
 
@@ -44,7 +58,7 @@ jobs:
         run: bazel run tests
 
   test_cmake:
-    name: "CMake, ${{ matrix.compiler }}, ${{ matrix.os }}"
+    name: "Tests CMake"
     strategy:
       fail-fast: false
       matrix:
@@ -173,7 +187,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   # Build artifact for the release
-  package_compiled:
+  package:
     name: "Build packages"
     needs: release
     strategy:
@@ -218,29 +232,6 @@ jobs:
           asset_path: ${{ matrix.asset_path }}
           overwrite: true
   
-  # Build "source" artifact for the release. This is the same as the github
-  # "source" archive, but with a stable URL. This is useful for the Bazel
-  # Central Repository.
-  package_source:
-    name: "Build source package"
-    needs: release
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Checkout repository"
-        uses: actions/checkout@v3
-
-      - name: "Create source package"
-        run: >
-          git archive --format=tar.gz -o source.tar.gz HEAD
-
-      - name: "Upload source package"
-        uses: shogo82148/actions-upload-release-asset@v1
-        with:
-          upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: source.tar.gz
-          overwrite: true
-
-  
   documentation:
     if: github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest

.github/workflows/publish.yaml

@@ -1,20 +0,0 @@
-on:
-  # On manual trigger:
-  workflow_dispatch:
-    inputs:
-      tag_name:
-        required: true
-        type: string
-
-jobs:    
-  publish:
-    uses: bazel-contrib/publish-to-bcr/.github/workflows/publish.yaml@v0.0.4
-    with:
-      tag_name: ${{ inputs.tag_name }}
-      registry_fork: ArthurSonzogni/bazel-central-registry
-    permissions:
-      attestations: write
-      contents: write
-      id-token: write
-    secrets:
-      publish_token: ${{ secrets.PUBLISH_TOKEN }}

.gitignore

@@ -35,7 +35,6 @@ out/
 
 # bazel directory:
 !bazel/**/*.bzl
-!.bcr/*
 
 # doc directory:
 !doc/**/Doxyfile.in

BUILD.bazel

@@ -3,18 +3,18 @@
 # the LICENSE file.
 
 # TODO:
-# - Build benchmark.
-# - Build fuzzers.
-# - Build documentation.
+# - Windows/MSVC support.
+#   - Pass /utf-8 to MSVC users depending on FTXUI.
+#   - Pass "FTXUI_MICROSOFT_TERMINAL_FALLBACK" to windows users.
+# - Support building benchmark.
+# - Support building examples.
+# - Support building fuzzer.
+# - Support building documentation.
 # - Enable the two tests timing out.
 # - Support WebAssembly
 
 load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
-load(":bazel/ftxui.bzl", "ftxui_cc_library")
-load(":bazel/ftxui.bzl", "generate_examples")
-load(":bazel/ftxui.bzl", "cpp20")
-load(":bazel/ftxui.bzl", "windows_copts")
-load(":bazel/ftxui.bzl", "pthread_linkopts")
+load(":bazel/ftxui.bzl", "ftxui_cc_library", "generate_examples")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -181,7 +181,7 @@ ftxui_cc_library(
         "include/ftxui/component/screen_interactive.hpp",
         "include/ftxui/component/task.hpp",
     ],
-    linkopts = pthread_linkopts(),
+    linkopts = ["-lpthread"],
     deps = [":dom"],
 )
 
@@ -237,11 +237,11 @@ cc_test(
         # - "src/ftxui/component/screen_interactive_test.cpp",
         # - "src/ftxui/dom/selection_test.cpp",
     ],
+    copts = ["-std=c++20"],
     includes = [
         "include",
         "src",
     ],
-    copts = cpp20() + windows_copts(),
     deps = [
         "//:ftxui",
         "@googletest//:gtest_main",

CHANGELOG.md

@@ -1,35 +1,11 @@
 Changelog
 =========
 
-Future release
-------------
-
-6.1.1 (2025-04-30)
------------------
+Next release (2025-04-01)
+-------------------------
 
 ### Build
-- Feature: Support `bazel` build system. See #1032.
-  Proposed by Kostya Serebryany @kcc
-  If all goes well (pending), it should appear in the Bazel central repository.
-  It can be imported into your project using the following lines:
-
-  **MODULE.bazel**
-  ```bazel
-  bazel_dep(name = "ftxui", version = "6.1.1")
-  ```
-
-  **BUILD.bazel**
-  ```bazel
-  deps = [
-    // Depend on the whole library:
-    "@ftxui//:ftxui",
-
-    // Choose a specific submodule:
-    "@ftxui//:component",
-    "@ftxui//:dom",
-    "@ftxui//:screen",
-  ]
-  ```
+- Feature: Support `bazel`. See #1032. Proposed by @kcc.
 
 ### Component
 - Bugfix: Fix a crash with ResizeableSplit. See #1023.

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.12)
 
 project(ftxui
   LANGUAGES CXX
-  VERSION 6.1.1
+  VERSION 6.0.2
   DESCRIPTION "C++ Functional Terminal User Interface."
 )
 

MODULE.bazel

@@ -1,9 +1,5 @@
-# Copyright 2025 Arthur Sonzogni. All rights reserved.
-# Use of this source code is governed by the MIT license that can be found in
-# the LICENSE file.
-
 # FTXUI Module.
-module(name = "ftxui", version = "6.1.1")
+module(name = "ftxui", version = "6.0.3")
 
 # Build deps.
 bazel_dep(name = "rules_cc", version = "0.1.1")

README.md

@@ -42,7 +42,7 @@ A simple cross-platform C++ library for terminal based user interfaces!
  * No dependencies
  * **Cross platform**: Linux/MacOS (main target), WebAssembly, Windows (Thanks to contributors!).
  * Learn by [examples](#documentation), and [tutorials](#documentation)
- * Multiple packages: CMake [FetchContent]([https://bewagner.net/programming/2020/05/02/cmake-fetchcontent/](https://cmake.org/cmake/help/latest/module/FetchContent.html)) (preferred),Bazel, vcpkg, pkgbuild, conan.
+ * Multiple packages: CMake [FetchContent]([https://bewagner.net/programming/2020/05/02/cmake-fetchcontent/](https://cmake.org/cmake/help/latest/module/FetchContent.html)) (preferred), vcpkg, pkgbuild, conan.
  * Good practices: documentation, tests, fuzzers, performance tests, automated CI, automated packaging, etc...
 
 ## Documentation
@@ -372,7 +372,7 @@ include(FetchContent)
 
 FetchContent_Declare(ftxui
   GIT_REPOSITORY https://github.com/ArthurSonzogni/ftxui
-  GIT_TAG v6.1.1
+  GIT_TAG v6.0.2
 )
 
 FetchContent_GetProperties(ftxui)
@@ -383,7 +383,6 @@ endif()
 ```
 
 If you don't, FTXUI may be used from the following packages:
-- [bazel](...)
 - [vcpkg](https://vcpkgx.com/details.html?package=ftxui)
 - [Arch Linux PKGBUILD](https://aur.archlinux.org/packages/ftxui-git/).
 - [conan.io](https://conan.io/center/ftxui)
@@ -396,6 +395,8 @@ If you choose to build and link FTXUI yourself, `ftxui-component` must be first
 g++ . . . -lftxui-component -lftxui-dom -lftxui-screen . . .
 ```
 
+
+
 ## Contributors
 
 <a href="https://github.com/ArthurSonzogni/FTXUI/graphs/contributors">

WORKSPACE.bazel

@@ -1,4 +1 @@
-# Copyright 2025 Arthur Sonzogni. All rights reserved.
-# Use of this source code is governed by the MIT license that can be found in
-# the LICENSE file.
 workspace(name = "ftxui")

bazel/ftxui.bzl

@@ -2,80 +2,12 @@
 
 load("@rules_cc//cc:defs.bzl", "cc_library")
 
-def cpp17():
-    return select({
-        "@rules_cc//cc/compiler:msvc-cl": ["/std:c++17"],
-        "@rules_cc//cc/compiler:clang-cl": ["/std:c++17"],
-        "@rules_cc//cc/compiler:clang": ["-std=c++17"],
-        "@rules_cc//cc/compiler:gcc": ["-std=c++17"],
-        "//conditions:default": ["-std=c++17"],
-    })
-
-def cpp20():
-    return select({
-        "@rules_cc//cc/compiler:msvc-cl": ["/std:c++20"],
-        "@rules_cc//cc/compiler:clang-cl": ["/std:c++20"],
-        "@rules_cc//cc/compiler:clang": ["-std=c++20"],
-        "@rules_cc//cc/compiler:gcc": ["-std=c++20"],
-        "//conditions:default": ["-std=c++20"],
-    })
-
-# Microsoft terminal is a bit buggy ¯\_(ツ)_/¯ and MSVC uses bad defaults.
-def windows_copts():
-    MSVC_COPTS = [
-      # Microsoft Visual Studio must decode sources files as UTF-8.
-      "/utf-8",
-
-      # Microsoft Visual Studio must interpret the codepoint using unicode.
-      "/DUNICODE",
-      "/D_UNICODE",
-
-      # Fallback for Microsoft Terminal.
-      # This
-      # - Replace missing font symbols by others.
-      # - Reduce screen position pooling frequency to deals against a Microsoft
-      #   race condition. This was fixed in 2020, but clients never not updated.
-      #   - https://github.com/microsoft/terminal/pull/7583
-      #   - https://github.com/ArthurSonzogni/FTXUI/issues/136
-      "/DFTXUI_MICROSOFT_TERMINAL_FALLBACK",
-    ]
-
-    WINDOWS_COPTS = [
-      # Fallback for Microsoft Terminal.
-      # This
-      # - Replace missing font symbols by others.
-      # - Reduce screen position pooling frequency to deals against a Microsoft
-      #   race condition. This was fixed in 2020, but clients never not updated.
-      #   - https://github.com/microsoft/terminal/pull/7583
-      #   - https://github.com/ArthurSonzogni/FTXUI/issues/136
-      "-DFTXUI_MICROSOFT_TERMINAL_FALLBACK",
-    ];
-    
-    return select({
-        # MSVC:
-        "@rules_cc//cc/compiler:msvc-cl": MSVC_COPTS,
-        "@rules_cc//cc/compiler:clang-cl": MSVC_COPTS,
-        "@platforms//os:windows": WINDOWS_COPTS,
-        "//conditions:default": [],
-    })
-
-def pthread_linkopts():
-    return select({
-        # With MSVC, threading is already built-in (you don't need -pthread.
-        "@rules_cc//cc/compiler:msvc-cl": [],
-        "@rules_cc//cc/compiler:clang-cl": [],
-        "@rules_cc//cc/compiler:clang": ["-pthread"],
-        "@rules_cc//cc/compiler:gcc": ["-pthread"],
-        "//conditions:default": ["-pthread"],
-    })
-
 def ftxui_cc_library(
         name,
         srcs,
         hdrs,
         linkopts = [],
         deps = []):
-
     cc_library(
         name = name,
         srcs = srcs,
@@ -88,12 +20,10 @@ def ftxui_cc_library(
             "include",
             "src",
         ],
-        copts = cpp17() + windows_copts(),
+        copts = ["-std=c++17"],
         visibility = ["//visibility:public"],
     )
 
-# Compile all the examples in the examples/ directory.
-# This is useful to check the Bazel is synchronized with CMake definitions.
 def generate_examples():
     cpp_files = native.glob(["examples/**/*.cpp"])
 
@@ -111,5 +41,4 @@ def generate_examples():
             name = name,
             srcs = [src],
             deps = ["//:component"],
-            copts = cpp20() + windows_copts(),
         )