From 6ba273d693b63be7cb4c7914d01e2cc17a48cf91 Mon Sep 17 00:00:00 2001 From: Galder Zamarren˃o Date: Thu, 17 Oct 2013 19:15:03 +0200 Subject: Refactor --- build.gradle | 40 ++++----------------- buildSrc/build.gradle | 14 ++++++++ buildSrc/lib/frege-3.21.232-g7b05453.jar | Bin 0 -> 10720001 bytes .../groovy/org/gradle/frege/FregePlugin.groovy | 13 +++++++ .../main/groovy/org/gradle/frege/FregeTask.groovy | 31 ++++++++++++++++ lib/frege-3.21.232-g7b05453.jar | Bin 10720001 -> 0 bytes 6 files changed, 65 insertions(+), 33 deletions(-) create mode 100644 buildSrc/build.gradle create mode 100644 buildSrc/lib/frege-3.21.232-g7b05453.jar create mode 100644 buildSrc/src/main/groovy/org/gradle/frege/FregePlugin.groovy create mode 100644 buildSrc/src/main/groovy/org/gradle/frege/FregeTask.groovy delete mode 100644 lib/frege-3.21.232-g7b05453.jar diff --git a/build.gradle b/build.gradle index cefc288..011a41f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,36 +1,10 @@ -apply plugin: FregePlugin -apply plugin: "idea" -apply plugin: "java" - -class FregePlugin implements Plugin { - void apply(Project project) { - // Add the 'greeting' extension object - project.extensions.create("frege", FregePluginExtension) - // Add a task that uses the configuration - project.task('hello') << { - - - "java -cp " - "frege.compiler.Main" - - - - } - } -} - -class FregePluginExtension { - -} - -repositories { - - flatDir name:"frege-lib", dirs:"lib" +import org.gradle.frege.FregePlugin +buildscript { + repositories { + flatDir name:"frege-lib", dirs:"buildSrc/lib" + } } -dependencies { - - compile ":frege:3.21.232-g7b05453" - -} \ No newline at end of file +apply plugin: FregePlugin +apply plugin: "idea" \ No newline at end of file diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle new file mode 100644 index 0000000..1b520fb --- /dev/null +++ b/buildSrc/build.gradle @@ -0,0 +1,14 @@ +apply plugin: "groovy" + +repositories { + + flatDir name:"frege-lib", dirs:"lib" + +} + +dependencies { + + compile ":frege:3.21.232-g7b05453" + compile gradleApi() + +} \ No newline at end of file diff --git a/buildSrc/lib/frege-3.21.232-g7b05453.jar b/buildSrc/lib/frege-3.21.232-g7b05453.jar new file mode 100644 index 0000000..254d961 Binary files /dev/null and b/buildSrc/lib/frege-3.21.232-g7b05453.jar differ diff --git a/buildSrc/src/main/groovy/org/gradle/frege/FregePlugin.groovy b/buildSrc/src/main/groovy/org/gradle/frege/FregePlugin.groovy new file mode 100644 index 0000000..93c5f26 --- /dev/null +++ b/buildSrc/src/main/groovy/org/gradle/frege/FregePlugin.groovy @@ -0,0 +1,13 @@ +package org.gradle.frege + +import org.gradle.api.Plugin +import org.gradle.api.Project + +class FregePlugin implements Plugin { + + void apply(Project project) { + project.apply(plugin: 'base') + project.task('compileFrege', type: FregeTask, group: 'Build') + } + +} diff --git a/buildSrc/src/main/groovy/org/gradle/frege/FregeTask.groovy b/buildSrc/src/main/groovy/org/gradle/frege/FregeTask.groovy new file mode 100644 index 0000000..cdd089a --- /dev/null +++ b/buildSrc/src/main/groovy/org/gradle/frege/FregeTask.groovy @@ -0,0 +1,31 @@ +package org.gradle.frege + +import org.gradle.api.DefaultTask +import org.gradle.api.GradleException +import org.gradle.api.InvalidUserDataException +import org.gradle.api.tasks.* + +class FregeTask extends DefaultTask { + + @Input boolean hints + + @Input boolean verbose + + @Input boolean inline = true + + @Input boolean make = true + + @Input boolean skipCompile + + @Input boolean includeStale + + @TaskAction + void executeCompile() { + println "Compiling Frege" + + + + + } + +} \ No newline at end of file diff --git a/lib/frege-3.21.232-g7b05453.jar b/lib/frege-3.21.232-g7b05453.jar deleted file mode 100644 index 254d961..0000000 Binary files a/lib/frege-3.21.232-g7b05453.jar and /dev/null differ -- cgit