Skip to content
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

Merge feature into main branch #1093

Merged
merged 8 commits into from
Oct 23, 2024
Merged

Merge feature into main branch #1093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ae73750
Update dependency "cpplint" to version 2.0 or greater.
michael-rapp Oct 23, 2024
8352bbb
Update dependency "mdformat-myst" to version 0.2 or greater.
michael-rapp Oct 23, 2024
ad74fec
Update dependency "meson" to version 1.6 or greater.
michael-rapp Oct 23, 2024
5e09996
Merge pull request #1090 from mrapp-ke/update-dependencies
michael-rapp Oct 23, 2024
f2c2d67
[Bot] Merge bugfix into feature branch.
michael-rapp Oct 23, 2024
5db7d7a
Merge branch 'feature' into merge-bugfix
michael-rapp Oct 23, 2024
734eca8
Merge pull request #1091 from mrapp-ke/merge-bugfix
boomer-merge-bot[bot] Oct 23, 2024
5cbd447
[Bot] Merge feature into main branch.
boomer-merge-bot[bot] Oct 23, 2024
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
2 changes: 1 addition & 1 deletion .version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.12.0
1.0.0
1 change: 1 addition & 0 deletions CPPLINT.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
filter=-build/include_subdir
filter=-build/include_order
filter=-build/include_what_you_use
filter=-build/c++11

filter=-legal/copyright
Expand Down
2 changes: 1 addition & 1 deletion cpp/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
project('mlrl', default_options : ['cpp_std=c++20', 'buildtype=release', 'werror=true'])
project('mlrl', meson_version : '>=1.1', default_options : ['cpp_std=c++20', 'buildtype=release', 'werror=true'])

subprojects = get_option('subprojects')

Expand Down
2 changes: 1 addition & 1 deletion cpp/subprojects/common/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
project('common', 'cpp')
project('common', 'cpp', meson_version : '>=1.1')

# Source files
source_files = [
Expand Down
2 changes: 1 addition & 1 deletion python/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
project('mlrl-python', default_options : ['cpp_std=c++17', 'buildtype=release'])
project('mlrl-python', meson_version : '>=1.1', default_options : ['cpp_std=c++17', 'buildtype=release'])

subprojects = get_option('subprojects')

Expand Down
6 changes: 3 additions & 3 deletions scons/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
build >= 1.2, < 1.3
cpplint >= 1.6, < 1.7
cpplint >= 2.0, < 2.1
clang-format >= 19.1, < 19.2
cython >= 3.0, < 3.1
isort >= 5.13, < 5.14
mdformat >= 0.7, < 0.8
mdformat-myst >= 0.1, < 0.2
meson >= 1.5, < 1.6
mdformat-myst >= 0.2, < 0.3
meson >= 1.6, < 1.7
ninja >= 1.11, < 1.12
pylint >= 3.3, < 3.4
setuptools
Expand Down
Loading