Skip to content

Commit 378d8ae

Browse files
committed
feat(BREAKING): remove legacy variant
Due to Github removing support for the Ubuntu-20.04 os image, I'm removing the legacy variant that was kept alive only for backward compatibility. RQuickShare will sadly align with Tauri v2 system requirements. The previous release v0.11.5 will be the last one to include the legacy binary. This version is still working and will be the one people wanting to use RQuickShare on "older" system shall default to. Signed-off-by: Martichou <m@rtin.fyi>
1 parent b45366d commit 378d8ae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+13
-14957
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,6 @@
55

66
version: 2
77
updates:
8-
# npm packages
9-
- package-ecosystem: 'npm'
10-
directory: '/app/legacy'
11-
schedule:
12-
interval: 'monthly'
13-
commit-message:
14-
prefix: 'deps(legacy-npm): '
15-
groups:
16-
dependencies:
17-
patterns:
18-
- '*'
19-
208
- package-ecosystem: 'npm'
219
directory: '/app/main'
2210
schedule:
@@ -40,17 +28,6 @@ updates:
4028
patterns:
4129
- '*'
4230

43-
- package-ecosystem: 'cargo'
44-
directory: '/app/legacy/src-tauri'
45-
schedule:
46-
interval: 'monthly'
47-
commit-message:
48-
prefix: 'deps(legacy-rust): '
49-
groups:
50-
dependencies:
51-
patterns:
52-
- '*'
53-
5431
- package-ecosystem: 'cargo'
5532
directory: '/app/main/src-tauri'
5633
schedule:

.github/workflows/build.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,6 @@ jobs:
4646
strategy:
4747
matrix:
4848
include:
49-
- os: ubuntu-20.04
50-
name: legacy
51-
target_path: app/legacy
52-
dependencies: |
53-
sudo apt-get install -y libjavascriptcoregtk-4.0-dev libwebkit2gtk-4.0-dev
54-
cache_directory: app/legacy/src-tauri/target
5549
- os: ubuntu-24.04
5650
name: main
5751
target_path: app/main

.github/workflows/lint.yml

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,18 @@ env:
1414
CARGO_TERM_COLOR: always
1515

1616
jobs:
17-
ensure_vue_lib_same:
18-
runs-on: ubuntu-latest
19-
steps:
20-
- uses: actions/checkout@v4
21-
- run: |
22-
diff -qr app/legacy/src/vue_lib app/main/src/vue_lib
23-
2417
style_rust:
2518
runs-on: ubuntu-latest
2619
strategy:
2720
matrix:
2821
include:
2922
- directory: ./core_lib
30-
- directory: ./app/legacy/src-tauri
3123
- directory: ./app/main/src-tauri
3224
steps:
3325
- uses: actions/checkout@v4
34-
- uses: dtolnay/rust-toolchain@stable
26+
- uses: dtolnay/rust-toolchain@nightly
27+
with:
28+
components: rustfmt
3529
- run: |
3630
cd ${{ matrix.directory }}
3731
cargo fmt --all --check
@@ -41,7 +35,6 @@ jobs:
4135
strategy:
4236
matrix:
4337
include:
44-
- directory: ./app/legacy
4538
- directory: ./app/main
4639
steps:
4740
- uses: actions/checkout@v4
@@ -66,18 +59,15 @@ jobs:
6659
- directory: core_lib
6760
clippy_args: "--all-features --all"
6861
os: ubuntu-latest
69-
- directory: app/legacy/src-tauri
70-
clippy_args: "--no-default-features"
71-
os: ubuntu-20.04
7262
- directory: app/main/src-tauri
7363
clippy_args: "--no-default-features"
7464
os: ubuntu-24.04
7565
runs-on: ${{ matrix.os }}
7666
steps:
7767
- uses: actions/checkout@v4
78-
- uses: dtolnay/rust-toolchain@stable
68+
- uses: dtolnay/rust-toolchain@nightly
7969
with:
80-
components: clippy, rustfmt
70+
components: clippy
8171
- uses: Swatinem/rust-cache@v2
8272
with:
8373
cache-directories: "${{ github.workspace }}/${{ matrix.directory }}/target"

