From 5029bb2661ef2cdcf4d30f1bdaa0a49aa21f4f8f Mon Sep 17 00:00:00 2001 From: Popa Vlad Date: Sun, 28 May 2023 19:19:25 +0300 Subject: [PATCH 1/3] Upgrade the branches on submodules --- .gitmodules | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitmodules b/.gitmodules index c96816e05..a07bbcf85 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,30 +1,40 @@ [submodule "packages/contracts/lib/Uniswap/v2-periphery"] path = packages/contracts/lib/Uniswap/v2-periphery url = https://github.com/Uniswap/v2-periphery.git + branch = master [submodule "packages/contracts/lib/Uniswap/v2-core"] path = packages/contracts/lib/Uniswap/v2-core url = https://github.com/Uniswap/v2-core.git + branch = master [submodule "packages/contracts/lib/solidity-linked-list"] path = packages/contracts/lib/solidity-linked-list url = https://github.com/vittominacori/solidity-linked-list + branch = master [submodule "packages/contracts/lib/openzeppelin-contracts"] path = packages/contracts/lib/openzeppelin-contracts url = https://github.com/OpenZeppelin/openzeppelin-contracts + branch = master [submodule "packages/contracts/lib/forge-std"] path = packages/contracts/lib/forge-std url = https://github.com/foundry-rs/forge-std + branch = master [submodule "packages/contracts/lib/abdk-libraries-solidity"] path = packages/contracts/lib/abdk-libraries-solidity url = https://github.com/abdk-consulting/abdk-libraries-solidity + branch = master [submodule "packages/contracts/lib/operator-filter-registry"] path = packages/contracts/lib/operator-filter-registry url = https://github.com/ProjectOpenSea/operator-filter-registry + branch = main [submodule "packages/contracts/lib/Uniswap/v3-periphery"] path = packages/contracts/lib/Uniswap/v3-periphery url = https://github.com/Uniswap/v3-periphery.git + branch = main [submodule "packages/contracts/packages/contracts/lib/Uniswap/v2-periphery"] path = packages/contracts/packages/contracts/lib/Uniswap/v2-periphery url = https://github.com/Uniswap/v2-periphery.git + branch = master [submodule "packages/contracts/packages/contracts/lib/Uniswap/v2-core"] path = packages/contracts/packages/contracts/lib/Uniswap/v2-core url = https://github.com/Uniswap/v2-core + branch = master From fd10081d10806b8bdb26ff76b32227d2007c4c61 Mon Sep 17 00:00:00 2001 From: Popa Vlad Date: Mon, 29 May 2023 13:10:28 +0300 Subject: [PATCH 2/3] Update tags --- .gitmodules | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index a07bbcf85..15353dbfb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,40 +1,40 @@ [submodule "packages/contracts/lib/Uniswap/v2-periphery"] path = packages/contracts/lib/Uniswap/v2-periphery url = https://github.com/Uniswap/v2-periphery.git - branch = master + tag = v1.0.0-beta.0 [submodule "packages/contracts/lib/Uniswap/v2-core"] path = packages/contracts/lib/Uniswap/v2-core url = https://github.com/Uniswap/v2-core.git - branch = master + tag = v1.0.1 [submodule "packages/contracts/lib/solidity-linked-list"] path = packages/contracts/lib/solidity-linked-list url = https://github.com/vittominacori/solidity-linked-list - branch = master + tag = v5.1.0 [submodule "packages/contracts/lib/openzeppelin-contracts"] path = packages/contracts/lib/openzeppelin-contracts url = https://github.com/OpenZeppelin/openzeppelin-contracts - branch = master + tag = v4.9.0 [submodule "packages/contracts/lib/forge-std"] path = packages/contracts/lib/forge-std url = https://github.com/foundry-rs/forge-std - branch = master + tag = v1.5.6 [submodule "packages/contracts/lib/abdk-libraries-solidity"] path = packages/contracts/lib/abdk-libraries-solidity url = https://github.com/abdk-consulting/abdk-libraries-solidity - branch = master + tag = v3.2 [submodule "packages/contracts/lib/operator-filter-registry"] path = packages/contracts/lib/operator-filter-registry url = https://github.com/ProjectOpenSea/operator-filter-registry - branch = main + tag = v1.4.1 [submodule "packages/contracts/lib/Uniswap/v3-periphery"] path = packages/contracts/lib/Uniswap/v3-periphery url = https://github.com/Uniswap/v3-periphery.git - branch = main + tag = v1.3.0 [submodule "packages/contracts/packages/contracts/lib/Uniswap/v2-periphery"] path = packages/contracts/packages/contracts/lib/Uniswap/v2-periphery url = https://github.com/Uniswap/v2-periphery.git - branch = master + tag = v1.0.0-beta.0 [submodule "packages/contracts/packages/contracts/lib/Uniswap/v2-core"] path = packages/contracts/packages/contracts/lib/Uniswap/v2-core url = https://github.com/Uniswap/v2-core - branch = master + tag = v1.0.1 From 1dedb647c39017685965f690464356ad5912e417 Mon Sep 17 00:00:00 2001 From: Popa Vlad Date: Mon, 29 May 2023 14:40:02 +0300 Subject: [PATCH 3/3] fix: update tags