Tidy up files, added extension configuration

3 files changed, 25 insertions, 11 deletions

diff --git a/build.gradle b/build.gradle
index dbd86af..196731c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,11 +3,13 @@ apply plugin: "groovy"
 apply plugin: "maven"
 apply plugin: "signing"
 
+defaultTasks "build"
+
 ext {
     isSnapshot = true
     baseVersion = "0.1"
     snapshotAppendix = "-SNAPSHOT"
-    fregeVersion = baseVersion + (isSnapshot ? snapshotAppendix : "")
+    pluginVersion = baseVersion + (isSnapshot ? snapshotAppendix : "")
 
     sonatypeBaseUrl = "https://oss.sonatype.org"
     sonatypeSnapshotUrl = "$sonatypeBaseUrl/content/repositories/snapshots/"
@@ -32,6 +34,8 @@ ext {
 
     primaryEmail = "frege-programming-language@googlegroups.com"
 
+    fregeVersion = "3.22.324"
+    fregeClassifier = "-g630677b"
 }
 
 repositories {
@@ -42,17 +46,13 @@ repositories {
 
 }
 
-version = fregeVersion
+version = pluginVersion
 group = groupName
 
 dependencies {
-    compile 'com.theoryinpractise.frege:frege:3.22.324-g630677b'
-//    compile ":frege:3.21.232-g7b05453"
-//    compile "com.theoryinpractise.frege:frege:3.21.232-g7b05453"
-//    compile 'com.theoryinpractise.frege:frege:3.21.232-g7b05453'
+    compile "com.theoryinpractise.frege:frege:${fregeVersion}${fregeClassifier}"
     compile gradleApi()
     compile localGroovy()
-
 }
 
 Boolean doSigning() {
diff --git a/src/main/groovy/org/gradle/frege/FregePlugin.groovy b/src/main/groovy/org/gradle/frege/FregePlugin.groovy
index 93c5f26..491930c 100644
--- a/src/main/groovy/org/gradle/frege/FregePlugin.groovy
+++ b/src/main/groovy/org/gradle/frege/FregePlugin.groovy
@@ -5,9 +5,12 @@ import org.gradle.api.Project
 
 class FregePlugin implements Plugin<Project> {
 
-  void apply(Project project) {
-    project.apply(plugin: 'base')
-    project.task('compileFrege', type: FregeTask, group: 'Build')
-  }
+    void apply(Project project) {
+        project.apply(plugin: 'base')
+        project.extensions.create("frege", FregePluginExtension)
+        project.task('compileFrege', type: FregeTask, group: 'Build') << {
+
+        }
+    }
 
 }
diff --git a/src/main/groovy/org/gradle/frege/FregePluginExtension.groovy b/src/main/groovy/org/gradle/frege/FregePluginExtension.groovy
new file mode 100644
index 0000000..b1d3965
--- /dev/null
+++ b/src/main/groovy/org/gradle/frege/FregePluginExtension.groovy
@@ -0,0 +1,11 @@
+package org.gradle.frege
+
+/**
+ * Created by mperry on 6/02/2015.
+ */
+class FregePluginExtension {
+
+
+    String value1
+
+}