From 3855d86730e34743f245e75e215d60bee3a64977 Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Mon, 17 Feb 2025 22:37:59 +0100
Subject: [PATCH] Move ids from gdn-app to gdn

---
 Cargo.lock                            | 4 +++-
 gdn-app/src-tauri/Cargo.toml          | 2 +-
 gdn-app/src-tauri/src/api.rs          | 2 +-
 gdn-app/src-tauri/src/lib.rs          | 1 -
 gdn-app/src-tauri/src/store.rs        | 4 +++-
 gdn-app/src-tauri/src/types.rs        | 3 +--
 gdn/Cargo.toml                        | 4 +++-
 {gdn-app/src-tauri => gdn}/src/ids.rs | 0
 gdn/src/lib.rs                        | 1 +
 9 files changed, 13 insertions(+), 8 deletions(-)
 rename {gdn-app/src-tauri => gdn}/src/ids.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index f838599..262a6ac 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1453,13 +1453,15 @@ name = "gdn"
 version = "0.0.0"
 dependencies = [
  "directories",
+ "rand 0.9.0",
+ "serde",
 ]
 
 [[package]]
 name = "gdn-app"
 version = "0.0.0"
 dependencies = [
- "rand 0.9.0",
+ "gdn",
  "serde",
  "serde_json",
  "tauri",
diff --git a/gdn-app/src-tauri/Cargo.toml b/gdn-app/src-tauri/Cargo.toml
index f689f7b..386fd94 100644
--- a/gdn-app/src-tauri/Cargo.toml
+++ b/gdn-app/src-tauri/Cargo.toml
@@ -14,7 +14,7 @@ crate-type = ["staticlib", "cdylib", "rlib"]
 tauri-build = { workspace = true }
 
 [dependencies]
-rand = { workspace = true }
+gdn = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tauri = { workspace = true }
diff --git a/gdn-app/src-tauri/src/api.rs b/gdn-app/src-tauri/src/api.rs
index 0497849..d29bd43 100644
--- a/gdn-app/src-tauri/src/api.rs
+++ b/gdn-app/src-tauri/src/api.rs
@@ -1,9 +1,9 @@
 use std::sync::{Arc, Mutex};
 
+use gdn::ids::NoteId;
 use tauri::{AppHandle, Emitter, State};
 
 use crate::{
-    ids::NoteId,
     store::Store,
     types::{EventNotesStoreUpdate, Note},
 };
diff --git a/gdn-app/src-tauri/src/lib.rs b/gdn-app/src-tauri/src/lib.rs
index 93262a2..3d8503a 100644
--- a/gdn-app/src-tauri/src/lib.rs
+++ b/gdn-app/src-tauri/src/lib.rs
@@ -3,7 +3,6 @@ use std::sync::{Arc, Mutex};
 use store::Store;
 
 mod api;
-mod ids;
 pub mod store;
 mod types;
 
diff --git a/gdn-app/src-tauri/src/store.rs b/gdn-app/src-tauri/src/store.rs
index b55093a..cc21753 100644
--- a/gdn-app/src-tauri/src/store.rs
+++ b/gdn-app/src-tauri/src/store.rs
@@ -1,6 +1,8 @@
 use std::collections::{HashMap, HashSet};
 
-use crate::{ids::NoteId, types::Note};
+use gdn::ids::NoteId;
+
+use crate::types::Note;
 
 #[derive(Debug)]
 pub struct NoteInfo {
diff --git a/gdn-app/src-tauri/src/types.rs b/gdn-app/src-tauri/src/types.rs
index 245f2ee..67e44e0 100644
--- a/gdn-app/src-tauri/src/types.rs
+++ b/gdn-app/src-tauri/src/types.rs
@@ -1,9 +1,8 @@
 use std::collections::HashSet;
 
+use gdn::ids::NoteId;
 use serde::Serialize;
 
-use crate::ids::NoteId;
-
 #[derive(Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Note {
diff --git a/gdn/Cargo.toml b/gdn/Cargo.toml
index f7e6bae..dcdd114 100644
--- a/gdn/Cargo.toml
+++ b/gdn/Cargo.toml
@@ -4,7 +4,9 @@ version = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
-directories.workspace = true
+directories = { workspace = true }
+rand = { workspace = true }
+serde = { workspace = true }
 
 [lints]
 workspace = true
diff --git a/gdn-app/src-tauri/src/ids.rs b/gdn/src/ids.rs
similarity index 100%
rename from gdn-app/src-tauri/src/ids.rs
rename to gdn/src/ids.rs
diff --git a/gdn/src/lib.rs b/gdn/src/lib.rs
index 7928427..f6ff301 100644
--- a/gdn/src/lib.rs
+++ b/gdn/src/lib.rs
@@ -1,3 +1,4 @@
+pub mod ids;
 mod paths;
 
 pub use crate::paths::Paths;