From 07abd2d4ce6bbec78ce9cf0cc1d10b3ba22b8f61 Mon Sep 17 00:00:00 2001 From: Ryan Luu Date: Fri, 13 Nov 2026 16:10:10 -0600 Subject: [PATCH 1/5] Migrate from aftman to rokit Switches the toolchain manager to rokit and updates tooling versions Signed-off-by: Ryan Luu --- .github/workflows/BuildRelease.yml | 2 +- .github/workflows/CI.yml | 2 +- aftman.toml | 9 --------- rokit.toml | 5 +++++ 4 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 aftman.toml create mode 100644 rokit.toml diff --git a/.github/workflows/BuildRelease.yml b/.github/workflows/BuildRelease.yml index 4c07fdc..116d29b 100644 --- a/.github/workflows/BuildRelease.yml +++ b/.github/workflows/BuildRelease.yml @@ -13,7 +13,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - uses: ok-nick/setup-aftman@v0.4.2 + - uses: CompeyDev/setup-rokit@v0.2.1 - name: Build asset run: rojo build --output Icon.rbxm withLink.project.json diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 397c349..a8533a3 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -12,7 +12,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - uses: ok-nick/setup-aftman@v0.4.2 + - uses: CompeyDev/setup-rokit@v0.2.1 - name: Lint with selene run: selene src diff --git a/aftman.toml b/aftman.toml deleted file mode 100644 index 0123a1a..0000000 --- a/aftman.toml +++ /dev/null @@ -1,9 +0,0 @@ -# This file lists tools managed by Aftman, a cross-platform toolchain manager. -# For more information, see https://github.com/LPGhatguy/aftman - -# To add a new tool, add an entry to this table. -[tools] -rojo = "rojo-rbx/rojo@7.4.1" -selene = "Kampfkarren/selene@0.28.0" -stylua = "JohnnyMorganz/StyLua@0.20.0" -wally = "UpliftGames/Wally@0.3.2" \ No newline at end of file diff --git a/rokit.toml b/rokit.toml new file mode 100644 index 0000000..b69fb2d --- /dev/null +++ b/rokit.toml @@ -0,0 +1,5 @@ +[tools] +rojo = "rojo-rbx/rojo@7.7.1" +selene = "Kampfkarren/selene@0.32.0" +stylua = "JohnnyMorganz/stylua@2.6.0" +wally = "UpliftGames/wally@0.3.2" From 025a5e8dc1a610653e33bab7788034b8da1f328a Mon Sep 17 00:00:00 2001 From: Ryan Luu Date: Fri, 13 Nov 2026 16:10:36 -0600 Subject: [PATCH 2/5] Remove rotriever Rotriever is Roblox internal only and can't be used Signed-off-by: Ryan Luu --- rotriever.toml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 rotriever.toml diff --git a/rotriever.toml b/rotriever.toml deleted file mode 100644 index 5d18426..0000000 --- a/rotriever.toml +++ /dev/null @@ -1,8 +0,0 @@ -[package] -name = "TopbarPlus" -version = "3.0.0" -license = "MPL2" -authors = ["1ForeverHD"] -content_root = "src" - -[dependencies] \ No newline at end of file From 1c668abe21d14401b0b7f015cbf63b54efba9711 Mon Sep 17 00:00:00 2001 From: Ryan Luu Date: Fri, 13 Nov 2026 16:12:27 -0600 Subject: [PATCH 3/5] Format Rojo project files and remove link project files Signed-off-by: Ryan Luu --- PackageLink.model.json | 2 +- default.project.json | 10 +++++----- serve.project.json | 33 +++++++++++++++------------------ withLink.project.json | 6 ------ withoutLink.project.json | 7 ------- 5 files changed, 21 insertions(+), 37 deletions(-) delete mode 100644 withLink.project.json delete mode 100644 withoutLink.project.json diff --git a/PackageLink.model.json b/PackageLink.model.json index 75006fb..9a00d76 100644 --- a/PackageLink.model.json +++ b/PackageLink.model.json @@ -1,3 +1,3 @@ { - "ClassName": "PackageLink" + "ClassName": "PackageLink" } \ No newline at end of file diff --git a/default.project.json b/default.project.json index cfa35aa..6f9978c 100644 --- a/default.project.json +++ b/default.project.json @@ -1,6 +1,6 @@ { - "name": "topbarplus", - "tree": { - "$path": "src" - } - } \ No newline at end of file + "name": "topbarplus", + "tree": { + "$path": "src" + } +} \ No newline at end of file diff --git a/serve.project.json b/serve.project.json index b9877a2..7c68792 100644 --- a/serve.project.json +++ b/serve.project.json @@ -1,21 +1,18 @@ { - "name": "topbarplus", - "tree": { - "$className": "DataModel", - - "Workspace": { - "$className": "Workspace", - - "TopbarPlus": { - "$className": "Folder", - - "Icon": { - "$path": "src", - "PackageLink": { - "$path": "PackageLink.model.json" - } - } - } + "name": "topbarplus", + "tree": { + "$className": "DataModel", + "Workspace": { + "$className": "Workspace", + "TopbarPlus": { + "$className": "Folder", + "Icon": { + "$path": "src", + "PackageLink": { + "$path": "PackageLink.model.json" + } } + } } -} + } +} \ No newline at end of file diff --git a/withLink.project.json b/withLink.project.json deleted file mode 100644 index cfa35aa..0000000 --- a/withLink.project.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "topbarplus", - "tree": { - "$path": "src" - } - } \ No newline at end of file diff --git a/withoutLink.project.json b/withoutLink.project.json deleted file mode 100644 index 97164d4..0000000 --- a/withoutLink.project.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "topbarplus", - "globIgnorePaths": ["**/PackageLink.model.json"], - "tree": { - "$path": "src" - } - } \ No newline at end of file From 59a70911a1353b5b62f65600482d9c117643532d Mon Sep 17 00:00:00 2001 From: Ryan Luu Date: Fri, 13 Nov 2026 16:14:35 -0600 Subject: [PATCH 4/5] Ignore roblox_manual_fromscale_or_fromoffset selene lints Ignore a new lint that came with the update selene version Signed-off-by: Ryan Luu --- selene.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/selene.toml b/selene.toml index ce3ce74..aae3f03 100644 --- a/selene.toml +++ b/selene.toml @@ -9,3 +9,4 @@ multiple_statements = "allow" parenthese_conditions = "allow" empty_if = "allow" if_same_then_else = "allow" +roblox_manual_fromscale_or_fromoffset = "allow" From d028c31c37ba9a84008fab25545b8751087e75ed Mon Sep 17 00:00:00 2001 From: Ryan Luu Date: Sat, 14 Nov 2026 13:45:03 -0800 Subject: [PATCH 5/5] Fix CI --- .github/workflows/BuildRelease.yml | 2 +- .github/workflows/CI.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/BuildRelease.yml b/.github/workflows/BuildRelease.yml index 116d29b..d1545c0 100644 --- a/.github/workflows/BuildRelease.yml +++ b/.github/workflows/BuildRelease.yml @@ -16,7 +16,7 @@ jobs: - uses: CompeyDev/setup-rokit@v0.2.1 - name: Build asset - run: rojo build --output Icon.rbxm withLink.project.json + run: rojo build --output Icon.rbxm default.project.json - name: Git Release uses: anton-yurchenko/git-release@v6 diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index a8533a3..d61d9ee 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -18,4 +18,4 @@ jobs: run: selene src - name: Build with rojo - run: rojo build --output Icon.rbxm withLink.project.json + run: rojo build --output Icon.rbxm default.project.json