Skip to content

Commit

Permalink
Updates to dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
retrodaredevil committed Dec 12, 2024
1 parent edf6fe1 commit b2b22f2
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 35 deletions.
29 changes: 15 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,33 @@ buildscript {
ext {
junit5Version = '5.10.1' // https://junit.org/junit5/
junit5PlatformVersion = '1.10.1'
// For some reason IntelliJ doesn't like these new versions I have commented out. TODO look at this
// junit5Version = '5.11.3' // https://junit.org/junit5/
// junit5PlatformVersion = '1.11.3'

slf4jVersion = '2.0.11' // http://www.slf4j.org/download.html
log4jVersion = '2.22.0' // https://logging.apache.org/log4j/2.x/javadoc.html
slf4jVersion = '2.0.16' // http://www.slf4j.org/download.html
log4jVersion = '2.24.2' // https://logging.apache.org/log4j/2.x/release-notes.html
// Note: Since Jackson 2.14, Android SDK 26 is required
// https://github.com/FasterXML/jackson/wiki/Jackson-Releases
jacksonVersion = '2.16.1' // https://github.com/FasterXML/jackson-databind/tags
retrofitVersion = "2.9.0" // https://github.com/square/retrofit/tags
jacksonVersion = '2.18.2' // https://github.com/FasterXML/jackson-databind/tags
retrofitVersion = "2.11.0" // https://github.com/square/retrofit/tags
shadowVersion = '8.1.1' // https://github.com/johnrengelman/shadow/releases
ioLibVersion = '2.3.0' // https://github.com/retrodaredevil/io-lib/releases
okhttpVersion = "4.12.0" // https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp
// couchdbJavaVersion = '1.1.0'
couchdbJavaVersion = "cf377882a0a85ce1ff37b5bcc23a5389d900d66f".substring(0, 10)
dockerComposePluginVersion = "0.17.6" // https://github.com/avast/gradle-docker-compose-plugin/releases
errorpronePluginVersion = '3.1.0' // https://github.com/tbroyer/gradle-errorprone-plugin/releases
errorproneCoreVersion = '2.24.1' // https://mvnrepository.com/artifact/com.google.errorprone/error_prone_core
antlrVersion = "4.13.1" // https://github.com/antlr/antlr4/releases
}
dependencies {
classpath "com.avast.gradle:gradle-docker-compose-plugin:$dockerComposePluginVersion"
couchdbJavaVersion = '1.1.2'
// couchdbJavaVersion = "8582268195".substring(0, 10)
dockerComposePluginVersion = "0.17.11" // https://github.com/avast/gradle-docker-compose-plugin/releases
errorpronePluginVersion = '4.1.0' // https://github.com/tbroyer/gradle-errorprone-plugin/releases
errorproneCoreVersion = '2.36.0' // https://mvnrepository.com/artifact/com.google.errorprone/error_prone_core
antlrVersion = "4.13.2" // https://github.com/antlr/antlr4/releases
}
}


plugins {
id 'com.diffplug.spotless' version '6.22.0' // https://mvnrepository.com/artifact/com.diffplug.spotless/spotless-plugin-gradle
id 'net.ltgt.errorprone' version "$errorpronePluginVersion"
id "com.avast.gradle.docker-compose" version "$dockerComposePluginVersion"
}

version "0.0.1-SNAPSHOT"
Expand Down Expand Up @@ -288,6 +289,6 @@ project(":action-lang"){
}

wrapper {
gradleVersion = '8.6'
gradleVersion = '8.11.1'
distributionType = Wrapper.DistributionType.ALL
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
22 changes: 13 additions & 9 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -130,26 +131,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
# shellcheck disable=SC2039,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=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -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" \
Expand Down
20 changes: 10 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
3 changes: 2 additions & 1 deletion web/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@ tasks.register('generateCode', NpmTask) {
dependsOn(":server:generateSchema")
}

assemble.dependsOn(appNpmBuild)
// TODO uncomment
//assemble.dependsOn(appNpmBuild)

0 comments on commit b2b22f2

Please sign in to comment.