From 1162369a0a505344b7138c189c27a070e085d48a Mon Sep 17 00:00:00 2001 From: Carter Kozak Date: Thu, 19 Sep 2019 13:59:43 -0400 Subject: [PATCH] Remove unnecessary dependencies to fix builds. (#194) Remove unnecessary dependencies to fix builds. --- build.gradle | 7 ++++++- .../java/com/palantir/gradle/graal/ExtractGraalTask.java | 3 +-- versions.lock | 4 +--- versions.props | 1 - 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 5a4762af..8d6a3501 100644 --- a/build.gradle +++ b/build.gradle @@ -59,7 +59,6 @@ version gitVersion() dependencies { compile localGroovy() compile gradleApi() - compile 'com.palantir.safe-logging:preconditions' testCompile gradleTestKit() testCompile 'com.netflix.nebula:nebula-test' @@ -93,3 +92,9 @@ pluginBundle { } } +tasks.withType(JavaCompile).configureEach { + options.errorprone.errorproneArgs += [ + '-Xep:PreferSafeLoggableExceptions:OFF', + '-Xep:PreferSafeLoggingPreconditions:OFF', + ] +} diff --git a/src/main/java/com/palantir/gradle/graal/ExtractGraalTask.java b/src/main/java/com/palantir/gradle/graal/ExtractGraalTask.java index 0e9541f3..79cfc981 100644 --- a/src/main/java/com/palantir/gradle/graal/ExtractGraalTask.java +++ b/src/main/java/com/palantir/gradle/graal/ExtractGraalTask.java @@ -16,7 +16,6 @@ package com.palantir.gradle.graal; -import com.palantir.logsafe.exceptions.SafeIllegalStateException; import java.io.File; import java.nio.file.Path; import java.nio.file.Paths; @@ -65,7 +64,7 @@ public ExtractGraalTask() { @TaskAction public final void extractGraal() { if (!graalVersion.isPresent()) { - throw new SafeIllegalStateException("extract task requires graal.graalVersion to be defined."); + throw new IllegalStateException("extract task requires graal.graalVersion to be defined."); } Project project = getProject(); diff --git a/versions.lock b/versions.lock index 0f6d5c21..c442fb5e 100644 --- a/versions.lock +++ b/versions.lock @@ -1,11 +1,9 @@ # Run ./gradlew --write-locks to regenerate this file -com.google.errorprone:error_prone_annotations:2.3.3 (3 constraints: 2220171d) -com.palantir.safe-logging:preconditions:1.10.1 (1 constraints: 35052a3b) -com.palantir.safe-logging:safe-logging:1.10.1 (1 constraints: 2f114cd1) [Test dependencies] cglib:cglib-nodep:3.2.2 (1 constraints: 490ded24) com.google.code.findbugs:jsr305:3.0.2 (2 constraints: 1d0fb186) +com.google.errorprone:error_prone_annotations:2.3.3 (2 constraints: 1f0f1287) com.google.guava:failureaccess:1.0.1 (1 constraints: 140ae1b4) com.google.guava:guava:27.0.1-jre (2 constraints: c7135868) com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918) diff --git a/versions.props b/versions.props index 1a664811..0a336783 100644 --- a/versions.props +++ b/versions.props @@ -1,6 +1,5 @@ com.google.guava:guava = 27.0.1-jre com.netflix.nebula:nebula-test = 7.3.0 -com.palantir.safe-logging:preconditions = 1.10.1 com.squareup.okhttp3:* = 3.14.1 # conflict resolution