diff --git a/CHANGELOG.md b/CHANGELOG.md index 653f302..c3f77bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] +### Upgraded +- keyple-util-java-lib `2.3.0` -> `2.4.0` ## [2.0.0] - 2023-05-31 ### Added diff --git a/build.gradle.kts b/build.gradle.kts index 015cd41..6f7550f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile /////////////////////////////////////////////////////////////////////////////// plugins { kotlin("jvm") version "1.7.0" - id("com.diffplug.spotless") version "5.10.2" + id("com.diffplug.spotless") version "6.25.0" } buildscript { repositories { @@ -29,7 +29,7 @@ dependencies { implementation("com.github.devnied:bit-lib4j:1.4.5") { exclude(group = "org.slf4j") } - implementation("org.eclipse.keyple:keyple-util-java-lib:2.3.0") + implementation("org.eclipse.keyple:keyple-util-java-lib:2.4.0") testImplementation(kotlin("test")) testImplementation("org.assertj:assertj-core:3.15.0") testImplementation("com.github.devnied:bit-lib4j:1.4.5") diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..afba109 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 60c76b3..c7d437b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists \ No newline at end of file +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..65dcd68 100644 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,12 +143,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -205,6 +209,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..93e3f59 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/src/main/kotlin/org/calypsonet/keyple/demo/common/dto/AnalyzeContractsOutputDto.kt b/src/main/kotlin/org/calypsonet/keyple/demo/common/dto/AnalyzeContractsOutputDto.kt index f06d805..98f0455 100644 --- a/src/main/kotlin/org/calypsonet/keyple/demo/common/dto/AnalyzeContractsOutputDto.kt +++ b/src/main/kotlin/org/calypsonet/keyple/demo/common/dto/AnalyzeContractsOutputDto.kt @@ -15,7 +15,7 @@ import org.calypsonet.keyple.demo.common.model.ContractStructure /** * - validContracts: List of contracts present in the card. Each contract is tied to a counter by - * its index. + * its index. * - statusCode: 0 (if successful), 1 (server is not ready), 2 (card rejected). */ data class AnalyzeContractsOutputDto( diff --git a/src/main/kotlin/org/calypsonet/keyple/demo/common/dto/WriteContractOutputDto.kt b/src/main/kotlin/org/calypsonet/keyple/demo/common/dto/WriteContractOutputDto.kt index b7be718..04f2e21 100644 --- a/src/main/kotlin/org/calypsonet/keyple/demo/common/dto/WriteContractOutputDto.kt +++ b/src/main/kotlin/org/calypsonet/keyple/demo/common/dto/WriteContractOutputDto.kt @@ -13,6 +13,6 @@ package org.calypsonet.keyple.demo.common.dto /** * - statusCode: 0 (successful), 1 (server is not ready), 2 (card rejected), 3 (please present the - * same card). + * same card). */ data class WriteContractOutputDto(var statusCode: Int)