Update dependencies

murex · Apr 23, 2024 · 9542604 · 9542604
1 parent 93d496b
commit 9542604
Show file tree

Hide file tree

Showing 17 changed files with 238 additions and 218 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22'
       - name: Build
         working-directory: go
         run: go build -v ./...

diff --git a/cpp/GETTING_STARTED.md b/cpp/GETTING_STARTED.md
@@ -377,14 +377,17 @@ Refer to [Using TCR](#using-tcr) section for additional details about TCR and av
 
 Here are the main shortcuts available once TCR utility is running:
 
-| Shortcut  | Description                                   |
-|-----------|-----------------------------------------------|
-| `?`       | List available options                        |
-| `d` / `D` | Enter driver role (from main menu)            |
-| `n` / `N` | Enter navigator role (from main menu)         |
-| `q` / `Q` | Quit current role - Quit TCR (from main menu) |
-| `t` / `T` | Query timer status (from driver role only)    |
-| `p` / `P` | Toggle on/off git auto-push (from main menu)  |
+| Shortcut  | Description                                  |
+|-----------|----------------------------------------------|
+| `o` / `O` | Open in browser (with `web` subcommand only) |
+| `d` / `D` | Enter driver role                            |
+| `n` / `N` | Enter navigator role                         |
+| `t` / `T` | Query timer status                           |
+| `p` / `P` | Toggle on/off git auto-push                  |
+| `l` / `L` | Pull from remote                             |
+| `s` / `S` | Push to remote                               |
+| `q` / `Q` | Quit current role / Quit TCR                 |
+| `?`       | List available options                       |
 
 ### Additional Details
 

diff --git a/cpp/cmake/CPM.cmake b/cpp/cmake/CPM.cmake
@@ -42,7 +42,7 @@ if(NOT COMMAND cpm_message)
   endfunction()
 endif()
 
-set(CURRENT_CPM_VERSION 0.38.6)
+set(CURRENT_CPM_VERSION 0.39.0)
 
 get_filename_component(CPM_CURRENT_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}" REALPATH)
 if(CPM_DIRECTORY)
@@ -99,6 +99,12 @@ macro(cpm_set_policies)
     cmake_policy(SET CMP0135 NEW)
     set(CMAKE_POLICY_DEFAULT_CMP0135 NEW)
   endif()
+
+  # treat relative git repository paths as being relative to the parent project's remote
+  if(POLICY CMP0150)
+    cmake_policy(SET CMP0150 NEW)
+    set(CMAKE_POLICY_DEFAULT_CMP0150 NEW)
+  endif()
 endmacro()
 cpm_set_policies()
 
@@ -294,12 +300,6 @@ function(CPMFindPackage)
     return()
   endif()
 
-  cpm_check_if_package_already_added(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}")
-  if(CPM_PACKAGE_ALREADY_ADDED)
-    cpm_export_variables(${CPM_ARGS_NAME})
-    return()
-  endif()
-
   cpm_find_package(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" ${CPM_ARGS_FIND_PACKAGE_ARGUMENTS})
 
   if(NOT CPM_PACKAGE_FOUND)
@@ -534,6 +534,7 @@ function(CPMAddPackage)
       GIT_SHALLOW
       EXCLUDE_FROM_ALL
       SOURCE_SUBDIR
+      CUSTOM_CACHE_KEY
   )
 
   set(multiValueArgs URL OPTIONS DOWNLOAD_COMMAND)
@@ -704,7 +705,10 @@ function(CPMAddPackage)
     string(TOLOWER ${CPM_ARGS_NAME} lower_case_name)
     set(origin_parameters ${CPM_ARGS_UNPARSED_ARGUMENTS})
     list(SORT origin_parameters)
-    if(CPM_USE_NAMED_CACHE_DIRECTORIES)
+    if(CPM_ARGS_CUSTOM_CACHE_KEY)
+      # Application set a custom unique directory name
+      set(download_directory ${CPM_SOURCE_CACHE}/${lower_case_name}/${CPM_ARGS_CUSTOM_CACHE_KEY})
+    elseif(CPM_USE_NAMED_CACHE_DIRECTORIES)
       string(SHA1 origin_hash "${origin_parameters};NEW_CACHE_STRUCTURE_TAG")
       set(download_directory ${CPM_SOURCE_CACHE}/${lower_case_name}/${origin_hash}/${CPM_ARGS_NAME})
     else()

diff --git a/cpp/cpp_easy_setup.bat b/cpp/cpp_easy_setup.bat
@@ -28,7 +28,7 @@ set CMAKE=cmake.exe
 set CTEST=ctest.exe
 set CMAKE_GENERATOR_OPTIONS=-G "Visual Studio 16 2019"
 
-set CMAKE_VERSION=3.28.1
+set CMAKE_VERSION=3.29.2
 set CMAKE_EXPECTED_DIR=cmake-%CMAKE_VERSION%-%OS%-%ARCH%
 set CMAKE_EXPECTED_ARCHIVE_FILE=%CMAKE_EXPECTED_DIR%.%ARCHIVE_EXTENSION%
 set CMAKE_ARCHIVE_URL="http://github.com/Kitware/CMake/releases/download/v%CMAKE_VERSION%/%CMAKE_EXPECTED_ARCHIVE_FILE%"

diff --git a/cpp/cpp_easy_setup.sh b/cpp/cpp_easy_setup.sh
@@ -59,7 +59,7 @@ esac
 base_dir=$(dirname -- "$0")
 cd "${base_dir}"
 
-cmake_version="3.28.1"
+cmake_version="3.29.2"
 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}"