.github/workflows/release.yml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ jobs:
1616
strategy:
1717
matrix:
1818
include:
19-
- os: ubuntu-20.04
20-
name: legacy
21-
target_path: app/legacy
22-
dependencies: |
23-
sudo apt-get install -y libjavascriptcoregtk-4.0-dev libwebkit2gtk-4.0-dev
24-
cache_directory: app/legacy/src-tauri/target
2519
- os: ubuntu-24.04
2620
name: main
2721
target_path: app/main
@@ -76,22 +70,12 @@ jobs:
7670
cd ${{ github.workspace }}
7771
./rename_build.sh ${{ github.workspace }}/${{ matrix.target_path }}/src-tauri/target/release/bundle/ ${{ matrix.name }}
7872
79-
- uses: snapcore/action-build@v1
80-
if: matrix.target_path == 'app/legacy'
81-
id: build-snap
82-
- run: sudo snap install --dangerous ${{ steps.build-snap.outputs.snap }}
83-
if: matrix.target_path == 'app/legacy'
84-
- name: Set Snap File Path
85-
if: matrix.target_path == 'app/legacy'
86-
run: echo "SNAP_FILE=${{ steps.build-snap.outputs.snap }}" >> $GITHUB_ENV
87-
8873
- name: Add files to release
8974
if: github.event_name != 'workflow_dispatch'
9075
uses: softprops/action-gh-release@v2
9176
with:
9277
files: |
9378
${{ github.workspace }}/${{ matrix.target_path }}/src-tauri/target/release/bundle/*/r-quick-share-${{ matrix.name }}*
94-
${{ env.SNAP_FILE }}
9579
fail_on_unmatched_files: true
9680

9781
- name: Upload artifacts
@@ -101,4 +85,3 @@ jobs:
10185
name: artifact-debug-rquickshare-${{ matrix.os }}
10286
path: |
10387
${{ github.workspace }}/${{ matrix.target_path }}/src-tauri/target/release/bundle/*/r-quick-share-${{ matrix.name }}*
104-
${{ env.SNAP_FILE }}

.vscode/settings.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"rust-analyzer.linkedProjects": [
33
"./core_lib/Cargo.toml",
4-
"./app/legacy/src-tauri/Cargo.toml",
54
"./app/main/src-tauri/Cargo.toml",
65
],
76
}

BUILD.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
The project is divided into two parts:
22

33
- **core_lib:** This is a Rust library that encompasses all the logic necessary for discovering, connecting to, and transferring files to QuickShare-compatible clients.
4-
- **app/legacy:** A Tauri application that utilizes core_lib to handle incoming requests and initiate outgoing ones.
4+
- **app/main:** A Tauri application that utilizes core_lib to handle incoming requests and initiate outgoing ones.
55

66
How to build
77
--------------------------
@@ -10,7 +10,7 @@ How to build
1010

1111
Building the core_lib is straightforward because it is a basic Rust project.
1212

13-
Install `protobuf-compiler` system package, and then simply run `cargo build` or `cargo build --release` from `core_lib` folder.
13+
Install `protobuf-compiler` system package, and then simply run `cargo build` or `cargo build --release` from `core_lib` folder.
1414

1515
### app/main
1616

@@ -36,9 +36,9 @@ pnpm dev
3636
pnpm build
3737
```
3838

39-
For more detailed information on building the app/legacy and understanding any potential limitations, it’s advised to consult the [Tauri documentation](https://v2.tauri.app/start).
39+
For more detailed information on building the app/main and understanding any potential limitations, it’s advised to consult the [Tauri documentation](https://v2.tauri.app/start).
4040

41-
### app/legacy
41+
### app/main
4242

4343
Everything is the same as the app/main one, except the output of the build :)
4444

@@ -48,4 +48,4 @@ Everything is the same as the app/main one, except the output of the build :)
4848
pnpm build
4949
```
5050

51-
For more detailed information on building the app/legacy and understanding any potential limitations, it’s advised to consult the [Tauri documentation](https://tauri.app/v1/guides/building/linux).
51+
For more detailed information on building the app/main and understanding any potential limitations, it’s advised to consult the [Tauri documentation](https://tauri.app/v1/guides/building/linux).

README.md

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ You simply have to download the latest release.
2222
**Important notes:**
2323
- The minimum GLIBC version supported is included in the pkg name.
2424
- You can check yours with `ldd --version`.
25-
- RQuickShare is distributed with two version (main & legacy):
26-
- Legacy is for compatibility with older Ubuntu versions.
25+
- RQuickShare was distributed with two version (main & legacy) up until v0.11.5:
26+
- Legacy is for compatibility with older Ubuntu versions: [here](https://github.com/Martichou/rquickshare/releases/tag/v0.11.5).
2727
- Main is for future support of newer versions of Ubuntu.
2828

2929
#### macOS
@@ -77,14 +77,6 @@ You can then either double click on it, or run it from the cmd line:
7777
./r-quick-share_${VERSION}.AppImage
7878
```
7979

80-
#### Snap
81-
82-
The snap is not yet on the store, but you can install it with the following (you may need sudo):
83-
84-
```bash
85-
snap install --dangerous r-quick-share_${VERSION}.snap
86-
```
87-
8880
---
8981

9082
<details>

app/legacy/.eslintrc-auto-import.json

Lines changed: 0 additions & 67 deletions
This file was deleted.

app/legacy/.eslintrc.cjs

Lines changed: 0 additions & 73 deletions
This file was deleted.

app/legacy/.gitignore

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)