Merge pull request #40 from macedigital/gradle-2.x-compatible

Gradle 2.x compatibility

Author: purplefox

build.gradle

@@ -55,6 +55,17 @@ dependencies {
   provided "org.codehaus.groovy:groovy-all:$groovyVersion"
   provided "io.vertx:lang-groovy:$groovyLangModVersion@jar"
 
+  // If you're creating Scala compiled verticles you may need the following dependencies
+  provided "org.scala-lang:scala-library:$scalaVersion"
+  provided "io.vertx:lang-scala:$scalaLangModVersion@jar"
+
+  // If you're creating Jython compiled verticles you may need the following dependencies
+  provided "org.python:jython-standalone:$jythonVersion"
+  provided "io.vertx:lang-jython:$jythonLangModVersion@jar"
+
+  // If you're creating Jruby compiled verticles you may need the following dependencies
+  provided "org.jruby:jruby-complete:$jrubyVersion"
+  provided "io.vertx:lang-jruby:$jrubyLangModVersion@jar"
 }
 
 test {

gradle.properties

@@ -17,13 +17,32 @@ pullInDeps=true
 createFatJar=true
 
 # The version of Groovy language to compile against (if you are using Groovy compiled verticles or VertxTests)
-groovyLangModVersion=2.0.0-final
+groovyLangModVersion=2.1.1-final
 
 # The version of Groovy to use (if you are using Groovy)
-groovyVersion=2.1.5
+groovyVersion=2.3.7
+
+# The version of Scala language to compile against (if you are using Scala compiled verticles or VertxTests)
+scalaLangModVersion=1.1.0-SNAPSHOT
+
+# The version of Scala to use (if you are using Scala)
+scalaVersion=2.11.4
+
+# The version of Jython language to compile against (if you are using Jython compiled verticles or VertxTests)
+jythonLangModVersion=2.1.1
+
+# The version of Jython to use (if you are using Jython)
+jythonVersion=2.5.3
+
+# The version of JRuby language to compile against (if you are using JRuby compiled verticles or VertxTests)
+jrubyLangModVersion=2.1.0-final
+
+# The version of JRuby to use (if you are using JRuby)
+jrubyVersion=1.7.16.1
+
 
 # Gradle version
-gradleVersion=1.10
+gradleVersion=2.2.1
 
 # The version of Vert.x
 vertxVersion=2.1.5

gradle/vertx.gradle

@@ -18,6 +18,7 @@ import org.vertx.java.platform.impl.cli.Starter
 
 apply plugin: 'java'
 apply plugin: 'groovy'
+apply plugin: 'scala'
 apply plugin: 'idea'
 apply plugin: 'eclipse'
 
@@ -59,6 +60,7 @@ repositories {
 dependencies {
   provided "io.vertx:vertx-core:$vertxVersion"
   provided "io.vertx:vertx-platform:$vertxVersion"
+  provided "io.vertx:vertx-hazelcast:$vertxVersion"
   testCompile "junit:junit:$junitVersion"
   testCompile "io.vertx:testtools:$toolsVersion"
 }
@@ -101,7 +103,9 @@ sourceSets {
 
 task copyMod( type:Copy, dependsOn: 'classes', description: 'Assemble the module into the local mods directory' ) {
   into "build/mods/$moduleName"
+  from compileGroovy
   from compileJava
+  from compileScala
   from 'src/main/resources'
   into( 'lib' ) {
     from configurations.compile
@@ -124,7 +128,7 @@ task sourceJar(type: Jar) {
 }
 
 javadoc {
-    classpath = configurations.compile + configurations.provided
+  classpath = configurations.compile + configurations.provided
 }
 
 task javadocJar(type: Jar) {
@@ -167,12 +171,8 @@ task collectDeps(type: Copy) {
   }
 }
 
-task runMod(description: 'Run the module', dependsOn: collectDeps) << {
-  setSysProps()
-  // We also init here - this means for single module builds the user doesn't have to explicitly init -
-  // they can just do runMod
-  doInit()
-  args = ['runmod', moduleName]
+task runMod(description: 'Run the module', dependsOn: [collectDeps, classes, init]) << {
+  def args = ['runmod', moduleName]
   def args2 = runModArgs.split("\\s+")
   args.addAll(args2)
   Starter.main(args as String[])
@@ -187,7 +187,10 @@ def doInit() {
       "bin\r\n" +
       "out/production/${project.name}\r\n" +
       "out/test/${project.name}\r\n" +
-      "build/deps\r\n";
+      "build/deps\r\n" +
+      "build/classes/main\r\n" +
+      "build/resources/main\r\n";
+
     cpFile << defaultCp;
   }
   def args = ['create-module-link', moduleName]
@@ -234,10 +237,10 @@ def loadProperties(String sourceFileName) {
 plugins.withType(IdeaPlugin) {
   idea {
     module {
-      scopes.PROVIDED.plus += configurations.provided
-      scopes.COMPILE.minus += configurations.provided
-      scopes.TEST.minus += configurations.provided
-      scopes.RUNTIME.minus += configurations.provided
+      scopes.PROVIDED.plus += [configurations.provided]
+      scopes.COMPILE.minus += [configurations.provided]
+      scopes.TEST.minus += [configurations.provided]
+      scopes.RUNTIME.minus += [configurations.provided]
     }
   }
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Mon Jan 28 08:12:12 GMT 2013
+#Tue Dec 30 05:10:34 CET 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -9,7 +9,7 @@ mavenLocal:~/.m2/repository
 maven:http://repo2.maven.org/maven2
 
 # Sonatype snapshots
-maven:http://oss.sonatype.org/content/repositories/snapshots
+maven:https://oss.sonatype.org/content/repositories/snapshots
 
 # Bintray
 bintray:http://dl.bintray.com