Closes #297 - uses compileClasspath configuration to apply shadow res…

…ources to compile tasks.

src/docs/asciidoc/11-filtering-contents.adoc

@@ -17,7 +17,7 @@ of the dependencies to be merged.
 include::{tests}/FilteringSpec.groovy[tags=excludeFile]
 ----
 
-Excludes and includes can be combined just like a noraml `Jar` task, with `excludes` taking precendence over `includes`.
+Excludes and includes can be combined just like a normal `Jar` task, with `excludes` taking precendence over `includes`.
 Additionally, ANT style patterns can be used to match multiple files.
 
 .Configuring output using ANT patterns

src/docs/asciidoc/12-controlling-dependencies.adoc

@@ -2,7 +2,7 @@
 
 Shadow configures the default `shadowJar` task to merge all dependencies from the project's `runtime` configuration
 into the final JAR.
-The configurations to source dependencies from for the merging can be configured using the `configurations` property
+The configurations to from which to source dependencies for the merging can be configured using the `configurations` property
 of the link:{api}/tasks/ShadowJar.html[`ShadowJar`] task type.
 
 [source,groovy,indent=0]

src/docs/asciidoc/90-changes.adoc

@@ -1,7 +1,12 @@
 == Change Log
 
 [discrete]
-=== v2.0.0 (Unreleased)
+=== v2.0.1
+
+* Fix `null+configuration` error (https://github.com/johnrengelman/shadow/issues/297[Issue #297])
+
+[discrete]
+=== v2.0.0
 
 * **Breaking Change!** Restrict Plugin to Gradle 3.0+
 * **Breaking Change!** Build with Java 7

src/main/groovy/com/github/jengelman/gradle/plugins/shadow/PluginShadowPlugin.groovy

@@ -11,9 +11,13 @@ class PluginShadowPlugin implements Plugin<Project> {
     void apply(Project project) {
         project.plugins.apply(ShadowPlugin)
 
-        ConfigureShadowRelocation relocate = project.tasks.create(ConfigureShadowRelocation.taskName(project.tasks.shadowJar), ConfigureShadowRelocation)
-        relocate.target = (ShadowJar) project.tasks.shadowJar
+        project.tasks.withType(ShadowJar) { ShadowJar task ->
+            if (task.name == ShadowJavaPlugin.SHADOW_JAR_TASK_NAME) {
+                ConfigureShadowRelocation relocate = project.tasks.create(ConfigureShadowRelocation.taskName(project.tasks.shadowJar), ConfigureShadowRelocation)
+                relocate.target = (ShadowJar) project.tasks.shadowJar
 
-        project.tasks.shadowJar.dependsOn relocate
+                project.tasks.shadowJar.dependsOn relocate
+            }
+        }
     }
 }

src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.groovy

@@ -31,9 +31,7 @@ class ShadowJavaPlugin implements Plugin<Project> {
     void apply(Project project) {
         configureShadowTask(project)
 
-        project.tasks.withType(AbstractCompile) {
-            it.classpath += project.configurations.shadow
-        }
+        project.configurations.compileClasspath.extendsFrom project.configurations.shadow
 
     }
 

src/main/resources/shadow-version.txt

@@ -1 +1 @@
-2.0.0
+2.0.1

src/test/groovy/com/github/jengelman/gradle/plugins/shadow/PluginShadowPluginSpec.groovy

@@ -16,7 +16,7 @@ class PluginShadowPluginSpec extends PluginSpecification {
         """.stripIndent()
 
         when:
-        runner.withArguments('shadowJar').build()
+        runner.withArguments('shadowJar', '-s').build()
 
         then:
         then:

src/test/groovy/com/github/jengelman/gradle/plugins/shadow/util/PluginSpecification.groovy

@@ -30,6 +30,10 @@ class PluginSpecification extends Specification {
         '''
     }
 
+    def cleanup() {
+        println buildFile.text
+    }
+
     String getDefaultBuildScript() {
         return """
         buildscript {
@@ -45,8 +49,12 @@ class PluginSpecification extends Specification {
         version = "1.0"
         group = 'shadow'
 
-        apply plugin: 'java'
         apply plugin: 'com.github.johnrengelman.shadow'
+        apply plugin: 'java'
+
+        sourceSets {
+          integTest
+        }
 
         repositories { maven { url "${repo.uri}" } }
         """.stripIndent()