nightly

palantir · Sep 26, 2019 · 0655782 · 0655782
1 parent 9e87857
commit 0655782
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/tasks/RefasterCompileTask.java b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/tasks/RefasterCompileTask.java
@@ -21,14 +21,13 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import org.gradle.api.Action;
-import org.gradle.api.Task;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.ResolvedArtifact;
 import org.gradle.api.provider.Property;
 import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.compile.JavaCompile;
+import org.gradle.work.InputChanges;
 
 public class RefasterCompileTask extends JavaCompile {
 
@@ -44,8 +43,8 @@ public RefasterCompileTask() {
     }
 
     @Override
-    protected void compile() {
-        // Clear out the default error-prone providers
+    protected void compile(InputChanges inputs) {
+            // Clear out the default error-prone providers
         getOptions().getCompilerArgumentProviders().clear();
         getOptions().setCompilerArgs(ImmutableList.of(
                 "-Xplugin:BaselineRefasterCompiler --out " + refasterRulesFile.get().getAbsolutePath()));
@@ -71,7 +70,7 @@ protected void compile() {
 
         if (!javaSources.isEmpty()) {
             setSource(javaSources);
-            super.compile();
+            super.compile(inputs);
         } else {
             setDidWork(false);
             onlyIf(t -> false);

diff --git a/...va/src/test/groovy/com/palantir/baseline/BaselineErrorProneRefasterIntegrationTest.groovy b/...va/src/test/groovy/com/palantir/baseline/BaselineErrorProneRefasterIntegrationTest.groovy
@@ -34,6 +34,8 @@ class BaselineErrorProneRefasterIntegrationTest extends AbstractPluginTest {
         repositories {
             mavenLocal()
             jcenter()
+            // TODO(forozco): figure out why pTML no longer works
+            maven { url  "http://palantir.bintray.com/releases" }
         }
         tasks.withType(JavaCompile) {
             options.compilerArgs += ['-Werror', '-Xlint:deprecation']
@@ -52,7 +54,7 @@ class BaselineErrorProneRefasterIntegrationTest extends AbstractPluginTest {
         '''.stripIndent()
 
         then:
-        BuildResult result = with('compileJava', '-i', '-PrefasterApply', '-s').build()
+        BuildResult result = with('compileJava', '-i', '-PrefasterApply').build()
         result.task(":compileJava").outcome == TaskOutcome.SUCCESS
         file('build/refaster/rules.refaster').exists()
         file('src/main/java/test/Test.java').text == '''

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-6.0-20190925220032+0000-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists