Merge pull request #145 from xtext/issue_144

Use class instead of lambda
xtext · Feb 25, 2019 · 3ec57ea · 3ec57ea
2 parents 22c04d0 + 59cba63
commit 3ec57ea
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/...roid-gradle-plugin/src/main/java/org/xtext/gradle/android/XtextAndroidBuilderPlugin.xtend b/...roid-gradle-plugin/src/main/java/org/xtext/gradle/android/XtextAndroidBuilderPlugin.xtend
@@ -7,10 +7,12 @@ import com.android.build.gradle.LibraryExtension
 import com.android.build.gradle.LibraryPlugin
 import com.android.build.gradle.api.BaseVariant
 import com.android.build.gradle.internal.api.TestedVariant
+import org.gradle.api.Action
 import org.gradle.api.DomainObjectSet
 import org.gradle.api.GradleException
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.Task
 import org.gradle.api.tasks.compile.AbstractCompile
 import org.xtext.gradle.XtextBuilderPlugin
 import org.xtext.gradle.XtextJavaLanguagePlugin
@@ -74,7 +76,11 @@ class XtextAndroidBuilderPlugin implements Plugin<Project> {
 				variant.generateBuildConfig
 			)
 			generatorTask.dependsOn(variant.outputs.map[processResources])
-			variant.javaCompiler.doLast[generatorTask.installDebugInfo]
+			variant.javaCompiler.doLast(new Action<Task>() {
+				override void execute(Task it) {
+					generatorTask.installDebugInfo()
+				}
+			})
 			val sourceDirs = newArrayList
 			val javaDirs = variant.sourceSets.map[javaDirectories].flatten.filter[directory]
 			sourceDirs += javaDirs

diff --git a/xtext-gradle-plugin/src/main/java/org/xtext/gradle/XtextBuilderPlugin.xtend b/xtext-gradle-plugin/src/main/java/org/xtext/gradle/XtextBuilderPlugin.xtend
@@ -4,9 +4,11 @@ import java.io.File
 import java.util.Set
 import java.util.concurrent.Callable
 import org.eclipse.xtext.xbase.lib.Functions.Function0
+import org.gradle.api.Action
 import org.gradle.api.GradleException
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.Task
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.file.FileCollection
 import org.gradle.api.plugins.BasePlugin
@@ -158,9 +160,11 @@ class XtextBuilderPlugin implements Plugin<Project> {
 						]
 						if (!javaOutlets.isEmpty) {
 							javaCompile.dependsOn(generatorTask)
-							javaCompile.doLast[
-								generatorTask.installDebugInfo
-							]
+							javaCompile.doLast(new Action<Task>() {
+								override void execute(Task it) {
+									generatorTask.installDebugInfo()
+								}
+							})
 						}
 						generatorTask.options.encoding = generatorTask.options.encoding ?: javaCompile.options.encoding
 						generatorTask.classpath = generatorTask.classpath ?: javaSourceSet.compileClasspath