Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
mengdaming committed May 20, 2024
1 parent 9542604 commit 1bdbaed
Show file tree
Hide file tree
Showing 16 changed files with 337 additions and 1,070 deletions.
746 changes: 19 additions & 727 deletions .gitignore

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions cpp/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# cpp downloaded or generated stuff

**/.cmake/
**/build/
CMakeLists.txt.user
24 changes: 12 additions & 12 deletions cpp/.tcr/toolchain/cmake-kata.yml
Original file line number Diff line number Diff line change
@@ -1,51 +1,51 @@
build:
- os: [darwin]
arch: [amd64]
command: build/cmake/cmake-macos-universal/CMake.app/Contents/bin/cmake
command: .cmake/cmake-macos-universal/CMake.app/Contents/bin/cmake
arguments: [--build, build, --config, Debug]
- os: [darwin]
arch: [arm64]
command: build/cmake/cmake-macos-universal/CMake.app/Contents/bin/cmake
command: .cmake/cmake-macos-universal/CMake.app/Contents/bin/cmake
arguments: [--build, build, --config, Debug]
- os: [linux]
arch: [amd64]
command: build/cmake/cmake-linux-x86_64/bin/cmake
command: .cmake/cmake-linux-x86_64/bin/cmake
arguments: [--build, build, --config, Debug]
- os: [linux]
arch: [arm64]
command: build/cmake/cmake-linux-aarch64/bin/cmake
command: .cmake/cmake-linux-aarch64/bin/cmake
arguments: [--build, build, --config, Debug]
- os: [windows]
arch: ["386"]
command: build\cmake\cmake-windows-i386\bin\cmake.exe
command: .cmake\cmake-windows-i386\bin\cmake.exe
arguments: [--build, build, --config, Debug]
- os: [windows]
arch: [amd64]
command: build\cmake\cmake-windows-x86_64\bin\cmake.exe
command: .cmake\cmake-windows-x86_64\bin\cmake.exe
arguments: [--build, build, --config, Debug]
test:
- os: [darwin]
arch: [amd64]
command: build/cmake/cmake-macos-universal/CMake.app/Contents/bin/ctest
command: .cmake/cmake-macos-universal/CMake.app/Contents/bin/ctest
arguments: [--output-on-failure, --test-dir, build, --build-config, Debug]
- os: [darwin]
arch: [arm64]
command: build/cmake/cmake-macos-universal/CMake.app/Contents/bin/ctest
command: .cmake/cmake-macos-universal/CMake.app/Contents/bin/ctest
arguments: [--output-on-failure, --test-dir, build, --build-config, Debug]
- os: [linux]
arch: [amd64]
command: build/cmake/cmake-linux-x86_64/bin/ctest
command: .cmake/cmake-linux-x86_64/bin/ctest
arguments: [--output-on-failure, --test-dir, build, --build-config, Debug]
- os: [linux]
arch: [arm64]
command: build/cmake/cmake-linux-aarch64/bin/ctest
command: .cmake/cmake-linux-aarch64/bin/ctest
arguments: [--output-on-failure, --test-dir, build, --build-config, Debug]
- os: [windows]
arch: ["386"]
command: build\cmake\cmake-windows-i386\bin\ctest.exe
command: .cmake\cmake-windows-i386\bin\ctest.exe
arguments: [--output-on-failure, --test-dir, build, --build-config, Debug]
- os: [windows]
arch: [amd64]
command: build\cmake\cmake-windows-x86_64\bin\ctest.exe
command: .cmake\cmake-windows-x86_64\bin\ctest.exe
arguments: [--output-on-failure, --test-dir, build, --build-config, Debug]
test-result-dir: build/test-results
68 changes: 0 additions & 68 deletions cpp/cpp_easy_setup.bat

This file was deleted.

