[GNUnet-SVN] r32612 - gnunet-java

[gnunet]

Author: dold
Date: 2014-03-11 02:22:11 +0100 (Tue, 11 Mar 2014)
New Revision: 32612

Modified:
   gnunet-java/build.gradle
Log:
- build file

Modified: gnunet-java/build.gradle
===================================================================
--- gnunet-java/build.gradle    2014-03-11 01:15:45 UTC (rev 32611)
+++ gnunet-java/build.gradle    2014-03-11 01:22:11 UTC (rev 32612)
@@ -2,8 +2,17 @@
  buildfile for gradle (http://gradle.org/)
 */
 
+// we compile java
 apply plugin: 'java'
+// allow creating files for IntelliJ IDEA
+apply plugin: 'idea'
+// code coverage reporting
+apply plugin: 'jacoco'
+// publish repository for other projects to use
+apply plugin: 'ivy-publish'
 
+// put stuff build by gradle in this directory to avoid
+// confusion with IDE-generated stuff
 buildDir = "$projectDir/build-gradle"   
 
 sourceCompatibility = "1.6"
@@ -20,11 +29,11 @@
 }
 
 dependencies {
-  compile group: 'com.google.guava', name: 'guava', version: '14.0.1'
+  compile group: 'com.google.guava', name: 'guava', version: '16.0.1'
   compile group: 'junit', name: 'junit', version: '4.11'
-  compile name: 'log4j', version: '1.2.16'
-  compile name: 'slf4j-api', version: '1.6.4'
-  compile name: 'slf4j-log4j12', version: '1.6.4'
+  compile group: 'log4j', name: 'log4j', version: '1.2.16'
+  compile group: 'org.slf4j', name: 'slf4j-api', version: '1.6.4'
+  compile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.6.4'
 }
 
 
@@ -39,78 +48,6 @@
 
 compileJava.options.debugOptions.debugLevel = "source,lines,vars"
 
-project.ext.instrumentDir = "$buildDir/classes_instrumented"
-project.ext.coberturaDir = "$projectDir/cobertura"
-project.ext.coverageData = "$projectDir/coverage.data"
-project.ext.coverageReportDir = "$projectDir/coverage-report"
-
-task instrument (dependsOn: ['compileJava', 'compileTestJava'], type: 
JavaExec) {
-  inputs.dir compileJava.destinationDir
-  outputs.dir fileTree(dir: instrumentDir)
-
-  classpath = files("$coberturaDir/cobertura.jar", "$coberturaDir/lib/*")
-  main = 'net.sourceforge.cobertura.instrument.Main'
-
-  args "--datafile", "$coverageData"
-  args "--destination", "$instrumentDir"
-
-  doFirst {
-    FileTree tree = fileTree(dir: "$buildDir/classes/main/")
-    tree.visit { element ->
-      args "$buildDir/classes/main/$element.path"
-    }
-  }
-}
-
-
-task testCoverage (dependsOn: ['instrument'], type: Test) {
-  classpath = files("$instrumentDir",
-                    "$coberturaDir/cobertura.jar",
-                    project.sourceSets.test.runtimeClasspath)
-  //testClassesDir = new File("$instrumentDir")
-  systemProperties = ["net.sourceforge.cobertura.datafile":"$coverageData"]
-}
-
-
-testCoverage.outputs.file("$coverageData")
-
-task reportCoverage (type: JavaExec) {
-  description = "Reports code coverage."
-  doFirst {
-    classpath = files("$projectDir/cobertura/cobertura.jar",
-                      "$projectDir/cobertura/lib/*")
-    main = 'net.sourceforge.cobertura.reporting.Main'
-    args "--datafile", "$coverageData"
-    args "--destination", "$coverageReportDir"
-    args "$projectDir/src/"
-  }
-}
-
-reportCoverage.inputs.file("$coverageData")
-reportCoverage.outputs.dir("$coverageReportDir")
-
-reportCoverage.dependsOn testCoverage
-
-
-task createResourcesDir << {
-  def myDir = new File('src/main/resources')  
-  myDir.mkdirs()
-}
-
-/*
-TODO: should we really use the compile task for this?
-*/
-task msgtypes (type: JavaCompile, dependsOn: 'createResourcesDir') {
-  description = "Updates the index of GNUnet message types known to 
gnunet-java."
-  classpath = project.sourceSets.main.runtimeClasspath
-  source = files(project.sourceSets.main.allJava)
-  options.setCompilerArgs(["-processor", 
"org.gnunet.construct.MessageIdAnnotationProcessor",
-                           "-proc:only",
-                           // generated "source" files should resources, tell 
the annotation processor!
-                           "-s", "src/main/resources"])
-  destinationDir = file("$buildDir/classes/main/")
-}
-
 // Define task and dependencies for creating an IZPack installer.
 
 project.ext.installerFile = "$projectDir/gnunet-java-installer.jar"
@@ -138,7 +75,7 @@
 // Which gradle version do we want to use
 // for the wrapper?
 task wrapper(type: Wrapper) {
-    gradleVersion = '1.10'
+    gradleVersion = '1.11'
 }
 
 
@@ -149,3 +86,43 @@
         logger.warn("Starting Test ${descr.className} : ${descr.name}")    
     }
 }
+
+task copyDeps(type: Copy) {
+  into "$projectDir/lib"
+  from configurations.runtime
+}
+
+task createResourcesDir << {
+  def myDir = new File('src/main/resources')  
+  myDir.mkdirs()
+}
+
+
+task msgtypes (type: JavaCompile, dependsOn: 'createResourcesDir') {
+  description = "Updates the index of GNUnet message types known to 
gnunet-java."
+  classpath = project.sourceSets.main.runtimeClasspath
+  source = files(project.sourceSets.main.allJava)
+  options.setCompilerArgs(["-processor", 
"org.gnunet.construct.MessageIdAnnotationProcessor",
+                           "-proc:only",
+                           // generated "source" files should resources, tell 
the annotation processor!
+                           "-s", "src/main/resources"])
+  destinationDir = file("$buildDir/classes/main/")
+}
+
+
+
+publishing {
+  publications {
+    ivyGnuNetJava (IvyPublication) {
+      organisation 'org.gnunet'
+      module 'gnunet-java'
+      revision '0.2'
+      from components.java
+    }
+  }
+  repositories {
+    ivy {
+      url "$projectDir/ivy-repo"
+    }
+  }
+}