Merge pull request #58 from ysb33r/development

1.0-beta7 Release
FIXED #57

CHANGELOG.adoc

@@ -37,6 +37,7 @@ for a specific release, please visit the http://ysb33r.github.io/gradleTest[plug
 * https://github.com/ysb33r/gradleTest/issues/49[#49] - When folders below `gradleTest` are removed, generated code
   should be removed too.
 * https://github.com/ysb33r/gradleTest/issues/53[#53] - Skip test generation if `src/gradleTest` does not exist.
+* https://github.com/ysb33r/gradleTest/issues/57[#57] - Transitive dependencies for pluginsare not injected into classpath.
 
 === Other
 

build.gradle

@@ -7,13 +7,14 @@ plugins {
     id 'com.gradle.plugin-publish' version '0.9.4'
     id 'com.github.hierynomus.license' version '0.13.1'
 	id 'org.asciidoctor.convert' version '1.5.3'
+	id 'org.ysb33r.cloudci' version '1.0'
 }
 
 import org.asciidoctor.gradle.AsciidoctorTask
 
 group = 'org.ysb33r.gradle'
 archivesBaseName = 'gradletest'
-version = '1.0-beta5'
+version = '1.0-beta7'
 
 apply from : 'gradle/integration-tests.gradle'
 apply from : 'gradle/compatibility-tests.gradle'
@@ -326,7 +327,8 @@ asciidoctor {
 	}
 
 	attributes revnumber: "${version}",
-		projectdir : projectDir.absolutePath
+		topdir : projectDir.absolutePath,
+		compatdir : file('compatibility').absolutePath
 }
 
 

compatibility/compatibility.gradle

@@ -7,7 +7,7 @@
 //   be accessed as a rootProject as would be the normal convention.
 // - We redirect the build directory to be underneath the calling project's
 //   build directory.
-// - Any test dpenedencies are picked up from the test dependencies of the
+// - Any test dpenedencie/Users/schalkc/Projects/GradleTest/compatibility/compatibility.gradles are picked up from the test dependencies of the
 //   calling project.
 // - We need to run this project with the GradleTest jat that was created by
 //   the calling project
@@ -19,9 +19,16 @@
 //   the sanityCheck task will fail the build if need be.
 // ----------------------------------------------------------------------------
 
+
 buildscript {
+    repositories {
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
+    }
     dependencies {
         classpath fileTree("${projectDir}/../build/libs") { include "gradletest-${compatibilityVersion}.jar"}
+        classpath "org.ysb33r.gradle:gradle-cloudci-plugin:1.0"
     }
 }
 
@@ -33,12 +40,14 @@ repositories {
     }
 }
 
+
 // tag::applyplugin1[]
 apply plugin : 'org.ysb33r.gradletest'
 // end::applyplugin1[]
 
 
 apply plugin : 'java'
