diff --git a/.github/workflows/gradle.yml b/.github/workflows/bld.yml
similarity index 100%
rename from .github/workflows/gradle.yml
rename to .github/workflows/bld.yml
diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml
index cf75013..ca84ff0 100644
--- a/.idea/libraries/bld.xml
+++ b/.idea/libraries/bld.xml
@@ -6,6 +6,7 @@
+
@@ -14,4 +15,4 @@
-
\ No newline at end of file
+
diff --git a/README.md b/README.md
index e26e398..90ce52b 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
[](https://sonarcloud.io/dashboard?id=ethauvin_readingtime)
-[](https://github.com/ethauvin/readingtime/actions/workflows/gradle.yml)
+[](https://github.com/ethauvin/readingtime/actions/workflows/bld.yml)
[](https://circleci.com/gh/ethauvin/readingtime/tree/master)
# Estimated Reading Time for Blog Posts, Articles, etc.
diff --git a/examples/gradle/.idea/.name b/examples/gradle/.idea/.name
index b726568..9b7d9ec 100644
--- a/examples/gradle/.idea/.name
+++ b/examples/gradle/.idea/.name
@@ -1 +1 @@
-examples
\ No newline at end of file
+readingtime-examples-gradle
\ No newline at end of file
diff --git a/examples/gradle/.idea/jarRepositories.xml b/examples/gradle/.idea/jarRepositories.xml
index a529ef2..4e9cedf 100644
--- a/examples/gradle/.idea/jarRepositories.xml
+++ b/examples/gradle/.idea/jarRepositories.xml
@@ -21,5 +21,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/examples/gradle/.idea/kotlinc.xml b/examples/gradle/.idea/kotlinc.xml
index 69e8615..e805548 100644
--- a/examples/gradle/.idea/kotlinc.xml
+++ b/examples/gradle/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/examples/gradle/.idea/misc.xml b/examples/gradle/.idea/misc.xml
index 2540c68..565c23b 100644
--- a/examples/gradle/.idea/misc.xml
+++ b/examples/gradle/.idea/misc.xml
@@ -1,4 +1,3 @@
-
diff --git a/examples/gradle/build.gradle.kts b/examples/gradle/build.gradle.kts
index 4c724ad..11ed327 100644
--- a/examples/gradle/build.gradle.kts
+++ b/examples/gradle/build.gradle.kts
@@ -2,8 +2,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
id("application")
- id("com.github.ben-manes.versions") version "0.47.0"
- kotlin("jvm") version "1.8.20"
+ id("com.github.ben-manes.versions") version "0.49.0"
+ kotlin("jvm") version "1.9.20"
}
repositories {
@@ -12,7 +12,7 @@ repositories {
}
dependencies {
- implementation("net.thauvin.erik:readingtime:0.9.1")
+ implementation("net.thauvin.erik:readingtime:0.9.2-SNAPSHOT")
}
java {
diff --git a/examples/gradle/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/gradle/wrapper/gradle-wrapper.jar
index c1962a7..7f93135 100644
Binary files a/examples/gradle/gradle/wrapper/gradle-wrapper.jar and b/examples/gradle/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/examples/gradle/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/gradle/wrapper/gradle-wrapper.properties
index 37aef8d..3fa8f86 100644
--- a/examples/gradle/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-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/examples/gradle/gradlew b/examples/gradle/gradlew
index aeb74cb..1aa94a4 100755
--- a/examples/gradle/gradlew
+++ b/examples/gradle/gradlew
@@ -83,7 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# 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
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
@@ -130,10 +131,13 @@ 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.
@@ -141,7 +145,7 @@ 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
+ # shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
@@ -149,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
- # shellcheck disable=SC3045
+ # shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
@@ -198,11 +202,11 @@ 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
-# double quotes to make sure that they get re-expanded; and
-# * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+# * DEFAULT_JVM_OPTS, JAVA_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.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/src/bld/java/net/thauvin/erik/ReadingTimeBuild.java b/src/bld/java/net/thauvin/erik/ReadingTimeBuild.java
index 4e55e4d..528b9de 100644
--- a/src/bld/java/net/thauvin/erik/ReadingTimeBuild.java
+++ b/src/bld/java/net/thauvin/erik/ReadingTimeBuild.java
@@ -104,7 +104,7 @@ public class ReadingTimeBuild extends Project {
new ReadingTimeBuild().start(args);
}
- @BuildCommand(summary = "Compilez the Kotlin project")
+ @BuildCommand(summary = "Compiles the Kotlin project")
@Override
public void compile() throws IOException {
new CompileKotlinOperation()