Skip to content

Commit 4d5d2e0

Browse files
committed
lower gradle version to 8.6 to fix java 11 win tests (appveyor)
1 parent cfccba9 commit 4d5d2e0

File tree

7 files changed

+4
-15
lines changed

7 files changed

+4
-15
lines changed

Diff for: build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ plugins {
1313
}
1414

1515
wrapper {
16-
gradleVersion = '8.11'
16+
gradleVersion = '8.6'
1717
}
1818

1919
description = 'Dropwizard guice integration'

Diff for: gradle/wrapper/gradle-wrapper.jar

-121 Bytes
Binary file not shown.

Diff for: gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

Diff for: gradlew

+2-5
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18-
# SPDX-License-Identifier: Apache-2.0
19-
#
2018

2119
##############################################################################
2220
#
@@ -57,7 +55,7 @@
5755
# Darwin, MinGW, and NonStop.
5856
#
5957
# (3) This script is generated from the Groovy template
60-
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
6159
# within the Gradle project.
6260
#
6361
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -86,8 +84,7 @@ done
8684
# shellcheck disable=SC2034
8785
APP_BASE_NAME=${0##*/}
8886
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90-
' "$PWD" ) || exit
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
9188

9289
# Use the maximum available, or set MAX_FD != -1 to use that value.
9390
MAX_FD=maximum

Diff for: gradlew.bat

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16-
@rem SPDX-License-Identifier: Apache-2.0
17-
@rem
1816

1917
@if "%DEBUG%"=="" @echo off
2018
@rem ##########################################################################

Diff for: guicey-jdbi3/src/test/groovy/ru/vyarus/guicey/jdbi3/BindingRecognitionTest.groovy

-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import ru.vyarus.guicey.jdbi3.support.SampleConfiguration
1212
import ru.vyarus.guicey.jdbi3.support.mapper.SampleMapper
1313
import ru.vyarus.guicey.jdbi3.support.model.Sample
1414
import ru.vyarus.guicey.jdbi3.tx.InTransaction
15-
import spock.lang.IgnoreIf
1615

1716
import javax.inject.Inject
1817

@@ -21,8 +20,6 @@ import javax.inject.Inject
2120
* @since 15.01.2022
2221
*/
2322
@TestGuiceyApp(value = App, config = 'src/test/resources/test-config.yml')
24-
// on appveyor test fails due to jvm bug (used 11.0.2)
25-
@IgnoreIf({ env["APPVEYOR"] })
2623
class BindingRecognitionTest extends AbstractTest {
2724

2825
@Inject

Diff for: guicey-jdbi3/src/test/groovy/ru/vyarus/guicey/jdbi3/BindingRecognitionTest2.groovy

-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import ru.vyarus.guicey.jdbi3.support.SampleConfiguration
1212
import ru.vyarus.guicey.jdbi3.support.mapper.SampleMapper
1313
import ru.vyarus.guicey.jdbi3.support.model.Sample
1414
import ru.vyarus.guicey.jdbi3.tx.InTransaction
15-
import spock.lang.IgnoreIf
1615

1716
import javax.inject.Inject
1817

@@ -21,8 +20,6 @@ import javax.inject.Inject
2120
* @since 16.01.2022
2221
*/
2322
@TestGuiceyApp(value = App, config = 'src/test/resources/test-config.yml')
24-
// on appveyor test fails due to jvm bug (used 11.0.2)
25-
@IgnoreIf({ env["APPVEYOR"] })
2623
class BindingRecognitionTest2 extends AbstractTest {
2724

2825
@Inject

0 commit comments

Comments
 (0)