+apply plugin : 'org.ysb33r.cloudci'
 
 gradleTestGenerator {
     pluginJarDirectory = file("${projectDir}/../build/libs")
@@ -64,8 +73,8 @@ gradleTest {
 // end::applyplugin2[]
     dependsOn sanityCheck
 // tag::applyplugin2[]
-    versions '3.2', '3.1', '3.0'
-    versions '2.14'
+    versions '3.2.1', '3.1', '3.0'
+    versions '2.14.1'
     versions '2.13'
     versions '2.12' ,'2.11','2.10','2.9','2.8'
     versions '2.7','2.6','2.5'
@@ -74,9 +83,21 @@ gradleTest {
     beforeTest {
         println "  ${it.name}"
     }
+
 }
 // end::applyplugin2[]
 
+appveyor {
+    gradleTest {
+        if (JavaVersion.current().isJava7()) {
+            jvmArgs '-XX:+CMSClassUnloadingEnabled', '-XX:+CMSPermGenSweepingEnabled',
+                '-XX:+UseConcMarkSweepGC'
+        }
+
+        maxParallelForks = 4
+    }
+}
+
 
 test.enabled = false
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Apr 30 16:37:11 BST 2015
+#Sun Jan 01 17:16:06 SAST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

gradlew

@@ -6,12 +6,30 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,7 +46,7 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
 if "%@eval[2+2]" == "4" goto 4NT_args

src/docs/asciidoc/parts/usage.adoc

@@ -28,7 +28,7 @@ the appropriate configurations and tasks will be added.
 
 [source,groovy]
 ----
-include::{projectDir}/compatibility/compatibility.gradle[tags=addTestSets]
+include::{compatdir}/compatibility.gradle[tags=addTestSets]
 ----
 <1> Supply basename to `additionalGradleTestSet`
 <2> This will result in a test task in the format `${baseName}GradleTest`. Sources are expected to be layed out below

src/docs/landingPage/display-versions.txt

@@ -1,4 +1,4 @@
 # List versions in order that they should appear on the landing page
 #
-1.0-beta5
+1.0-beta7
 0.5.5

src/main/groovy/org/ysb33r/gradle/gradletest/TestGenerator.groovy

@@ -17,7 +17,12 @@ import groovy.io.FileType
 import groovy.transform.CompileDynamic
 import groovy.transform.CompileStatic
 import org.gradle.api.DefaultTask
+import org.gradle.api.DomainObjectSet
 import org.gradle.api.GradleException
+import org.gradle.api.artifacts.DependencySet
+import org.gradle.api.artifacts.ExternalModuleDependency
+import org.gradle.api.artifacts.UnknownConfigurationException
+import org.gradle.api.file.FileCollection
 import org.gradle.api.file.SourceDirectorySet
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputDirectory
@@ -167,7 +172,15 @@ class TestGenerator extends DefaultTask {
         final File repoDir = new File(workDir,'repo')
         final List<Pattern> testPatternsForFailures = getLinkedTask().getExpectedFailures()
 
-        createInitScript(workDir,pluginJarDirectory,repoDir)
+        Set<File> externalDependencies = []
+        try {
+            DomainObjectSet<ExternalModuleDependency> externalDependencySet = project.configurations.getByName('runtime').allDependencies.withType(ExternalModuleDependency)
+            externalDependencies = project.configurations.getByName('runtime').files { dep ->
+                externalDependencySet.contains(dep)
+            }
+        } catch(UnknownConfigurationException e) {}
+
+        createInitScript(workDir,pluginJarDirectory,repoDir,externalDependencies)
 
         testMap.each { String testName,File testLocation ->
 
@@ -208,17 +221,23 @@ class TestGenerator extends DefaultTask {
      * @param targetDir Where the init script is copied to
      * @param jarDir THe path where the plugin JAR will be found
      * @param repoDir The path to where the local repo will be created
+     * @param externalDependencies A list of external dependencies (JARs).
      */
     @CompileDynamic
-    private void createInitScript(final File targetDir,final File jarDir,final File repoDir) {
+    private void createInitScript(final File targetDir,final File jarDir,final File repoDir,Set<File> externalDependencies) {
         final def fromSource = templateInitScript
         final String pluginJarPath = pathAsUriStr(jarDir)
         final String repoPath = pathAsUriStr(repoDir)
+        final String externalDepPaths = externalDependencies.collect {
+            "'${pathAsUriStr(it)}'.toURI()"
+        }.join(',')
+
         project.copy {
             from fromSource
             into targetDir
             expand PLUGINJARPATH: pluginJarPath,
-                LOCALREPOPATH :  repoPath
+                LOCALREPOPATH :  repoPath,
+                EXTERNAL_DEP_URILIST : externalDepPaths
         }
     }
 
@@ -301,7 +320,7 @@ class TestGenerator extends DefaultTask {
      * (This helps with compatibility across operating systems).
      * @param path Path to output
      */
-    private String pathAsUriStr(final File path) {
+    String pathAsUriStr(final File path) {
         path.absoluteFile.toURI().toString()
     }
 

src/main/groovy/org/ysb33r/gradle/gradletest/legacy20/internal/TestRunner.groovy

@@ -63,10 +63,6 @@ class TestRunner {
 
             systemProperties 'org.gradle.appname' : this.class.name
 
-            // Capture standardOutput and errorOutput
-            // errorOutput = new ByteArrayOutputStream()
-            // standardOutput = new ByteArrayOutputStream()
-            // systemProperties & environment in a later release
         }
     }
 }

src/main/groovy/org/ysb33r/gradle/gradletest/legacy20/internal/Unpacker.groovy

@@ -28,7 +28,7 @@ import org.ysb33r.gradle.gradletest.Names
  */
 class Unpacker {
 
-    /** Creates a downloader to download a a distrbution to a specific location
+    /** Creates a downloader to download a a distribution to a specific location
      *
      * @param logger Logger to use. (Older versions of Wrapper API will ignore this).
      * @return An instance of a downloader
@@ -156,5 +156,4 @@ class Unpacker {
             return target
         }
     }
-
 }

src/main/resources/org/ysb33r/gradletest/init.gradle

@@ -17,6 +17,7 @@ allprojects {
             classpath fileTree ('${PLUGINJARPATH}'.toURI()) {
                 include '*.jar'
             }
+            ${EXTERNAL_DEP_URILIST.size() ? 'classpath files('+EXTERNAL_DEP_URILIST+')' : ''}
         }
         repositories {
             flatDir {