This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/pekko-http-quickstart-java.g8.git
The following commit(s) were added to refs/heads/main by this push:
new e7af1be pekko 1.0.3 (#10)
e7af1be is described below
commit e7af1bee818b0c8064c914783d8a0051cdd9db67
Author: PJ Fanning <[email protected]>
AuthorDate: Mon Jun 24 21:54:58 2024 +0100
pekko 1.0.3 (#10)
---
project/build.properties | 2 +-
src/main/g8/build.sbt | 2 +-
src/main/g8/default.properties | 2 +-
src/main/g8/gradle/wrapper/gradle-wrapper.jar | Bin 62076 -> 43453 bytes
.../g8/gradle/wrapper/gradle-wrapper.properties | 3 ++-
src/main/g8/gradlew | 22 ++++++++++++---------
src/main/g8/gradlew.bat | 20 +++++++++----------
src/main/g8/project/build.properties | 2 +-
8 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/project/build.properties b/project/build.properties
index e8a1e24..081fdbb 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.7
+sbt.version=1.10.0
diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt
index e660244..b7428ad 100644
--- a/src/main/g8/build.sbt
+++ b/src/main/g8/build.sbt
@@ -5,7 +5,7 @@ lazy val root = (project in file(".")).
settings(
inThisBuild(List(
organization := "$organization$",
- scalaVersion := "2.13.12",
+ scalaVersion := "2.13.14",
name := "$name$"
)),
name := "TestProject",
diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties
index e8050c0..e74a787 100644
--- a/src/main/g8/default.properties
+++ b/src/main/g8/default.properties
@@ -1,6 +1,6 @@
name=My Pekko HTTP Project
pekko_http_version=1.0.1
-pekko_version=1.0.2
+pekko_version=1.0.3
organization=com.example
package=$organization$
verbatim=gradlew gradlew.bat gradle-wrapper.properties gradle-wrapper.jar
\ No newline at end of file
diff --git a/src/main/g8/gradle/wrapper/gradle-wrapper.jar
b/src/main/g8/gradle/wrapper/gradle-wrapper.jar
index c1962a7..e644113 100644
Binary files a/src/main/g8/gradle/wrapper/gradle-wrapper.jar and
b/src/main/g8/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/src/main/g8/gradle/wrapper/gradle-wrapper.properties
b/src/main/g8/gradle/wrapper/gradle-wrapper.properties
index f398c33..a441313 100644
--- a/src/main/g8/gradle/wrapper/gradle-wrapper.properties
+++ b/src/main/g8/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
+validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/src/main/g8/gradlew b/src/main/g8/gradlew
index aeb74cb..1aa94a4 100755
--- a/src/main/g8/gradlew
+++ b/src/main/g8/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/main/g8/gradlew.bat b/src/main/g8/gradlew.bat
index 6689b85..7101f8e 100644
--- a/src/main/g8/gradlew.bat
+++ b/src/main/g8/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/src/main/g8/project/build.properties
b/src/main/g8/project/build.properties
index e8a1e24..081fdbb 100644
--- a/src/main/g8/project/build.properties
+++ b/src/main/g8/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.7
+sbt.version=1.10.0
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
