From 9897698322b6973e5f7ba04fcb1e72626834921b Mon Sep 17 00:00:00 2001
From: quexeky <116044207+quexeky@users.noreply.github.com>
Date: Mon, 20 Jan 2025 23:13:49 +1100
Subject: [PATCH] build: Version bump & appimage build

---
 .gitlab-ci.yml            |  1 +
 src-tauri/Cargo.lock      | 57 +--------------------------------------
 src-tauri/Cargo.toml      |  5 +---
 src-tauri/tauri.conf.json |  4 +--
 4 files changed, 5 insertions(+), 62 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7d0ff2c..caa1e5b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,6 +13,7 @@ build-linux:
     - yarnpkg tauri build
     - cp src-tauri/target/release/bundle/deb/*.deb .
     - cp src-tauri/target/release/bundle/rpm/*.rpm .
+    - cp src-tauri/target/release/bundle/appimage/*.appimage
   artifacts:
     paths:
       - "*.{deb,rpm}"
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index c7307bf..22b5365 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -852,37 +852,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "derive_builder"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947"
-dependencies = [
- "derive_builder_macro",
-]
-
-[[package]]
-name = "derive_builder_core"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn 2.0.91",
-]
-
-[[package]]
-name = "derive_builder_macro"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
-dependencies = [
- "derive_builder_core",
- "syn 2.0.91",
-]
-
 [[package]]
 name = "derive_more"
 version = "0.99.18"
@@ -1037,19 +1006,17 @@ dependencies = [
 
 [[package]]
 name = "drop-app"
-version = "0.1.0"
+version = "0.2.0-beta-prerelease-1"
 dependencies = [
  "atomic-instant-full",
  "boxcar",
  "chrono",
- "derive_builder",
  "directories",
  "hex",
  "http",
  "log",
  "log4rs",
  "md5",
- "merge-struct",
  "openssl",
  "parking_lot 0.12.3",
  "rayon",
@@ -1059,7 +1026,6 @@ dependencies = [
  "serde",
  "serde-binary",
  "serde_json",
- "serde_merge",
  "serde_with",
  "shared_child",
  "slice-deque",
@@ -2462,16 +2428,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "merge-struct"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d82012d21e24135b839b6b9bebd622b7ff0cb40071498bc2d066d3a6d04dd4a"
-dependencies = [
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "mime"
 version = "0.3.17"
@@ -3920,17 +3876,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_merge"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "606e91878516232ac3b16c12e063d4468d762f16d77e7aef14a1f2326c5f409b"
-dependencies = [
- "serde",
- "serde_json",
- "thiserror 1.0.69",
-]
-
 [[package]]
 name = "serde_repr"
 version = "0.1.19"
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 31a23af..f9f24c3 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "drop-app"
-version = "0.1.0"
+version = "0.2.0-beta-prerelease-1"
 description = "The client application for the open-source, self-hosted game distribution platform Drop"
 authors = ["Drop OSS"]
 edition = "2021"
@@ -47,11 +47,8 @@ tauri-plugin-autostart = "2.0.0"
 shared_child = "1.0.1"
 serde_with = "3.12.0"
 slice-deque = "0.3.0"
-derive_builder = "0.20.2"
 throttle_my_fn = "0.2.6"
 parking_lot = "0.12.3"
-merge-struct = "0.1.0"
-serde_merge = "0.1.3"
 atomic-instant-full = "0.1.0"
 
 [dependencies.tauri]
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 0efb8e0..55e9ca4 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2.0.0",
   "productName": "Drop Desktop Client",
-  "version": "0.1.0",
+  "version": "0.2.0-beta-prerelease-1",
   "identifier": "dev.drop.app",
   "build": {
     "beforeDevCommand": "yarn dev --port 1432",
@@ -23,7 +23,7 @@
   },
   "bundle": {
     "active": true,
-    "targets": ["nsis", "deb", "rpm", "dmg"],
+    "targets": ["nsis", "deb", "rpm", "dmg", "appimage"],
     "windows": {
       "nsis": {
         "installMode": "both"