Skip to content

Commit

Permalink
build: Downgraded to gradle 7.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
jruaux committed Sep 12, 2023
1 parent b12a7f3 commit 0385ba5
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 32 deletions.
6 changes: 5 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
# limitations under the License.
#
group = com.redis
sourceCompatibility = 1.8
targetCompatibility = 1.8
testSourceCompatibility = 11
testTargetCompatibility = 11
reproducibleBuild = true

bootPluginVersion = 2.7.15
Expand All @@ -41,7 +45,7 @@ oracleVersion = 19.3.0.0
picocliVersion = 4.7.5
plexusVersion = 4.0.0
progressbarVersion = 0.10.0
springBatchRedisVersion = 3.6.8
springBatchRedisVersion = 3.6.9
sqliteVersion = 3.43.0.0
testcontainersRedisVersion = 1.6.4
testcontainersVersion = 1.19.0
Expand Down
15 changes: 0 additions & 15 deletions gradle/LICENSE_HEADER

This file was deleted.

Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
19 changes: 7 additions & 12 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,10 @@ done
# This is normally unused
# 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 "${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"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -131,29 +133,26 @@ location of your Java installation."
fi
else
JAVACMD=java
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.
which java >/dev/null 2>&1 || 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
# 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
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -198,10 +197,6 @@ 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
Expand Down
4 changes: 2 additions & 2 deletions jreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ project:
height: 256
java:
groupId: com.redis
version: '20'
version: '8'
multiProject: true
mainClass: com.redis.riot.cli.Main
tags:
Expand Down Expand Up @@ -127,7 +127,7 @@ assemble:
riot-standalone:
active: ALWAYS
java:
version: '20'
version: '11'
imageName: '{{distributionName}}-{{projectEffectiveVersion}}'
executable: riot
fileSets:
Expand Down

0 comments on commit 0385ba5

Please sign in to comment.