mirror of
https://github.com/vavr-io/vavr.git
synced 2024-10-23 08:19:44 +08:00
chore(deps): Update dependencies (#2748)
This commit is contained in:
parent
ccf32c24ea
commit
7625eb156a
3
.github/workflows/build-version.yml
vendored
3
.github/workflows/build-version.yml
vendored
@ -20,11 +20,10 @@ jobs:
|
||||
- name: Setup JDK
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
distribution: 'adopt'
|
||||
distribution: 'temurin'
|
||||
java-version: ${{ matrix.java }}
|
||||
architecture: ${{ matrix.architecture }}
|
||||
cache: 'maven'
|
||||
|
||||
- name: Build with Maven
|
||||
run: mvn test
|
||||
|
||||
|
19
build.gradle
19
build.gradle
@ -36,13 +36,13 @@ plugins {
|
||||
// publishing
|
||||
id 'maven-publish'
|
||||
id 'signing'
|
||||
id 'net.researchgate.release' version '2.8.1'
|
||||
id 'io.github.gradle-nexus.publish-plugin' version '1.0.0'
|
||||
id 'net.researchgate.release' version '3.0.2'
|
||||
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
|
||||
}
|
||||
|
||||
ext.ammoniteScalaVersion = '2.13'
|
||||
ext.ammoniteVersion = '2.3.8'
|
||||
ext.assertjVersion = '3.19.0'
|
||||
ext.ammoniteVersion = '2.5.11'
|
||||
ext.assertjVersion = '3.26.3'
|
||||
ext.junitVersion = '4.13.2'
|
||||
|
||||
// JAVA_VERSION used for CI build matrix, may be provided as env variable
|
||||
@ -72,7 +72,7 @@ java {
|
||||
sourceSets.main.java.srcDirs += ['src-gen/main/java']
|
||||
sourceSets.test.java.srcDirs += ['src-gen/test/java']
|
||||
|
||||
task generateSources() {
|
||||
tasks.register('generateSources') {
|
||||
doLast {
|
||||
delete 'src-gen'
|
||||
def ammoniteDir = file("generator/bin")
|
||||
@ -98,6 +98,8 @@ tasks.withType(JavaCompile).configureEach {
|
||||
options.compilerArgs = [ '-Werror', '-Xlint:all', '-Xlint:-deprecation' ]
|
||||
}
|
||||
|
||||
javadoc {options.encoding = "UTF-8"} // error: unmappable character for encoding ASCII
|
||||
|
||||
tasks.named('jacocoTestReport') {
|
||||
reports {
|
||||
xml.required = true
|
||||
@ -193,7 +195,7 @@ nexusPublishing {
|
||||
repositories {
|
||||
sonatype {
|
||||
username.set(providers.systemProperty("ossrhUsername").orElse("").forUseAtConfigurationTime())
|
||||
password.set(providers.systemProperty("ossrhPassword").orElse("").forUseAtConfigurationTime())
|
||||
password.set(providers.systemProperty("ossrhPassword").orElse("").forUseAtConfigurationTime())
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -207,8 +209,7 @@ release {
|
||||
buildTasks = ['build']
|
||||
tagTemplate = '$name-$version'
|
||||
git {
|
||||
requireBranch = ''
|
||||
pushToRemote = 'origin'
|
||||
pushToCurrentBranch = true
|
||||
requireBranch.set('')
|
||||
pushToRemote.set('origin')
|
||||
}
|
||||
}
|
||||
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
3
gradle/wrapper/gradle-wrapper.properties
vendored
3
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,7 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
27
gradlew
vendored
27
gradlew
vendored
@ -15,6 +15,8 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
@ -55,7 +57,7 @@
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
@ -83,7 +85,9 @@ 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s
|
||||
' "$PWD" ) || exit
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD=maximum
|
||||
@ -130,10 +134,13 @@ 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.
|
||||
@ -141,7 +148,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
|
||||
@ -149,7 +156,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
|
||||
@ -198,11 +205,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" \
|
||||
|
22
gradlew.bat
vendored
22
gradlew.bat
vendored
@ -13,6 +13,8 @@
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
@rem SPDX-License-Identifier: Apache-2.0
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%"=="" @echo off
|
||||
@rem ##########################################################################
|
||||
@ -43,11 +45,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
|
||||
|
||||
@ -57,11 +59,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
|
||||
|
||||
|
@ -57,8 +57,8 @@ public abstract class AbstractMapTest extends AbstractTraversableTest {
|
||||
final Iterable<T> expected = (Iterable<T>) obj;
|
||||
final java.util.Map<T, Integer> actualMap = countMap(actual);
|
||||
final java.util.Map<T, Integer> expectedMap = countMap(expected);
|
||||
assertThat(actualMap.size()).isEqualTo(expectedMap.size());
|
||||
actualMap.forEach((k, v) -> assertThat(v).isEqualTo(expectedMap.get(k)));
|
||||
AbstractMapTest.this.assertThat(actualMap.size()).isEqualTo(expectedMap.size());
|
||||
actualMap.forEach((k, v) -> AbstractMapTest.this.assertThat(v).isEqualTo(expectedMap.get(k)));
|
||||
return this;
|
||||
}
|
||||
|
||||
|
@ -67,8 +67,8 @@ public abstract class AbstractMultimapTest extends AbstractTraversableTest {
|
||||
final Iterable<T> expected = (Iterable<T>) obj;
|
||||
final java.util.Map<T, Integer> actualMap = countMap(actual);
|
||||
final java.util.Map<T, Integer> expectedMap = countMap(expected);
|
||||
assertThat(actualMap.size()).isEqualTo(expectedMap.size());
|
||||
actualMap.forEach((k, v) -> assertThat(v).isEqualTo(expectedMap.get(k)));
|
||||
AbstractMultimapTest.this.assertThat(actualMap.size()).isEqualTo(expectedMap.size());
|
||||
actualMap.forEach((k, v) -> AbstractMultimapTest.this.assertThat(v).isEqualTo(expectedMap.get(k)));
|
||||
return this;
|
||||
}
|
||||
|
||||
|
@ -51,8 +51,8 @@ public class HashSetTest extends AbstractSetTest {
|
||||
final Iterable<T> expected = (Iterable<T>) obj;
|
||||
final java.util.Map<T, Integer> actualMap = countMap(actual);
|
||||
final java.util.Map<T, Integer> expectedMap = countMap(expected);
|
||||
assertThat(actualMap.size()).isEqualTo(expectedMap.size());
|
||||
actualMap.keySet().forEach(k -> assertThat(actualMap.get(k)).isEqualTo(expectedMap.get(k)));
|
||||
HashSetTest.this.assertThat(actualMap.size()).isEqualTo(expectedMap.size());
|
||||
actualMap.keySet().forEach(k -> HashSetTest.this.assertThat(actualMap.get(k)).isEqualTo(expectedMap.get(k)));
|
||||
return this;
|
||||
}
|
||||
|
||||
|
@ -80,7 +80,7 @@ public class TreeTest extends AbstractTraversableTest {
|
||||
final Map<?, ?> map2 = (Map<?, ?>) expected;
|
||||
Assertions.assertThat(convMap(map1)).isEqualTo(convMap(map2));
|
||||
} else if (expected instanceof Tree) {
|
||||
assertThat(Stream.ofAll(actual)).isEqualTo(Stream.ofAll((Tree<?>) expected));
|
||||
TreeTest.this.assertThat(Stream.ofAll(actual)).isEqualTo(Stream.ofAll((Tree<?>) expected));
|
||||
} else {
|
||||
Assertions.assertThat(actual).isEqualTo((Iterable<T>) expected);
|
||||
}
|
||||
|
@ -106,7 +106,7 @@ public class FutureTest extends AbstractValueTest {
|
||||
@Override
|
||||
public IterableAssert<T> isEqualTo(Object expected) {
|
||||
if (actual instanceof Future && expected instanceof Future) {
|
||||
assertThat(((Future<T>) actual).getValue()).isEqualTo(((Future<T>) expected).getValue());
|
||||
FutureTest.this.assertThat(((Future<T>) actual).getValue()).isEqualTo(((Future<T>) expected).getValue());
|
||||
return this;
|
||||
} else {
|
||||
return super.isEqualTo(expected);
|
||||
|
Loading…
Reference in New Issue
Block a user