From 006c90783ab9bcbd0ec10ca1ecc6683029596715 Mon Sep 17 00:00:00 2001 From: Robert Kruszewski Date: Thu, 21 Apr 2022 17:41:56 +0100 Subject: [PATCH 1/3] ifx --- baseline-error-prone/build.gradle | 3 +-- versions.lock | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/baseline-error-prone/build.gradle b/baseline-error-prone/build.gradle index 93e0b1f70..c826a5eb3 100644 --- a/baseline-error-prone/build.gradle +++ b/baseline-error-prone/build.gradle @@ -7,8 +7,7 @@ dependencies { implementation 'com.google.errorprone:error_prone_core' // Ensure a new enough version of dataflow-errorprone is available implementation 'org.checkerframework:dataflow-errorprone' - // bring back mockito-errorprone once it is updated for 2.11.0+ - //implementation 'org.mockito:mockito-errorprone' + implementation 'org.mockito:mockito-errorprone' testImplementation gradleApi() testImplementation 'com.palantir.tokens:auth-tokens' diff --git a/versions.lock b/versions.lock index c4cf58937..d03e00d1c 100644 --- a/versions.lock +++ b/versions.lock @@ -21,7 +21,7 @@ com.google.code.findbugs:jsr305:3.0.2 (6 constraints: 66626968) com.google.errorprone:error_prone_annotation:2.13.1 (3 constraints: c138e9ec) com.google.errorprone:error_prone_annotations:2.13.1 (12 constraints: 81bdf58c) com.google.errorprone:error_prone_check_api:2.13.1 (2 constraints: b025d4fe) -com.google.errorprone:error_prone_core:2.13.1 (2 constraints: 0f189366) +com.google.errorprone:error_prone_core:2.13.1 (3 constraints: f4251b64) com.google.errorprone:error_prone_refaster:2.13.1 (1 constraints: 3905393b) com.google.errorprone:error_prone_test_helpers:2.13.1 (1 constraints: 3905393b) com.google.errorprone:error_prone_type_annotations:2.13.1 (1 constraints: 24114cc9) @@ -81,7 +81,8 @@ org.inferred:freebuilder:1.14.6 (1 constraints: 3e053b3b) org.jetbrains:annotations:19.0.0 (2 constraints: 441cf8cc) org.jetbrains.kotlin:kotlin-stdlib:1.3.61 (2 constraints: 0617a55e) org.jetbrains.kotlin:kotlin-stdlib-common:1.3.61 (2 constraints: c5196a0d) -org.mockito:mockito-core:4.5.1 (3 constraints: ec24cefa) +org.mockito:mockito-core:4.5.1 (4 constraints: a4328ec8) +org.mockito:mockito-errorprone:4.5.1 (1 constraints: 0c050f36) org.objenesis:objenesis:3.2 (3 constraints: 6b2483ae) org.osgi:org.osgi.dto:1.0.0 (1 constraints: b40ca816) org.osgi:org.osgi.framework:1.8.0 (1 constraints: bc0cc016) From fc63c3391f2ff513a5fff8482726332135ae0571 Mon Sep 17 00:00:00 2001 From: svc-changelog Date: Thu, 21 Apr 2022 16:41:19 +0000 Subject: [PATCH 2/3] Add generated changelog entries --- changelog/@unreleased/pr-2215.v2.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/@unreleased/pr-2215.v2.yml diff --git a/changelog/@unreleased/pr-2215.v2.yml b/changelog/@unreleased/pr-2215.v2.yml new file mode 100644 index 000000000..7c0cb609b --- /dev/null +++ b/changelog/@unreleased/pr-2215.v2.yml @@ -0,0 +1,5 @@ +type: fix +fix: + description: Include mocktio-errorprone after it has picked up new errorprone + links: + - https://github.com/palantir/gradle-baseline/pull/2215 From 2eb7d13dd0502b7208f8ece049b470b2fa1e2c41 Mon Sep 17 00:00:00 2001 From: Robert Kruszewski Date: Thu, 21 Apr 2022 18:08:23 +0100 Subject: [PATCH 3/3] conf --- baseline-error-prone/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/baseline-error-prone/build.gradle b/baseline-error-prone/build.gradle index c826a5eb3..a0503ad66 100644 --- a/baseline-error-prone/build.gradle +++ b/baseline-error-prone/build.gradle @@ -7,7 +7,7 @@ dependencies { implementation 'com.google.errorprone:error_prone_core' // Ensure a new enough version of dataflow-errorprone is available implementation 'org.checkerframework:dataflow-errorprone' - implementation 'org.mockito:mockito-errorprone' + runtimeOnly 'org.mockito:mockito-errorprone' testImplementation gradleApi() testImplementation 'com.palantir.tokens:auth-tokens'