Skip to content

Commit 2e3495d

Browse files
authored
Merge pull request #13 from feltech/work/updateDeps
Update to latest OpenAssetIO `main`
2 parents 861e193 + b6f41a1 commit 2e3495d

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
path: ./openassetio-mediacreation-build
8282

8383
- name: "Get Submodules"
84-
run: git submodule update --init --recursive OpenAssetIO
84+
run: git submodule update --init --recursive --remote OpenAssetIO
8585

8686
- name: Configure CMake build
8787
run: >
@@ -118,7 +118,7 @@ jobs:
118118
python -m pip install git+https://github.com/OpenAssetIO/OpenAssetIO-TraitGen
119119
120120
- name: "Get Submodules"
121-
run: git submodule update --init --recursive OpenAssetIO-MediaCreation
121+
run: git submodule update --init --recursive --remote OpenAssetIO-MediaCreation
122122

123123
- name: Configure CMake build
124124
run: >
@@ -146,7 +146,7 @@ jobs:
146146
python -m pip install git+https://github.com/OpenAssetIO/OpenAssetIO-TraitGen
147147
148148
- name: "Get Submodules"
149-
run: git submodule update --init --recursive
149+
run: git submodule update --init --recursive --remote
150150

151151
- name: Configure CMake build
152152
run: >

RELEASE_NOTES.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ Release Notes
44
v1.0.0-alpha.x
55
--------------
66

7+
### Breaking Changes
8+
9+
* Update to use non-deprecated `TraitsData` path/namespace.
10+
[#13](https://github.com/OpenAssetIO/OpenAssetIO-Test-CMake/pull/13)
11+
712
### New Features
813

914
* OpenAssetIO-MediaCreation integrated as a dependency, with tests.

src/test.core.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// SPDX-License-Identifier: Apache-2.0
22
// Copyright 2022 The Foundry Visionmongers Ltd
33

4-
#include <openassetio/TraitsData.hpp>
4+
#include <openassetio/trait/TraitsData.hpp>
55

66
int main() {
7-
auto traits = openassetio::TraitsData::make();
7+
auto traits = openassetio::trait::TraitsData::make();
88
traits->setTraitProperty("a", "b", openassetio::Str{"c"});
99
}

0 commit comments

Comments
 (0)