Skip to content

Commit 78c9ff4

Browse files
authored
fix(forge): bump compilers to fix remapping sol file (#11184)
* Bump compilers 0.18.2 * Add test
1 parent 40ac685 commit 78c9ff4

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

Cargo.lock

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ foundry-linking = { path = "crates/linking" }
204204

205205
# solc & compilation utilities
206206
foundry-block-explorers = { version = "0.20.0", default-features = false }
207-
foundry-compilers = { version = "0.18.1", default-features = false }
207+
foundry-compilers = { version = "0.18.2", default-features = false }
208208
foundry-fork-db = "0.16"
209209
solang-parser = { version = "=0.3.9", package = "foundry-solang-parser" }
210210
solar-ast = { version = "=0.1.5", default-features = false }

crates/forge/tests/cli/config.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -663,6 +663,8 @@ forgetest_init!(can_prioritise_closer_lib_remappings, |prj, cmd| {
663663
// remapping.
664664
// See <https://github.com/foundry-rs/foundry/issues/9146>
665665
// Test that
666+
// - single file remapping is properly added, see
667+
// <https://github.com/foundry-rs/foundry/issues/6706> and <https://github.com/foundry-rs/foundry/issues/8499>
666668
// - project defined `@openzeppelin/contracts` remapping is added
667669
// - library defined `@openzeppelin/contracts-upgradeable` remapping is added
668670
// - library defined `@openzeppelin/contracts/upgradeable` remapping is not added as it conflicts
@@ -672,6 +674,7 @@ forgetest_init!(can_prioritise_project_remappings, |prj, cmd| {
672674
let mut config = cmd.config();
673675
// Add `@utils/` remapping in project config.
674676
config.remappings = vec![
677+
Remapping::from_str("@utils/libraries/Contract.sol=src/Contract.sol").unwrap().into(),
675678
Remapping::from_str("@utils/=src/").unwrap().into(),
676679
Remapping::from_str("@openzeppelin/contracts=lib/openzeppelin-contracts/").unwrap().into(),
677680
];
@@ -699,6 +702,7 @@ forgetest_init!(can_prioritise_project_remappings, |prj, cmd| {
699702

700703
cmd.args(["remappings", "--pretty"]).assert_success().stdout_eq(str![[r#"
701704
Global:
705+
- @utils/libraries/Contract.sol=src/Contract.sol
702706
- @utils/=src/
703707
- @openzeppelin/contracts/=lib/openzeppelin-contracts/
704708
- @openzeppelin/contracts-upgradeable/=lib/dep1/lib/openzeppelin-upgradeable/

0 commit comments

Comments
 (0)