Merge pull request #340 from MSNexploder/fix_deprecated_simple_work_result

rtyler · web-flow · commit 4db1cf2cd265 · 2019-05-04T22:28:46.000-07:00
use WorkResults.didWork() instead of deprecated SimpleWorkResult
diff --git a/jruby-gradle-jar-plugin/src/main/groovy/com/github/jrubygradle/jar/internal/JRubyJarCopyAction.groovy b/jruby-gradle-jar-plugin/src/main/groovy/com/github/jrubygradle/jar/internal/JRubyJarCopyAction.groovy
@@ -29,7 +29,7 @@ import org.gradle.api.internal.file.CopyActionProcessingStreamAction
 import org.gradle.api.internal.file.copy.CopyAction
 import org.gradle.api.internal.file.copy.CopyActionProcessingStream
 import org.gradle.api.internal.file.copy.FileCopyDetailsInternal
-import org.gradle.api.internal.tasks.SimpleWorkResult
+import org.gradle.api.tasks.WorkResults
 import org.gradle.api.tasks.WorkResult
 import org.gradle.api.tasks.bundling.Zip
 import org.gradle.api.tasks.util.PatternSet
@@ -108,7 +108,7 @@ class JRubyJarCopyAction implements CopyAction {
                 )
             }
         }
-        return new SimpleWorkResult(true)
+        return WorkResults.didWork(true)
     }
 
     private void processTransformers(ZipOutputStream s) {

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ import org.gradle.api.internal.file.CopyActionProcessingStreamAction`
`29`	`29`	`import org.gradle.api.internal.file.copy.CopyAction`
`30`	`30`	`import org.gradle.api.internal.file.copy.CopyActionProcessingStream`
`31`	`31`	`import org.gradle.api.internal.file.copy.FileCopyDetailsInternal`
`32`		`-import org.gradle.api.internal.tasks.SimpleWorkResult`
	`32`	`+import org.gradle.api.tasks.WorkResults`
`33`	`33`	`import org.gradle.api.tasks.WorkResult`
`34`	`34`	`import org.gradle.api.tasks.bundling.Zip`
`35`	`35`	`import org.gradle.api.tasks.util.PatternSet`
`@@ -108,7 +108,7 @@ class JRubyJarCopyAction implements CopyAction {`
`108`	`108`	`)`
`109`	`109`	`}`
`110`	`110`	`}`
`111`		`- return new SimpleWorkResult(true)`
	`111`	`+ return WorkResults.didWork(true)`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`private void processTransformers(ZipOutputStream s) {`