diff --git a/LICENSE b/LICENSE index 6dc6415..67ced62 100644 --- a/LICENSE +++ b/LICENSE @@ -175,7 +175,7 @@ END OF TERMS AND CONDITIONS - Copyright 2020 Kamil Szewc (Computing Laboratory) + Copyright 2020 Kamil Szewc Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/README.md b/README.md index 9bf7580..56e0392 100644 --- a/README.md +++ b/README.md @@ -38,14 +38,14 @@ Using maven: ```xml - com.computinglaboratory + io.github.kamilszewc alphanumeric-comparator - 1.0 + 1.1 ``` Using gradle: ```groovy -implementation 'com.computinglaboratory:alphanumeric-comparator:1.0' +implementation 'io.github.kamilszewc:alphanumeric-comparator:1.1' ``` diff --git a/build.gradle b/build.gradle index 1fbb6c5..50554e2 100644 --- a/build.gradle +++ b/build.gradle @@ -6,11 +6,13 @@ plugins { id 'signing' } -group = 'com.computinglaboratory' -version = '1.0' +group = 'io.github.kamilszewc' +version = '1.1' -sourceCompatibility = '1.8' -targetCompatibility = '1.8' +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} repositories { mavenCentral() @@ -19,9 +21,9 @@ repositories { dependencies { // Testing - testImplementation platform('org.junit:junit-bom:5.9.1') + testImplementation platform('org.junit:junit-bom:5.9.2') testImplementation 'org.junit.jupiter:junit-jupiter' - testImplementation 'org.apache.groovy:groovy-all:4.0.11' + testImplementation 'org.apache.groovy:groovy-all:4.0.15' testImplementation 'org.spockframework:spock-core:2.4-M1-groovy-4.0' } @@ -66,6 +68,14 @@ publishing { name = 'Alphanumeric Comparator' description = 'Alphanumeric comparator for Java' url = 'https://github.com/kamilszewc/alphanumeric-comparator' +// distributionManagement { +// relocation { +// groupId = 'io.github.kamilszewc' +// artifactId = 'alphanumeric-comparator' +// version = '1.1' +// message = 'Project moved to io.github.kamilszewc:alphanumeric-comparator' +// } +// } licenses { license { name = 'The Apache License, Version 2.0' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e583..033e24c 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 eaed104..3fa8f86 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Tue Apr 25 17:00:29 CEST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..fcb6fca 100755 --- 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,13 +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##*/} - -# 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"' +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +130,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. 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 @@ -193,6 +197,10 @@ if "$cygwin" || "$msys" ; then done fi + +# 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"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in @@ -205,6 +213,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/java/com/computinglaboratory/AlphanumericComparator.java b/src/main/java/io/github/kamilszewc/AlphanumericComparator.java similarity index 98% rename from src/main/java/com/computinglaboratory/AlphanumericComparator.java rename to src/main/java/io/github/kamilszewc/AlphanumericComparator.java index 8d442eb..14aebb5 100644 --- a/src/main/java/com/computinglaboratory/AlphanumericComparator.java +++ b/src/main/java/io/github/kamilszewc/AlphanumericComparator.java @@ -1,4 +1,4 @@ -package com.computinglaboratory; +package io.github.kamilszewc; import java.util.Comparator; diff --git a/src/test/groovy/com/computinglaboratory/AlphanumericComparatorTest.groovy b/src/test/groovy/io/github/kamilszewc/AlphanumericComparatorTest.groovy similarity index 98% rename from src/test/groovy/com/computinglaboratory/AlphanumericComparatorTest.groovy rename to src/test/groovy/io/github/kamilszewc/AlphanumericComparatorTest.groovy index 9ce6b76..cadca2a 100644 --- a/src/test/groovy/com/computinglaboratory/AlphanumericComparatorTest.groovy +++ b/src/test/groovy/io/github/kamilszewc/AlphanumericComparatorTest.groovy @@ -1,4 +1,4 @@ -package com.computinglaboratory +package io.github.kamilszewc import spock.lang.Specification