From 77858f804d3d02a19992d2365e5517d41d63038b Mon Sep 17 00:00:00 2001
From: Fl1tzi <git@fl1tzi.com>
Date: Mon, 24 Jul 2023 15:35:08 +0200
Subject: [PATCH] move away from workspace to single package

---
 Cargo.toml                                    |  26 +++++++++++++++---
 {microdeck-core/fonts => fonts}/README.md     |   0
 .../fonts => fonts}/SpaceGrotesk-LICENSE      |   0
 .../fonts => fonts}/SpaceGrotesk.ttf          | Bin
 microdeck-core/Cargo.toml                     |  22 ---------------
 {microdeck-core/src => src}/config.rs         |   0
 {microdeck-core/src => src}/device.rs         |   0
 {microdeck-core/src => src}/main.rs           |   0
 {microdeck-core/src => src}/modules.rs        |   0
 {microdeck-core/src => src}/modules/blank.rs  |   0
 .../src => src}/modules/counter.rs            |   0
 11 files changed, 22 insertions(+), 26 deletions(-)
 rename {microdeck-core/fonts => fonts}/README.md (100%)
 rename {microdeck-core/fonts => fonts}/SpaceGrotesk-LICENSE (100%)
 rename {microdeck-core/fonts => fonts}/SpaceGrotesk.ttf (100%)
 delete mode 100644 microdeck-core/Cargo.toml
 rename {microdeck-core/src => src}/config.rs (100%)
 rename {microdeck-core/src => src}/device.rs (100%)
 rename {microdeck-core/src => src}/main.rs (100%)
 rename {microdeck-core/src => src}/modules.rs (100%)
 rename {microdeck-core/src => src}/modules/blank.rs (100%)
 rename {microdeck-core/src => src}/modules/counter.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index 9043929..b18e3fa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,4 +1,22 @@
-[workspace]
-members = [
-  "microdeck-core"
-]
+[package]
+name = "microdeck"
+version = "0.0.1"
+edition = "2021"
+license = "MIT"
+
+[dependencies]
+hidapi = "2.2.0"
+deck-driver = { git = "https://codeberg.org/Fl1tzi/deck-driver.git", branch = "main", features = ["async"] }
+tokio = { version = "1", features = ["full"] }
+log = "0.4"
+dirs = "4.0.0"
+serde = { version = "1.0", features = ["derive", "rc"] }
+serde_json = "1.0"
+image = "0.24.5"
+async-trait = "0.1.66"
+futures-util = "0.3.27"
+imageproc = "0.23.0"
+rusttype = "0.9.3"
+tracing = "0.1"
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+lazy_static = "1.4.0"
diff --git a/microdeck-core/fonts/README.md b/fonts/README.md
similarity index 100%
rename from microdeck-core/fonts/README.md
rename to fonts/README.md
diff --git a/microdeck-core/fonts/SpaceGrotesk-LICENSE b/fonts/SpaceGrotesk-LICENSE
similarity index 100%
rename from microdeck-core/fonts/SpaceGrotesk-LICENSE
rename to fonts/SpaceGrotesk-LICENSE
diff --git a/microdeck-core/fonts/SpaceGrotesk.ttf b/fonts/SpaceGrotesk.ttf
similarity index 100%
rename from microdeck-core/fonts/SpaceGrotesk.ttf
rename to fonts/SpaceGrotesk.ttf
diff --git a/microdeck-core/Cargo.toml b/microdeck-core/Cargo.toml
deleted file mode 100644
index b18e3fa..0000000
--- a/microdeck-core/Cargo.toml
+++ /dev/null
@@ -1,22 +0,0 @@
-[package]
-name = "microdeck"
-version = "0.0.1"
-edition = "2021"
-license = "MIT"
-
-[dependencies]
-hidapi = "2.2.0"
-deck-driver = { git = "https://codeberg.org/Fl1tzi/deck-driver.git", branch = "main", features = ["async"] }
-tokio = { version = "1", features = ["full"] }
-log = "0.4"
-dirs = "4.0.0"
-serde = { version = "1.0", features = ["derive", "rc"] }
-serde_json = "1.0"
-image = "0.24.5"
-async-trait = "0.1.66"
-futures-util = "0.3.27"
-imageproc = "0.23.0"
-rusttype = "0.9.3"
-tracing = "0.1"
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-lazy_static = "1.4.0"
diff --git a/microdeck-core/src/config.rs b/src/config.rs
similarity index 100%
rename from microdeck-core/src/config.rs
rename to src/config.rs
diff --git a/microdeck-core/src/device.rs b/src/device.rs
similarity index 100%
rename from microdeck-core/src/device.rs
rename to src/device.rs
diff --git a/microdeck-core/src/main.rs b/src/main.rs
similarity index 100%
rename from microdeck-core/src/main.rs
rename to src/main.rs
diff --git a/microdeck-core/src/modules.rs b/src/modules.rs
similarity index 100%
rename from microdeck-core/src/modules.rs
rename to src/modules.rs
diff --git a/microdeck-core/src/modules/blank.rs b/src/modules/blank.rs
similarity index 100%
rename from microdeck-core/src/modules/blank.rs
rename to src/modules/blank.rs
diff --git a/microdeck-core/src/modules/counter.rs b/src/modules/counter.rs
similarity index 100%
rename from microdeck-core/src/modules/counter.rs
rename to src/modules/counter.rs