From 3c14cbe6a4efbb5040fe140beb3916bf8fd2e659 Mon Sep 17 00:00:00 2001
From: oSumAtrIX <johan.melkonyan1@web.de>
Date: Fri, 8 Jul 2022 21:23:52 +0200
Subject: [PATCH] feat: use cargo git dependency instead of submodule

---
 .github/workflows/rust.yml | 13 +++++--------
 .gitmodules                |  3 ---
 Cargo.lock                 |  5 +++--
 Cargo.toml                 |  6 +-----
 submodules/serenity        |  1 -
 5 files changed, 9 insertions(+), 19 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 submodules/serenity

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 73fd9a3..82c86c6 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -2,21 +2,18 @@ name: Rust
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
 
 env:
   CARGO_TERM_COLOR: always
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-      with:
-        submodules: recursive
-    - name: Build
-      run: cargo build --verbose
+      - uses: actions/checkout@v3
+      - name: Build
+        run: cargo build --verbose
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index bb44f69..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "submodules/serenity"]
-	path = submodules/serenity
-	url = git@github.com:serenity-rs/serenity.git
diff --git a/Cargo.lock b/Cargo.lock
index fad4db4..54377be 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -343,9 +343,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
 
 [[package]]
 name = "hyper"
-version = "0.14.19"
+version = "0.14.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42dc3c131584288d375f2d07f822b0cb012d8c6fb899a5b9fdb3cb7eb9b6004f"
+checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -805,6 +805,7 @@ dependencies = [
 [[package]]
 name = "serenity"
 version = "0.11.2"
+source = "git+https://github.com/serenity-rs/serenity.git#24c02845a0e9e7bde38dacd84607de973ffec10f"
 dependencies = [
  "async-trait",
  "async-tungstenite",
diff --git a/Cargo.toml b/Cargo.toml
index c4240cf..541548c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,8 +24,4 @@ log = "0.4"
 regex = "1.0"
 serde_regex = "1.1"
 chrono = "0.4"
-
-[dependencies.serenity]
-default-features = false
-features = ["client", "gateway", "rustls_backend", "model"] 
-path = "submodules/serenity"  # submodule due to serenity just recently including global slash commands
\ No newline at end of file
+serenity = { git = "https://github.com/serenity-rs/serenity.git", default_features = false,  features = ["client", "gateway", "rustls_backend", "model"] }
\ No newline at end of file
diff --git a/submodules/serenity b/submodules/serenity
deleted file mode 160000
index c5cc876..0000000
--- a/submodules/serenity
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c5cc876484232383c8cd1a7ce71c60624b86a75a