21 changes: 10 additions & 11 deletions cpp/cpp_easy_setup.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env sh
#
# Copyright (c) 2023 Murex
# Copyright (c) 2024 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 Down Expand Up @@ -48,7 +48,7 @@ MINGW64_NT-*)
cmake_bin_dir="bin"
cmake="cmake.exe"
ctest="ctest.exe"
cmake_generator_options="-G \"Visual Studio 16 2019\""
cmake_generator_options="-G \"Visual Studio 17 2022\""
;;
*)
echo "os $(uname -s) is currently not supported."
Expand All @@ -59,19 +59,18 @@ esac
base_dir=$(dirname -- "$0")
cd "${base_dir}"

cmake_version="3.29.2"
cmake_version="3.29.3"
cmake_expected_dir="cmake-${cmake_version}-${os}-${arch}"
cmake_expected_archive_file="${cmake_expected_dir}.${archive_extension}"
cmake_archive_url="http://github.com/Kitware/CMake/releases/download/v${cmake_version}/${cmake_expected_archive_file}"
cmake_home="cmake-${os}-${arch}"

build_dir="build"
mkdir -p "${build_dir}"
cd "${build_dir}"

cmake_build_dir="cmake"
mkdir -p "${cmake_build_dir}"
cd "${cmake_build_dir}"
cmake_dir=".cmake"
mkdir -p "${cmake_dir}"
cd "${cmake_dir}"

if ! [ -f "${cmake_expected_archive_file}" ]
then
Expand All @@ -98,8 +97,8 @@ fi

cd ..

cmake_bin_path="${cmake_build_dir}/${cmake_home}/${cmake_bin_dir}"
cmake_bin_path="${cmake_dir}/${cmake_home}/${cmake_bin_dir}"

eval ${cmake_bin_path}/${cmake} "${cmake_generator_options}" -S .. -B .
${cmake_bin_path}/${cmake} --build . --config Debug
${cmake_bin_path}/${ctest} --output-on-failure -C Debug
eval ${cmake_bin_path}/${cmake} "${cmake_generator_options}" -S . -B "${build_dir}"
${cmake_bin_path}/${cmake} --build "${build_dir}" --config Debug
${cmake_bin_path}/${ctest} --test-dir "${build_dir}" --output-on-failure --build-config Debug
3 changes: 3 additions & 0 deletions go/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# go downloaded or generated stuff

**/_test_results/
9 changes: 9 additions & 0 deletions java/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# java downloaded or generated stuff

**/.gradle/
**/build/
**/.mvn/wrapper/maven-wrapper.jar
**/target/
.project
.classpath
*.class
2 changes: 1 addition & 1 deletion java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
// Guava utility package
implementation group: 'com.google.guava', name: 'guava', version: '33.1.0-jre'
implementation group: 'com.google.guava', name: 'guava', version: '33.2.0-jre'
}

test {
Expand Down
8 changes: 4 additions & 4 deletions java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.1.0-jre</version>
<version>33.2.0-jre</version>
</dependency>

</dependencies>
Expand All @@ -51,7 +51,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-wrapper-plugin</artifactId>
<version>3.3.0</version>
<version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -89,7 +89,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>3.1.1</version>
<version>3.1.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -99,7 +99,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.1</version>
<version>3.1.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
8 changes: 8 additions & 0 deletions python/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# python downloaded or generated stuff

**/pytest/
**/__pycache__/
**/*.egg-info/
**/venv/
**/.venv/
*.pyc
4 changes: 2 additions & 2 deletions python/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pytest == 7.0.1; python_version < '3.7'
pytest == 7.4.4; python_version in '3.7'
pytest == 8.1.1; python_version >= '3.8'
pytest == 8.2.1; python_version >= '3.8'
pytest-parametrization == 2022.2.1
mypy == 0.971; python_version < '3.7'
mypy == 1.4.1; python_version in '3.7'
mypy == 1.9.0; python_version >= '3.8'
mypy == 1.10.0; python_version >= '3.8'
Loading

0 comments on commit 1bdbaed

Please sign in to comment.