Merge pull request #441 from jasoma/gradle-daemon-fix

Fix the ubuntu build for the gradle plugin

Author: Igor Polevoy

activejdbc-gradle-plugin/build.gradle

@@ -1,12 +1,16 @@
+import org.apache.tools.ant.taskdefs.condition.Os
+
 group 'org.javalite'
 version '1.4.12-SNAPSHOT'
 
 apply plugin: 'groovy'
+apply plugin: 'maven'
 
 sourceCompatibility = 1.7
 
 repositories {
     mavenCentral()
+    maven { url 'http://repo.javalite.io' }
 }
 
 configurations {
@@ -16,8 +20,8 @@ configurations {
 dependencies {
     compile gradleApi()
     compile localGroovy()
-    compile group: 'org.javalite', name: 'activejdbc', version: '1.4.11'
-    compile group: 'org.javalite', name: 'activejdbc-instrumentation', version: '1.4.11'
+    compile group: 'org.javalite', name: 'activejdbc', version: "${project.version}"
+    compile group: 'org.javalite', name: 'activejdbc-instrumentation', version: "${project.version}"
 
     deployerJars group: 'org.apache.maven.wagon', name: 'wagon-http', version: '2.2'
 }
@@ -46,8 +50,6 @@ task moveJars(type: Copy, dependsOn: ['docJar', 'sourceJar']) {
     exclude jar.archivePath.name
 }
 
-build.dependsOn << [moveJars, moveClasses]
-
 clean {
     delete 'target'
 }
@@ -57,3 +59,35 @@ artifacts {
     archives docJar
     archives sourceJar
 }
+
+build.dependsOn << ['testPluginSubproject', 'moveJars', 'moveClasses']
+
+task testDaemonBuild1(type: TestProjectBuild) { useDaemon = true }
+task testDaemonBuild2(type: TestProjectBuild) { useDaemon = true }
+task testNormalBuild1(type: TestProjectBuild) {}
+task testNormalBuild2(type: TestProjectBuild) {}
+
+task testPluginSubproject(dependsOn: ['test', 'install', 'testDaemonBuild1', 'testDaemonBuild2', 'testNormalBuild1', 'testNormalBuild2'])
+
+class TestProjectBuild extends Exec {
+
+    boolean useDaemon = false
+
+    @Override
+    protected void exec() {
+        workingDir('test-project')
+        def buildArgs = []
+        if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+            executable('cmd')
+            buildArgs += ['/c', '..\\gradlew.bat']
+        } else {
+            executable('../gradlew')
+        }
+
+        def daemonArg = (useDaemon) ? '--daemon' : '--no-daemon'
+        buildArgs += [daemonArg, '--stacktrace', "-Pactivejdbc.version=${project.version}", 'test']
+        args(buildArgs)
+
+        super.exec()
+    }
+}

activejdbc-gradle-plugin/test-project/build.gradle

@@ -0,0 +1,45 @@
+buildscript {
+    repositories {
+        mavenCentral()
+        mavenLocal()
+        maven { url 'http://repo.javalite.io' }
+    }
+    dependencies {
+        classpath "org.javalite:activejdbc-gradle-plugin:${property('activejdbc.version')}"
+        classpath 'org.flywaydb:flyway-gradle-plugin:3.2.1'
+        classpath "com.h2database:h2:1.4.187"
+    }
+}
+
+apply plugin: 'java'
+apply plugin: 'org.javalite.activejdbc'
+apply plugin: 'org.flywaydb.flyway'
+
+repositories {
+    mavenCentral()
+    maven { url 'http://repo.javalite.io/' }
+}
+
+dependencies {
+    compile "org.javalite:activejdbc:${property('activejdbc.version')}"
+    compile "com.h2database:h2:1.4.187"
+    testCompile 'junit:junit:4.12'
+}
+
+sourceCompatibility = 1.7
+
+task cleanDb(type: Delete) {
+    delete 'build/testdb'
+}
+
+flyway {
+    url = 'jdbc:h2:file:./build/testdb/db'
+}
+
+test {
+    dependsOn << 'cleanDb'
+    dependsOn << 'flywayMigrate'
+    testLogging.events 'passed', 'skipped', 'failed'
+    testLogging.exceptionFormat = 'full'
+    testLogging.showStandardStreams = true
+}