Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
mengdaming committed Nov 22, 2023
1 parent 11d3b50 commit 93e2034
Show file tree
Hide file tree
Showing 17 changed files with 1,007 additions and 355 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
with:
submodule-update: true
source-dir: ${{github.workspace}}/cpp
build-dir: ${{github.workspace}}/build
build-dir: ${{github.workspace}}/cpp/build
cc: gcc
cxx: g++
build-type: Release
Expand All @@ -37,9 +37,10 @@ jobs:
with:
submodule-update: true
source-dir: ${{github.workspace}}/cpp
build-dir: ${{github.workspace}}/build
build-dir: ${{github.workspace}}/cpp/build
cc: clang
cxx: clang++
build-options: -DCMAKE_CXX_FLAGS="-stdlib=libc++ -std=c++20"
build-type: Release
run-test: true
ctest-options: "--output-on-failure"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: '1.20'
go-version: '1.21'
- name: Build
working-directory: go
run: go build -v ./...
Expand Down
1 change: 1 addition & 0 deletions ACKNOWLEDGEMENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ This kata uses material from the following third-parties:

* [codingdojo.org katas](https://codingdojo.org/)

* [kata-log.rocks katas](https://kata-log.rocks/)
4 changes: 2 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT License

Copyright (c) 2021 Murex
Copyright (c) 2023 Murex

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.
4 changes: 2 additions & 2 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2022 Murex
# Copyright (c) 2023 Murex
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
Expand All @@ -22,7 +22,7 @@ cmake_minimum_required(VERSION 3.19.3)

project(Kata-BowlingGame CXX)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD 20)
enable_testing()

set_property(GLOBAL PROPERTY USE_FOLDERS ON)
Expand Down
24 changes: 12 additions & 12 deletions cpp/GETTING_STARTED.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,28 @@
- macOS, Linux or Windows
- [git](https://git-scm.com/) client
- [curl](https://curl.se/download.html) command line utility
- a working build environment (Visual Studio, GCC or Clang) for C++ 17
- a working build environment (Visual Studio, GCC or Clang) for C++ 20
<details><summary>Details</summary>

- **C++ Version**

By default, the kata's CMake file is referencing C++ version 17. We also tested and
compiled the code with versions 11 and 14.

To use a version other than 17, simply modify the line below in the [CMake](CMakeLists.txt)
configuration file to reference 11 or 14.
By default, the kata's CMake file is referencing C++ version 20. We also tested and
compiled the code with versions 11, 14 and 17.

To use a version other than 20, simply modify the line below in the [CMake](CMakeLists.txt)
configuration file to reference 11, 14 or 17.

```text
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD 20)
```

- **Compiler**

When running on Windows, the code is compiled with [MSVC](https://docs.microsoft.com/en-us/cpp/build/reference/compiling-a-c-cpp-program?view=msvc-160).

On other platforms, the script uses the default C++ compiler set on the machine.
Both GCC and Clang are supported.

</details>

## Getting ready
Expand All @@ -50,7 +50,7 @@ This setup script does the following:
- Download a copy of cmake compatible with your platform.
- Download the dependencies required to build and test the kata (such as GoogleTest).
- Generate the solution file ***Kata-BowlingGame.sln*** for **Visual Studio 2017** on Windows,
or the project file ***Kata-BowlingGame.xcodeproj*** for **Xcode** on macOS.
or the project file ***Kata-BowlingGame.xcodeproj*** for **Xcode** on macOS.
- Run an initial build and test of the kata to ensure that everything is set up properly.

```shell
Expand Down Expand Up @@ -349,13 +349,13 @@ Once the project is opened in Xcode, select `Product` / `Scheme` / `Kata-Bowling
> TCR takes care of building the project and running the tests.
> For this reason you should not build and test the project from Xcode when TCR is running.
> The only thing you should pay attention to is when saving your changes, which will trigger TCR's build and test.
>
>
#### 2. Open a terminal

You can use any terminal application available on macOS.

If you're not familiar with terminals, macOS comes with a built-in terminal application available under
If you're not familiar with terminals, macOS comes with a built-in terminal application available under
`Applications` > `Utilities` > `Terminal.app`.

#### 3. Launch TCR
Expand Down
Loading

0 comments on commit 93e2034

Please sign in to comment.