Skip to content

Updated OSx and SPP submodules #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brickpop merged 2 commits into from
Jun 1, 2026
Merged

Updated OSx and SPP submodules #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
370e062
Updated OSx submodule
brickpop May 28, 2026
7aa8bfa
Updated dependencies
brickpop Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
[submodule "lib/osx"]
path = lib/osx
url = https://github.com/aragon/osx
[submodule "lib/osx-commons"]
path = lib/osx-commons
url = https://github.com/aragon/osx-commons
[submodule "lib/admin-plugin"]
path = lib/admin-plugin
url = https://github.com/aragon/admin-plugin
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,10 @@ forge install aragon/protocol-factory
Given that this repository already depends on OSx, you may want to replace the existing `remappings.txt` entry and use the OSx path provided by `protocol-factory` itself.

```diff
-@aragon/osx/=lib/osx/packages/contracts/src/
-@aragon/osx/=lib/osx/src/

+@aragon/protocol-factory/=lib/protocol-factory/
+@aragon/osx/=lib/protocol-factory/lib/osx/packages/contracts/src/
+@aragon/osx/=lib/protocol-factory/lib/osx/src/
```

#### The simplest example
Expand Down
4 changes: 2 additions & 2 deletions docs/modules/ROOT/pages/osx-local-testing.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ forge install aragon/protocol-factory
Given that this repository already depends on OSx, you may want to replace the existing `remappings.txt` entry and use the OSx path provided by `protocol-factory` itself.

```
-@aragon/osx/=lib/osx/packages/contracts/src/
-@aragon/osx/=lib/osx/src/

+@aragon/protocol-factory/=lib/protocol-factory/
+@aragon/osx/=lib/protocol-factory/lib/osx/packages/contracts/src/
+@aragon/osx/=lib/protocol-factory/lib/osx/src/
```

=== The simplest example
Expand Down
2 changes: 1 addition & 1 deletion lib/just-foundry
Open in desktop
Submodule just-foundry updated 1 files
+4 −3 justfile
2 changes: 1 addition & 1 deletion lib/osx
Open in desktop
Submodule osx updated 329 files
1 change: 0 additions & 1 deletion lib/osx-commons
Open in desktop
Submodule osx-commons deleted from 7a6dc5
2 changes: 1 addition & 1 deletion lib/staged-proposal-processor-plugin
Open in desktop
Submodule staged-proposal-processor-plugin updated 7 files
+0 −3 .gitmodules
+1 −1 lib/osx
+0 −1 lib/osx-commons
+2 −2 remappings.txt
+1 −3 test/fork/upgradeV1_1ToV1_2.t.sol
+1 −3 test/unit/sppRuleCondition/isGranted/isGranted.t.sol
+27 −0 test/utils/AddressCheckConditionMock.sol
4 changes: 2 additions & 2 deletions remappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/

@aragon/osx/=lib/osx/packages/contracts/src/
@aragon/osx-commons-contracts/=lib/osx-commons/contracts/
@aragon/osx/=lib/osx/src/
@aragon/osx-commons-contracts/src/=lib/osx/src/common/
@aragon/admin-plugin/=lib/admin-plugin/packages/contracts/src/
@aragon/multisig-plugin/=lib/multisig-plugin/packages/contracts/src/
@aragon/token-voting-plugin/=lib/token-voting-plugin/src/
Expand Down
Loading