From 07502db354b20f0527cd927c0a785031500fddfe Mon Sep 17 00:00:00 2001
From: Rene Groeschke <rene@gradle.com>
Date: Tue, 12 Apr 2016 21:26:54 +0200
Subject: Add support for >gradle 2.12

- update wrapper to 2.12
- fix sourcedirectory setup
- add integTest coverage for 2.12
---
 src/main/groovy/frege/gradle/plugins/FregeBasePlugin.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/main/groovy/frege/gradle/plugins/FregeBasePlugin.java')

diff --git a/src/main/groovy/frege/gradle/plugins/FregeBasePlugin.java b/src/main/groovy/frege/gradle/plugins/FregeBasePlugin.java
index 6d7a639..f45dae4 100644
--- a/src/main/groovy/frege/gradle/plugins/FregeBasePlugin.java
+++ b/src/main/groovy/frege/gradle/plugins/FregeBasePlugin.java
@@ -1,6 +1,7 @@
 package frege.gradle.plugins;
 
 import frege.gradle.DefaultFregeSourceSet;
+import frege.gradle.FregeSourceSetDirectoryFactory;
 import frege.gradle.tasks.FregeCompile;
 import org.gradle.api.Action;
 import org.gradle.api.Plugin;
@@ -8,6 +9,7 @@ import org.gradle.api.Project;
 import org.gradle.api.file.FileTreeElement;
 import org.gradle.api.internal.file.FileResolver;
 import org.gradle.api.internal.plugins.DslObject;
+import org.gradle.api.internal.project.ProjectInternal;
 import org.gradle.api.internal.tasks.DefaultSourceSet;
 import org.gradle.api.plugins.JavaBasePlugin;
 import org.gradle.api.plugins.JavaPluginConvention;
@@ -44,7 +46,8 @@ public class FregeBasePlugin implements Plugin<Project> {
     private void configureSourceSetDefaults(final JavaBasePlugin javaBasePlugin) {
         project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().all(new Action<SourceSet>() {
             public void execute(final SourceSet sourceSet) {
-                final DefaultFregeSourceSet fregeSourceSet = new DefaultFregeSourceSet(((DefaultSourceSet) sourceSet).getDisplayName(), fileResolver);
+                FregeSourceSetDirectoryFactory factory = new FregeSourceSetDirectoryFactory((ProjectInternal) project, fileResolver);
+                final DefaultFregeSourceSet fregeSourceSet = new DefaultFregeSourceSet(((DefaultSourceSet) sourceSet).getDisplayName(), factory);
                 new DslObject(sourceSet).getConvention().getPlugins().put("frege", fregeSourceSet);
 
                 final String defaultSourcePath = String.format("src/%s/frege", sourceSet.getName());
-- 
cgit