Skip to content

Commit

Permalink
updated Map dependency name to map7 to avoid conflicts in projects th…
Browse files Browse the repository at this point in the history
…at use other versions
  • Loading branch information
ZhenyaUsenko committed Aug 24, 2023
1 parent fadff9f commit 49778ec
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion mops.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion old_package-set.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion old_vessel.dhall
Original file line number Diff line number Diff line change
@@ -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",
}
2 changes: 1 addition & 1 deletion src/candid.mo
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions src/clone.mo
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/conversion.mo
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/properties.mo
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions src/types.mo
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/upgrade.mo
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions src/workspace.mo
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down

0 comments on commit 49778ec

Please sign in to comment.