Bump Gradle version

[jpf-core.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index 9193447c3f748620e7bbe5fe9429f9ab02b497cb..c8582eb28bdde00804d462cfb48babc8261ea42a 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,13 @@
-apply plugin: "java"
+plugins {
+    id "java"
+    id "eclipse"
+}
+
+def getCurrentVersion() {
+    "DEVELOPMENT-SNAPSHOT"
+}
+
+version = currentVersion

 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8


@@ -7,7 +16,7 @@ ext.manifestCommonAttrbutes = manifest {
     attributes(
         "Built-By": System.getProperty("user.name"),
         "Implementation-Vendor": "NASA Ames Research Center",
     attributes(
         "Built-By": System.getProperty("user.name"),
         "Implementation-Vendor": "NASA Ames Research Center",

-        "Implementation-Version": "1234" // FIXME
+        "Implementation-Version": version

     )
 }
 
     )
 }
 


@@ -68,13 +77,9 @@ task generateBuildInfo {
     description = "Generates the build.properties file."
     doLast {
 
     description = "Generates the build.properties file."
     doLast {
 

-        // Must fail if there are uncommitted changes
-        def status  = "git status --short".execute().text.trim()
-        if (!status.isEmpty()) {
-            throw new GradleException("There are uncomitted changes:\n " + status)
-        }

         Properties info = new Properties()
 
         Properties info = new Properties()
 

+        def status  = "git status --short".execute().text.trim()

         def revision = "git rev-parse --short HEAD".execute().text.trim()
         def userName = ["git", "log", "-1", "--format=%an <%ae>"].execute().text.trim()
         def date = "git log -1 --format=%ci".execute().text.trim()
         def revision = "git rev-parse --short HEAD".execute().text.trim()
         def userName = ["git", "log", "-1", "--format=%an <%ae>"].execute().text.trim()
         def date = "git log -1 --format=%ci".execute().text.trim()


@@ -123,7 +128,7 @@ task srcDist(type: Zip) {
     description = "Builds the source distribution."
 
     baseName = project.name
     description = "Builds the source distribution."
 
     baseName = project.name

-    version = "git rev-parse --short HEAD".execute().text.trim()
+    version = project.version

     classifier = "src"
     extension = "zip"
 
     classifier = "src"
     extension = "zip"
 


@@ -149,7 +154,7 @@ task dist(type: Zip) {
     description = "Builds binary distribution."
 
     baseName = project.name
     description = "Builds binary distribution."
 
     baseName = project.name

-    version = "git rev-parse --short HEAD".execute().text.trim()
+    version = project.version

     extension = "zip"
 
     destinationDir = buildDir
     extension = "zip"
 
     destinationDir = buildDir


@@ -349,4 +354,22 @@ test {
     }
 }
 
     }
 }
 

+eclipse {
+    group = "JPF IDE Support"
+
+    project {
+        natures = ["org.eclipse.buildship.core.gradleprojectnature"]
+    }
+    classpath {
+        defaultOutputDir = buildDir
+        file {
+            whenMerged { classpath ->
+                classpath.entries.findAll{ entry -> entry.kind == "src" }*.every { srcNode ->
+                    srcNode.output = srcNode.output.replace("bin", "${buildDir.name}")
+                }
+            }
+        }
+    }
+}
+

 defaultTasks "buildJars"
 defaultTasks "buildJars"