From 2d8be299c873281ac3c69a17ee305fea0cee9e2d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 May 2023 21:46:17 +0200 Subject: [PATCH 1/4] Bump com.google.auto.service:auto-service from 1.0.1 to 1.1.0 (#3017) Bumps [com.google.auto.service:auto-service](https://github.com/google/auto) from 1.0.1 to 1.1.0. - [Release notes](https://github.com/google/auto/releases) - [Commits](https://github.com/google/auto/compare/auto-common-1.0.1...auto-value-1.1) --- updated-dependencies: - dependency-name: com.google.auto.service:auto-service dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 3d02c7f45b..153b8721e9 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -24,7 +24,7 @@ libraries.bytebuddyandroid = "net.bytebuddy:byte-buddy-android:${versions.bytebu libraries.errorprone = "com.google.errorprone:error_prone_core:${versions.errorprone}" libraries.errorproneTestApi = "com.google.errorprone:error_prone_test_helpers:${versions.errorprone}" -libraries.autoservice = "com.google.auto.service:auto-service:1.0.1" +libraries.autoservice = "com.google.auto.service:auto-service:1.1.0" libraries.objenesis = 'org.objenesis:objenesis:3.3' From 296a25799365dd6c8ee78704dd3bc1a201d323df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 May 2023 22:14:52 +0200 Subject: [PATCH 2/4] Bump com.diffplug.spotless from 6.18.0 to 6.19.0 (#3018) Bumps com.diffplug.spotless from 6.18.0 to 6.19.0. --- updated-dependencies: - dependency-name: com.diffplug.spotless dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 967e9f754d..7077843f18 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '6.18.0' + id 'com.diffplug.spotless' version '6.19.0' id 'eclipse' id 'com.github.ben-manes.versions' version '0.46.0' id 'biz.aQute.bnd.builder' version '6.4.0' From 2280cac9ebb5849165731040eb9d720525ee9edb Mon Sep 17 00:00:00 2001 From: ellaella12 <120079323+ellaella12@users.noreply.github.com> Date: Fri, 26 May 2023 06:09:06 +0800 Subject: [PATCH 3/4] Edit DoAnswerStyleStubbing.isSet() to return true if there are answers (#3020) Fixes #2955 --------- Co-authored-by: Kei --- .../org/mockito/internal/stubbing/DoAnswerStyleStubbing.java | 2 +- .../org/mockito/internal/stubbing/InvocationContainerImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/mockito/internal/stubbing/DoAnswerStyleStubbing.java b/src/main/java/org/mockito/internal/stubbing/DoAnswerStyleStubbing.java index e143379362..c15fc025b4 100644 --- a/src/main/java/org/mockito/internal/stubbing/DoAnswerStyleStubbing.java +++ b/src/main/java/org/mockito/internal/stubbing/DoAnswerStyleStubbing.java @@ -25,7 +25,7 @@ void setAnswers(List> answers, Strictness stubbingStrictness) { } boolean isSet() { - return answers.isEmpty(); + return answers.size() > 0; } void clear() { diff --git a/src/main/java/org/mockito/internal/stubbing/InvocationContainerImpl.java b/src/main/java/org/mockito/internal/stubbing/InvocationContainerImpl.java index 832b1b155b..927d230e0f 100644 --- a/src/main/java/org/mockito/internal/stubbing/InvocationContainerImpl.java +++ b/src/main/java/org/mockito/internal/stubbing/InvocationContainerImpl.java @@ -110,7 +110,7 @@ public void setAnswersForStubbing(List> answers, Strictness strictness } public boolean hasAnswersForStubbing() { - return !doAnswerStyleStubbing.isSet(); + return doAnswerStyleStubbing.isSet(); } public boolean hasInvocationForPotentialStubbing() { From be9809086b74390ef05ab413801209954d2a4a6a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 3 Jun 2023 07:55:11 +0200 Subject: [PATCH 4/4] Bump versions.bytebuddy from 1.14.4 to 1.14.5 (#3025) Bumps `versions.bytebuddy` from 1.14.4 to 1.14.5. Updates `net.bytebuddy:byte-buddy` from 1.14.4 to 1.14.5 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.14.4...byte-buddy-1.14.5) Updates `net.bytebuddy:byte-buddy-agent` from 1.14.4 to 1.14.5 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.14.4...byte-buddy-1.14.5) Updates `net.bytebuddy:byte-buddy-android` from 1.14.4 to 1.14.5 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.14.4...byte-buddy-1.14.5) --- updated-dependencies: - dependency-name: net.bytebuddy:byte-buddy dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: net.bytebuddy:byte-buddy-agent dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: net.bytebuddy:byte-buddy-android dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 153b8721e9..69b8b2b077 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -4,7 +4,7 @@ ext { def versions = [:] -versions.bytebuddy = '1.14.4' +versions.bytebuddy = '1.14.5' versions.junitJupiter = '5.9.3' versions.errorprone = '2.19.1'