diff --git a/go/GETTING_STARTED.md b/go/GETTING_STARTED.md
@@ -8,12 +8,12 @@
 - [Go SDK](https://go.dev/dl/)
   <details><summary>Go Version</summary>
 
-  The kata is configured to run with Go version 1.21 by default.
+  The kata is configured to run with Go version 1.22 by default.
 
   To use a different version, simply modify the line below in [go.mod](go.mod).
 
     ```text
-    go 1.21
+    go 1.22
     ```
   </details>
 
@@ -335,14 +335,17 @@ Refer to [Using TCR](#using-tcr) section for additional details about TCR and av
 
 Here are the main shortcuts available once TCR utility is running:
 
-| Shortcut  | Description                                   |
-|-----------|-----------------------------------------------|
-| `?`       | List available options                        |
-| `d` / `D` | Enter driver role (from main menu)            |
-| `n` / `N` | Enter navigator role (from main menu)         |
-| `q` / `Q` | Quit current role - Quit TCR (from main menu) |
-| `t` / `T` | Query timer status (from driver role only)    |
-| `p` / `P` | Toggle on/off git auto-push (from main menu)  |
+| Shortcut  | Description                                  |
+|-----------|----------------------------------------------|
+| `o` / `O` | Open in browser (with `web` subcommand only) |
+| `d` / `D` | Enter driver role                            |
+| `n` / `N` | Enter navigator role                         |
+| `t` / `T` | Query timer status                           |
+| `p` / `P` | Toggle on/off git auto-push                  |
+| `l` / `L` | Pull from remote                             |
+| `s` / `S` | Push to remote                               |
+| `q` / `Q` | Quit current role / Quit TCR                 |
+| `?`       | List available options                       |
 
 ### Additional Details
 

diff --git a/go/go.mod b/go/go.mod
@@ -1,6 +1,6 @@
 module github.com/murex/kata/mars_rover
 
-go 1.21
+go 1.22
 
 require github.com/stretchr/testify v1.9.0
 

diff --git a/java/GETTING_STARTED.md b/java/GETTING_STARTED.md
@@ -274,14 +274,17 @@ Refer to [Using TCR](#using-tcr) section for additional details about TCR and av
 
 Here are the main shortcuts available once TCR utility is running:
 
-| Shortcut  | Description                                   |
-|-----------|-----------------------------------------------|
-| `?`       | List available options                        |
-| `d` / `D` | Enter driver role (from main menu)            |
-| `n` / `N` | Enter navigator role (from main menu)         |
-| `q` / `Q` | Quit current role - Quit TCR (from main menu) |
-| `t` / `T` | Query timer status (from driver role only)    |
-| `p` / `P` | Toggle on/off git auto-push (from main menu)  |
+| Shortcut  | Description                                  |
+|-----------|----------------------------------------------|
+| `o` / `O` | Open in browser (with `web` subcommand only) |
+| `d` / `D` | Enter driver role                            |
+| `n` / `N` | Enter navigator role                         |
+| `t` / `T` | Query timer status                           |
+| `p` / `P` | Toggle on/off git auto-push                  |
+| `l` / `L` | Pull from remote                             |
+| `s` / `S` | Push to remote                               |
+| `q` / `Q` | Quit current role / Quit TCR                 |
+| `?`       | List available options                       |
 
 ### Additional Details
 

diff --git a/java/gradle/wrapper/gradle-wrapper.jar b/java/gradle/wrapper/gradle-wrapper.jar
diff --git a/java/gradle/wrapper/gradle-wrapper.properties b/java/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/java/gradlew.bat b/java/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

diff --git a/java/pom.xml b/java/pom.xml
@@ -51,7 +51,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-wrapper-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -84,7 +84,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.4.1</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/python/GETTING_STARTED.md b/python/GETTING_STARTED.md
@@ -397,14 +397,17 @@ Refer to [Using TCR](#using-tcr) section for additional details about TCR and av
 
 Here are the main shortcuts available once TCR utility is running:
 
-| Shortcut  | Description                                   |
-|-----------|-----------------------------------------------|
-| `?`       | List available options                        |
-| `d` / `D` | Enter driver role (from main menu)            |
-| `n` / `N` | Enter navigator role (from main menu)         |
-| `q` / `Q` | Quit current role - Quit TCR (from main menu) |
-| `t` / `T` | Query timer status (from driver role only)    |
-| `p` / `P` | Toggle on/off git auto-push (from main menu)  |
+| Shortcut  | Description                                  |
+|-----------|----------------------------------------------|
+| `o` / `O` | Open in browser (with `web` subcommand only) |
+| `d` / `D` | Enter driver role                            |
+| `n` / `N` | Enter navigator role                         |
+| `t` / `T` | Query timer status                           |
+| `p` / `P` | Toggle on/off git auto-push                  |
+| `l` / `L` | Pull from remote                             |
+| `s` / `S` | Push to remote                               |
+| `q` / `Q` | Quit current role / Quit TCR                 |
+| `?`       | List available options                       |
 
 ### Additional Details
 

diff --git a/tcr/tcr.sh b/tcr/tcr.sh
@@ -212,7 +212,7 @@ retrieve_tcr_go_exe() {
   version_mismatch=0
   if [ ${file_missing} -eq 0 ]; then
     current_version=$(retrieve_current_tcr_version "${tcr_bin_path}")
-    version_mismatch="$( [ "${current_version}" == "${expected_version}" ]; echo $? )"
+    version_mismatch="$( [ "${current_version}" = "${expected_version}" ]; echo $? )"
   fi
 
   # If the file does not exist or if versions do not match, download it from TCR GitHub repository

diff --git a/tcr/version.txt b/tcr/version.txt
@@ -1 +1 @@
-tcr 0.29.0
+tcr 1.0.0
diff --git a/typescript/GETTING_STARTED.md b/typescript/GETTING_STARTED.md
@@ -79,14 +79,17 @@ Refer to [Using TCR](#using-tcr) section for additional details about TCR and av
 
 Here are the main shortcuts available once TCR utility is running:
 
-| Shortcut  | Description                                   |
-|-----------|-----------------------------------------------|
-| `?`       | List available options                        |
-| `d` / `D` | Enter driver role (from main menu)            |
-| `n` / `N` | Enter navigator role (from main menu)         |
-| `q` / `Q` | Quit current role - Quit TCR (from main menu) |
-| `t` / `T` | Query timer status (from driver role only)    |
-| `p` / `P` | Toggle on/off git auto-push (from main menu)  |
+| Shortcut  | Description                                  |
+|-----------|----------------------------------------------|
+| `o` / `O` | Open in browser (with `web` subcommand only) |
+| `d` / `D` | Enter driver role                            |
+| `n` / `N` | Enter navigator role                         |
+| `t` / `T` | Query timer status                           |
+| `p` / `P` | Toggle on/off git auto-push                  |
+| `l` / `L` | Pull from remote                             |
+| `s` / `S` | Push to remote                               |
+| `q` / `Q` | Quit current role / Quit TCR                 |
+| `?`       | List available options                       |
 
 ### Additional Details