From ec61da6f30c0ea748da3f76b3afc3007e3f31169 Mon Sep 17 00:00:00 2001
From: godzie44 <godzie@yandex.ru>
Date: Mon, 6 May 2024 11:30:32 +0300
Subject: [PATCH] chore(plugins): now `picoplugin` expose tarantool-module from
 git-submodule

---
 Cargo.lock                | 76 ++++-----------------------------------
 picoplugin/Cargo.toml     | 10 ++++--
 picoplugin_gen/Cargo.toml |  9 +++--
 3 files changed, 20 insertions(+), 75 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3dfc9ee784..6a5d4834f6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2496,7 +2496,7 @@ dependencies = [
  "serde_yaml 0.9.34+deprecated",
  "slog",
  "smol_str",
- "tarantool 5.0.0",
+ "tarantool",
  "tempfile",
  "thiserror",
  "uuid 1.8.0",
@@ -2521,7 +2521,7 @@ dependencies = [
  "rmp",
  "rmp-serde",
  "serde",
- "tarantool 5.0.0 (git+https://github.com/picodata/tarantool-module?rev=dbebcc0)",
+ "tarantool",
 ]
 
 [[package]]
@@ -2531,7 +2531,7 @@ dependencies = [
  "proc-macro2 1.0.80",
  "quote 1.0.36",
  "syn 1.0.109",
- "tarantool 5.0.0 (git+https://github.com/picodata/tarantool-module?rev=dbebcc0)",
+ "tarantool",
 ]
 
 [[package]]
@@ -3708,61 +3708,18 @@ dependencies = [
  "serde_bytes",
  "serde_json",
  "sha-1",
- "tarantool-proc 3.1.0",
+ "tarantool-proc",
  "tempfile",
  "tester",
  "thiserror",
  "time",
  "time-macros",
- "tlua 3.1.0",
+ "tlua",
  "tokio",
  "uuid 0.8.2",
  "va_list",
 ]
 
-[[package]]
-name = "tarantool"
-version = "5.0.0"
-source = "git+https://github.com/picodata/tarantool-module?rev=dbebcc0#dbebcc0aace0264b7ba9569e9a8a672b972c95ea"
-dependencies = [
- "async-trait",
- "base64 0.13.1",
- "bitflags 1.3.2",
- "dec",
- "dlopen",
- "futures",
- "libc",
- "linkme 0.2.10",
- "log",
- "once_cell",
- "refpool",
- "rmp",
- "rmp-serde",
- "rmpv",
- "serde",
- "serde_bytes",
- "serde_json",
- "sha-1",
- "tarantool-proc 3.0.0",
- "thiserror",
- "time",
- "tlua 3.1.0 (git+https://github.com/picodata/tarantool-module?rev=dbebcc0)",
- "uuid 0.8.2",
- "va_list",
-]
-
-[[package]]
-name = "tarantool-proc"
-version = "3.0.0"
-source = "git+https://github.com/picodata/tarantool-module?rev=dbebcc0#dbebcc0aace0264b7ba9569e9a8a672b972c95ea"
-dependencies = [
- "darling",
- "proc-macro-error",
- "proc-macro2 1.0.80",
- "quote 1.0.36",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "tarantool-proc"
 version = "3.1.0"
@@ -3935,33 +3892,12 @@ dependencies = [
  "serde",
  "tester",
  "thiserror",
- "tlua-derive 0.2.0",
-]
-
-[[package]]
-name = "tlua"
-version = "3.1.0"
-source = "git+https://github.com/picodata/tarantool-module?rev=dbebcc0#dbebcc0aace0264b7ba9569e9a8a672b972c95ea"
-dependencies = [
- "libc",
- "serde",
- "thiserror",
- "tlua-derive 0.2.0 (git+https://github.com/picodata/tarantool-module?rev=dbebcc0)",
-]
-
-[[package]]
-name = "tlua-derive"
-version = "0.2.0"
-dependencies = [
- "proc-macro2 1.0.80",
- "quote 1.0.36",
- "syn 1.0.109",
+ "tlua-derive",
 ]
 
 [[package]]
 name = "tlua-derive"
 version = "0.2.0"
-source = "git+https://github.com/picodata/tarantool-module?rev=dbebcc0#dbebcc0aace0264b7ba9569e9a8a672b972c95ea"
 dependencies = [
  "proc-macro2 1.0.80",
  "quote 1.0.36",
diff --git a/picoplugin/Cargo.toml b/picoplugin/Cargo.toml
index 1fc61f9e25..a6840a10d9 100644
--- a/picoplugin/Cargo.toml
+++ b/picoplugin/Cargo.toml
@@ -9,10 +9,14 @@ crate-type = ["lib"]
 
 [dependencies]
 linkme = "0.3.14"
-tarantool = { git = "https://github.com/picodata/tarantool-module", rev = "dbebcc0" }
 gensym = "0.1.0"
 abi_stable = "0.11.2"
-picoplugin_gen = {path = "../picoplugin_gen"}
+picoplugin_gen = { path = "../picoplugin_gen" }
 serde = "1.0.197"
 rmp = "0.8.11"
-rmp-serde = "=1.1.0"
\ No newline at end of file
+rmp-serde = "=1.1.0"
+
+[dependencies.tarantool]
+path = "./../tarantool/tarantool"
+version = "5.0"
+features = ["picodata", "test"]
diff --git a/picoplugin_gen/Cargo.toml b/picoplugin_gen/Cargo.toml
index 81d3e4b9c9..ee2b7254e6 100644
--- a/picoplugin_gen/Cargo.toml
+++ b/picoplugin_gen/Cargo.toml
@@ -8,7 +8,12 @@ license-file = "./../LICENSE"
 proc-macro = true
 
 [dependencies]
-syn = { version = "^1.0", features = [ "full", "extra-traits" ] }
+syn = { version = "^1.0", features = ["full", "extra-traits"] }
 quote = "^1.0"
 proc-macro2 = "^1.0"
-tarantool = { git = "https://github.com/picodata/tarantool-module", rev = "dbebcc0" }
+
+[dependencies.tarantool]
+path = "./../tarantool/tarantool"
+version = "5.0"
+features = ["picodata", "test"]
+
-- 
GitLab