Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Include mocktio-errorprone after it has picked up new errorprone #2215

Merged
merged 3 commits into from
Apr 21, 2022
Merged

Fix: Include mocktio-errorprone after it has picked up new errorprone #2215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
006c907
ifx
Apr 21, 2022
fc63c33
Add generated changelog entries
svc-changelog Apr 21, 2022
2eb7d13
conf
Apr 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions baseline-error-prone/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
runtimeOnly 'org.mockito:mockito-errorprone'

testImplementation gradleApi()
testImplementation 'com.palantir.tokens:auth-tokens'
Expand Down
5 changes: 5 additions & 0 deletions changelog/@unreleased/pr-2215.v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
5 changes: 3 additions & 2 deletions versions.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down