chore: update examples (#154)

monosoul · Nov 4, 2023 · dd4baa8 · dd4baa8
1 parent cc05be3
commit dd4baa8
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 32 deletions.
diff --git a/examples/external-database/build.gradle.kts b/examples/external-database/build.gradle.kts
@@ -7,8 +7,8 @@
 import dev.monosoul.jooq.RecommendedVersions
 
 plugins {
-    kotlin("jvm") version "1.8.10"
-    id("dev.monosoul.jooq-docker") version "5.0.0"
+    kotlin("jvm") version "1.9.20"
+    id("dev.monosoul.jooq-docker") version "6.0.0"
     id("com.avast.gradle.docker-compose") version "0.16.11"
 }
 
@@ -40,6 +40,5 @@ jooq {
 
 dependencies {
     jooqCodegen("org.postgresql:postgresql:42.5.4")
-    jooqCodegen("org.flywaydb:flyway-mysql:${RecommendedVersions.FLYWAY_VERSION}")
     implementation("org.jooq:jooq:${RecommendedVersions.JOOQ_VERSION}")
 }
diff --git a/examples/gradle.properties b/examples/gradle.properties
@@ -0,0 +1 @@
+org.gradle.jvmargs=-Xmx1g
diff --git a/examples/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/wrapper/gradle-wrapper.jar
diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/examples/gradlew b/examples/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
@@ -144,15 +145,15 @@ 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
@@ -201,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/examples/java-based-migrations/submodule-classes/build.gradle.kts b/examples/java-based-migrations/submodule-classes/build.gradle.kts
@@ -8,8 +8,8 @@
 import dev.monosoul.jooq.RecommendedVersions
 
 plugins {
-    kotlin("jvm") version "1.8.10"
-    id("dev.monosoul.jooq-docker") version "5.0.0"
+    kotlin("jvm") version "1.9.20"
+    id("dev.monosoul.jooq-docker") version "6.0.0"
 }
 
 repositories {

diff --git a/examples/java-based-migrations/submodule-dependency-configuration/build.gradle.kts b/examples/java-based-migrations/submodule-dependency-configuration/build.gradle.kts
@@ -8,8 +8,8 @@
 import dev.monosoul.jooq.RecommendedVersions
 
 plugins {
-    kotlin("jvm") version "1.8.10"
-    id("dev.monosoul.jooq-docker") version "5.0.0"
+    kotlin("jvm") version "1.9.20"
+    id("dev.monosoul.jooq-docker") version "6.0.0"
 }
 
 repositories {

diff --git a/examples/java-based-migrations/third-party-jar/build.gradle.kts b/examples/java-based-migrations/third-party-jar/build.gradle.kts
@@ -6,8 +6,8 @@
 import dev.monosoul.jooq.RecommendedVersions
 
 plugins {
-    kotlin("jvm") version "1.8.10"
-    id("dev.monosoul.jooq-docker") version "5.0.0"
+    kotlin("jvm") version "1.9.20"
+    id("dev.monosoul.jooq-docker") version "6.0.0"
 }
 
 repositories {

diff --git a/examples/java-codegen-configuration/build.gradle.kts b/examples/java-codegen-configuration/build.gradle.kts
@@ -5,8 +5,8 @@
 import dev.monosoul.jooq.RecommendedVersions
 
 plugins {
-    kotlin("jvm") version "1.8.10"
-    id("dev.monosoul.jooq-docker") version "5.0.0"
+    kotlin("jvm") version "1.9.20"
+    id("dev.monosoul.jooq-docker") version "6.0.0"
 }
 
 repositories {

diff --git a/examples/multiple-databases/build.gradle.kts b/examples/multiple-databases/build.gradle.kts
@@ -6,8 +6,8 @@ import dev.monosoul.jooq.GenerateJooqClassesTask
 import dev.monosoul.jooq.RecommendedVersions
 
 plugins {
-    kotlin("jvm") version "1.8.10"
-    id("dev.monosoul.jooq-docker") version "5.0.0"
+    kotlin("jvm") version "1.9.20"
+    id("dev.monosoul.jooq-docker") version "6.0.0"
 }
 
 repositories {
@@ -54,5 +54,6 @@ dependencies {
     jooqCodegen("org.postgresql:postgresql:42.5.4")
     jooqCodegen("mysql:mysql-connector-java:8.0.29")
     jooqCodegen("org.flywaydb:flyway-mysql:${RecommendedVersions.FLYWAY_VERSION}")
+    jooqCodegen("org.flywaydb:flyway-database-postgresql:${RecommendedVersions.FLYWAY_VERSION}")
     implementation("org.jooq:jooq:${RecommendedVersions.JOOQ_VERSION}")
 }
diff --git a/examples/mysql/build.gradle.kts b/examples/mysql/build.gradle.kts
@@ -6,8 +6,8 @@
 import dev.monosoul.jooq.RecommendedVersions
 
 plugins {
-    kotlin("jvm") version "1.8.10"
-    id("dev.monosoul.jooq-docker") version "5.0.0"
+    kotlin("jvm") version "1.9.20"
+    id("dev.monosoul.jooq-docker") version "6.0.0"
 }
 
 repositories {

diff --git a/examples/properties/build.gradle.kts b/examples/properties/build.gradle.kts
@@ -5,8 +5,8 @@
 import dev.monosoul.jooq.RecommendedVersions
 
 plugins {
-    kotlin("jvm") version "1.8.10"
-    id("dev.monosoul.jooq-docker") version "5.0.0"
+    kotlin("jvm") version "1.9.20"
+    id("dev.monosoul.jooq-docker") version "6.0.0"
 }
 
 repositories {

diff --git a/examples/recommended-jooq-flyway-versions/build.gradle.kts b/examples/recommended-jooq-flyway-versions/build.gradle.kts
@@ -5,8 +5,8 @@
 import dev.monosoul.jooq.RecommendedVersions
 
 plugins {
-    kotlin("jvm") version "1.8.10"
-    id("dev.monosoul.jooq-docker") version "5.0.0"
+    kotlin("jvm") version "1.9.20"
+    id("dev.monosoul.jooq-docker") version "6.0.0"
 }
 
 repositories {

diff --git a/examples/spring-boot/old-jooq-version/build.gradle.kts b/examples/spring-boot/old-jooq-version/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
     val kotlinVersion = "1.7.22"
     kotlin("jvm") version kotlinVersion
     kotlin("plugin.spring") version kotlinVersion
-    id("dev.monosoul.jooq-docker") version "5.0.0"
+    id("dev.monosoul.jooq-docker") version "6.0.0"
 }
 
 buildscript {

diff --git a/examples/spring-boot/recommended-jooq-version/build.gradle.kts b/examples/spring-boot/recommended-jooq-version/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
     val kotlinVersion = "1.7.22"
     kotlin("jvm") version kotlinVersion
     kotlin("plugin.spring") version kotlinVersion
-    id("dev.monosoul.jooq-docker") version "5.0.0"
+    id("dev.monosoul.jooq-docker") version "6.0.0"
 }
 
 repositories {

diff --git a/examples/xml-codegen-configuration/build.gradle.kts b/examples/xml-codegen-configuration/build.gradle.kts
@@ -5,8 +5,8 @@
 import dev.monosoul.jooq.RecommendedVersions
 
 plugins {
-    kotlin("jvm") version "1.8.10"
-    id("dev.monosoul.jooq-docker") version "5.0.0"
+    kotlin("jvm") version "1.9.20"
+    id("dev.monosoul.jooq-docker") version "6.0.0"
 }
 
 repositories {