From e5f477dde480626b0bffeb5ecc1980409c72829b Mon Sep 17 00:00:00 2001 From: sakata1222 Date: Mon, 9 Oct 2023 21:19:15 +0900 Subject: [PATCH 1/2] chore: gradle 8.4, 7.6.3 --- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 14 +++++++------- .../functionalTest/resources/gradleVersions.csv | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ac72c34..3fa8f86 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +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-8.4-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 0adc8e1..1aa94a4 100644 --- a/gradlew +++ b/gradlew @@ -145,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 @@ -153,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 @@ -202,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/plugin/src/functionalTest/resources/gradleVersions.csv b/plugin/src/functionalTest/resources/gradleVersions.csv index 5b80dfa..3cb7446 100644 --- a/plugin/src/functionalTest/resources/gradleVersions.csv +++ b/plugin/src/functionalTest/resources/gradleVersions.csv @@ -1,6 +1,6 @@ -"8.3" +"8.4" "8.0" -"7.6.2" +"7.6.3" "7.0" "6.9.4" "6.1" From 9fc703d14f1baf63003e54484a2f3fc2bfb4a1cf Mon Sep 17 00:00:00 2001 From: sakata1222 Date: Mon, 9 Oct 2023 21:36:52 +0900 Subject: [PATCH 2/2] chore: specify test FW runtime --- example/build.gradle | 1 + plugin/build.gradle | 2 ++ 2 files changed, 3 insertions(+) diff --git a/example/build.gradle b/example/build.gradle index a364e74..9284751 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -30,6 +30,7 @@ dependencies { // Use JUnit Jupiter Engine for testing. testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.2' + testRuntimeOnly("org.junit.platform:junit-platform-launcher") } application { diff --git a/plugin/build.gradle b/plugin/build.gradle index fe310f8..6e95b68 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -40,6 +40,8 @@ dependencies { testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.19.0' testImplementation group: 'commons-io', name: 'commons-io', version: '2.8.0' testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.8.0' + + testRuntimeOnly("org.junit.platform:junit-platform-launcher") } version = '1.4.0'