From 49778ecd876c9bbb4b623e28a38ce556bc694993 Mon Sep 17 00:00:00 2001
From: ZhenyaUsenko <98zusenko@gmail.com>
Date: Thu, 24 Aug 2023 11:48:01 +0300
Subject: [PATCH] updated Map dependency name to map7 to avoid conflicts in
 projects that use other versions

---
 mops.toml             | 2 +-
 old_package-set.dhall | 2 +-
 old_vessel.dhall      | 2 +-
 src/candid.mo         | 2 +-
 src/clone.mo          | 4 ++--
 src/conversion.mo     | 2 +-
 src/properties.mo     | 2 +-
 src/types.mo          | 4 ++--
 src/upgrade.mo        | 2 +-
 src/workspace.mo      | 4 ++--
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/mops.toml b/mops.toml
index 603c75f..b5ba100 100644
--- a/mops.toml
+++ b/mops.toml
@@ -4,7 +4,7 @@ matchers = "https://github.com/kritzcreek/motoko-matchers#v1.3.0"
 candid = "https://github.com/gekctek/motoko_candid#v1.0.1"
 xtendedNumbers = "https://github.com/gekctek/motoko_numbers#v1.0.2"
 stablebuffer = "https://github.com/skilesare/StableBuffer#v0.2.0"
-map = "https://github.com/ZhenyaUsenko/motoko-hash-map#v7.0.0"
+map7 = "https://github.com/ZhenyaUsenko/motoko-hash-map#v7.0.0"
 candy_0_1_12 = "https://github.com/icdevs/candy_library#v0.1.12"
 
 [package]
diff --git a/old_package-set.dhall b/old_package-set.dhall
index df8c71d..15f286b 100644
--- a/old_package-set.dhall
+++ b/old_package-set.dhall
@@ -27,7 +27,7 @@ let
       , dependencies = [ "base"]
       },
       { name = "base", repo = "https://github.com/dfinity/motoko-base.git", version = "moc-0.8.1", dependencies = []: List Text },
-      { name = "map"
+      { name = "map7"
       , repo = "https://github.com/ZhenyaUsenko/motoko-hash-map"
       , version = "v7.0.0"
       , dependencies = [ "base"]
diff --git a/old_vessel.dhall b/old_vessel.dhall
index 9c2f3cd..248dfcb 100644
--- a/old_vessel.dhall
+++ b/old_vessel.dhall
@@ -1,4 +1,4 @@
 {
-  dependencies = [ "base", "matchers",  "candid", "xtendedNumbers", "stablebuffer", "map","candy_0_1_12"],
+  dependencies = [ "base", "matchers",  "candid", "xtendedNumbers", "stablebuffer", "map7","candy_0_1_12"],
      compiler = Some "0.8.1",
 }
diff --git a/src/candid.mo b/src/candid.mo
index f14d2fc..a425ee5 100644
--- a/src/candid.mo
+++ b/src/candid.mo
@@ -18,7 +18,7 @@ import Blob "mo:base/Blob";
 import Principal "mo:base/Principal";
 import Text "mo:base/Text";
 
-import Map "mo:map/Map";
+import Map "mo:map7/Map";
 
 import Types "types";
 import CandyHex "hex";
diff --git a/src/clone.mo b/src/clone.mo
index bcd5019..e6007bb 100644
--- a/src/clone.mo
+++ b/src/clone.mo
@@ -16,8 +16,8 @@
 import Types "types";
 import Array "mo:base/Array";
 import StableBuffer "mo:stablebuffer/StableBuffer";
-import Map "mo:map/Map";
-import Set "mo:map/Set";
+import Map "mo:map7/Map";
+import Set "mo:map7/Set";
 
 module {
 
diff --git a/src/conversion.mo b/src/conversion.mo
index d97d712..6a30d8d 100644
--- a/src/conversion.mo
+++ b/src/conversion.mo
@@ -40,7 +40,7 @@ import Types "types";
 import Hex "hex";
 import Properties "properties";
 import StableBuffer "mo:stablebuffer/StableBuffer";
-import Map "mo:map/Map";
+import Map "mo:map7/Map";
 
 
 module {
diff --git a/src/properties.mo b/src/properties.mo
index 89f40a9..f996a8f 100644
--- a/src/properties.mo
+++ b/src/properties.mo
@@ -15,7 +15,7 @@
 /// manipulating classes.
 
 import Buffer "mo:base/Buffer";
-import Map "mo:map/Map";
+import Map "mo:map7/Map";
 import Text "mo:base/Text";
 import Array "mo:base/Array";
 import Result "mo:base/Result";
diff --git a/src/types.mo b/src/types.mo
index 136a3be..e2fe475 100644
--- a/src/types.mo
+++ b/src/types.mo
@@ -20,8 +20,8 @@ import Buffer "mo:base/Buffer";
 import StableBuffer "mo:stablebuffer/StableBuffer";
 import Array "mo:base/Array";
 import Iter "mo:base/Iter";
-import Map "mo:map/Map";
-import Set "mo:map/Set";
+import Map "mo:map7/Map";
+import Set "mo:map7/Set";
 import Text "mo:base/Text";
 import Blob "mo:base/Blob";
 import Nat "mo:base/Nat";
diff --git a/src/upgrade.mo b/src/upgrade.mo
index ac2cd74..c0f8244 100644
--- a/src/upgrade.mo
+++ b/src/upgrade.mo
@@ -18,7 +18,7 @@ import CandyTypes "types";
 import Array "mo:base/Array";
 import Iter "mo:base/Iter";
 import Buffer "mo:base/Buffer";
-import Map "mo:map/Map";
+import Map "mo:map7/Map";
 
 module {
 
diff --git a/src/workspace.mo b/src/workspace.mo
index ab6cf47..74643e7 100644
--- a/src/workspace.mo
+++ b/src/workspace.mo
@@ -18,8 +18,8 @@
 import Array "mo:base/Array";
 import Buffer "mo:base/Buffer";
 import StableBuffer "mo:stablebuffer/StableBuffer";
-import Map "mo:map/Map";
-import Set "mo:map/Set";
+import Map "mo:map7/Map";
+import Set "mo:map7/Set";
 
 import Int "mo:base/Int";
 import Iter "mo:base/Iter";