From c32b20e5b3da4cb2f844e0dfc569af2e8d503338 Mon Sep 17 00:00:00 2001 From: Alexander Nutz Date: Wed, 17 Sep 2025 22:57:21 +0200 Subject: [PATCH] c --- README.md | 4 +-- build.gradle.kts | 25 +++++++++++++----- gradlew | 12 +++++---- gradlew.bat | 26 ++++++++++--------- src/main/kotlin/blitz/collections/Buckets.kt | 2 +- .../kotlin/blitz/collections/I2HashMap.kt | 2 +- .../kotlin/blitz/collections/I3HashMap.kt | 2 +- 7 files changed, 44 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 1df4c13..601c04c 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,12 @@ Big Kotlin library adding features that the Kotlin standard library just does no repositories { maven { name = "alex's repo" - url = uri("http://maven.vxcc.dev/libs") + url = uri("https://maven.vxcc.dev/libs") } } dependencies { - implementation("me.alex_s168:blitz:0.23") + implementation("me.alex_s168:blitz:0.24.1") } ``` diff --git a/build.gradle.kts b/build.gradle.kts index 5758fc4..5a82abe 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,11 +2,10 @@ plugins { kotlin("jvm") version "1.9.21" application `maven-publish` - id("co.uzzu.dotenv.gradle") version "4.0.0" } group = "me.alex_s168" -version = "0.23" +version = "0.24.1" repositories { mavenCentral() @@ -26,6 +25,11 @@ kotlin { jvmToolchain(11) } +java { + withSourcesJar() + withJavadocJar() +} + application { mainClass.set("blitz.FnpKt") } @@ -33,11 +37,11 @@ application { publishing { repositories { maven { - url = uri("http://198.7.115.119:8080/libs") - isAllowInsecureProtocol = true - credentials { - username = env.USER.orNull() - password = env.PASS.orNull() + name = "vxccLibs" + url = uri("https://maven.vxcc.dev/libs") + credentials(PasswordCredentials::class) + authentication { + create("basic") } } } @@ -49,6 +53,13 @@ publishing { version = version.toString() from(components["kotlin"]) + artifact(tasks["sourcesJar"]) + artifact(tasks["javadocJar"]) + + pom { + name.set("blitz") + url.set("https://github.com/alex_s168/blitz") + } } } } diff --git a/gradlew b/gradlew index 1aa94a4..23d15a9 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -84,7 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -112,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -203,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. @@ -211,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 6689b85..5eed7ee 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -43,11 +45,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,22 +59,22 @@ 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 :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/src/main/kotlin/blitz/collections/Buckets.kt b/src/main/kotlin/blitz/collections/Buckets.kt index 6975935..0bc3e7d 100644 --- a/src/main/kotlin/blitz/collections/Buckets.kt +++ b/src/main/kotlin/blitz/collections/Buckets.kt @@ -8,7 +8,7 @@ interface Buckets { fun contents(bucket: B): Contents> } -class DynBucketsT( +class DynBucketsT( private val parent: Buckets ): Buckets { override fun new(): Any? = diff --git a/src/main/kotlin/blitz/collections/I2HashMap.kt b/src/main/kotlin/blitz/collections/I2HashMap.kt index e97e4b6..086bfc0 100644 --- a/src/main/kotlin/blitz/collections/I2HashMap.kt +++ b/src/main/kotlin/blitz/collections/I2HashMap.kt @@ -23,6 +23,6 @@ fun I2HashMap( ): BlitzHashMap = BlitzHashMap( bucketCount, - DynBuckets(SortedListBuckets(underlying)), + DynBucketsT(SortedListBuckets(underlying)), I2HashMapKey::cantorHash ) \ No newline at end of file diff --git a/src/main/kotlin/blitz/collections/I3HashMap.kt b/src/main/kotlin/blitz/collections/I3HashMap.kt index d840736..1c6e81e 100644 --- a/src/main/kotlin/blitz/collections/I3HashMap.kt +++ b/src/main/kotlin/blitz/collections/I3HashMap.kt @@ -24,6 +24,6 @@ fun I3HashMap( ): BlitzHashMap = BlitzHashMap( bucketCount, - DynBuckets(SortedListBuckets(underlying)), + DynBucketsT<_, _, _>(SortedListBuckets(underlying)), I3HashMapKey::cantorHash ) \ No newline at end of file