diff --git a/Makefile b/Makefile index 691f8bb..c09505c 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION=1.10.8 +VERSION=1.10.9 default: versioncheck @@ -57,4 +57,4 @@ docker-push: release: clean build uberjar docker-push upgrade-wrapper: - ./gradlew wrapper --gradle-version=7.6 --distribution-type=bin \ No newline at end of file + ./gradlew wrapper --gradle-version=8.1 --distribution-type=bin \ No newline at end of file diff --git a/build.gradle b/build.gradle index cf8d1c6..aa06fa2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ plugins { id 'java' - id 'org.jetbrains.kotlin.jvm' version '1.8.0' - id "com.github.ben-manes.versions" version "0.44.0" - id 'com.github.johnrengelman.shadow' version '7.1.2' + id 'org.jetbrains.kotlin.jvm' version '1.8.20' + id "com.github.ben-manes.versions" version "0.46.0" + id 'com.github.johnrengelman.shadow' version '8.1.1' id 'com.github.gmazzo.buildconfig' version '3.1.0' } @@ -21,17 +21,17 @@ def appName = 'server' // mainClassName = mainName //} -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +sourceCompatibility = 17 +targetCompatibility = 17 description 'ReadingBat Site' group 'com.github.readingbat' -version '1.10.8' +version '1.10.9' buildConfig { buildConfigField('String', 'SITE_NAME', "\"${project.name}\"") buildConfigField('String', 'SITE_VERSION', "\"${project.version}\"") - buildConfigField('String', 'SITE_RELEASE_DATE', "\"11/19/22\"") + buildConfigField('String', 'SITE_RELEASE_DATE', "\"04/13/23\"") } dependencies { @@ -67,13 +67,13 @@ task uberjar(type: Jar, dependsOn: shadowJar) { compileKotlin { kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" freeCompilerArgs += ['-Xbackend-threads=8'] } } compileTestKotlin { kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" freeCompilerArgs += ['-Xbackend-threads=8'] } } diff --git a/docker-compose.yml b/docker-compose.yml index 18352d7..542acba 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.8" services: readingbat0: - image: "pambrose/readingbat:1.10.8" + image: "pambrose/readingbat:1.10.9" restart: "always" env_file: docker_env_vars ports: @@ -9,7 +9,7 @@ services: - "8083:8083" - "8084:8084" readingbat1: - image: "pambrose/readingbat:1.10.8" + image: "pambrose/readingbat:1.10.9" restart: "always" env_file: docker_env_vars ports: @@ -17,7 +17,7 @@ services: - "8093:8083" - "8094:8084" readingbat2: - image: "pambrose/readingbat:1.10.8" + image: "pambrose/readingbat:1.10.9" restart: "always" env_file: docker_env_vars ports: diff --git a/gradle.properties b/gradle.properties index 36ae872..91f0e99 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,6 +6,6 @@ org.gradle.parallel=true org.gradle.caching=true org.gradle.jvmargs=-Xmx8g -Dkotlin.daemon.jvm.options=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 # -logging_version=3.0.4 -readingbat_version=1.33.3 -utils_version=1.33.0 \ No newline at end of file +logging_version=4.0.0-beta-2 +readingbat_version=1.33.4 +utils_version=1.35.0 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e583..943f0cb 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 070cb70..0c85a1f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ 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.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb..65dcd68 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +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"' @@ -143,12 +143,16 @@ fi 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 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 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/gradlew.bat b/gradlew.bat index f127cfd..93e3f59 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% diff --git a/machines/content/run.sh b/machines/content/run.sh index 5a74d78..4228de1 100644 --- a/machines/content/run.sh +++ b/machines/content/run.sh @@ -1 +1 @@ -docker run --rm -d --env-file=docker_env_vars -p 8080:8080 pambrose/readingbat:1.10.8 +docker run --rm -d --env-file=docker_env_vars -p 8080:8080 pambrose/readingbat:1.10.9