Merge pull request #109 from sschuberth/master

Use Gradle 2.12's new compileOnly configuration for the Android plugin
hierynomus · Jun 7, 2016 · a18f74d · a18f74d
2 parents afcfd70 + 6267aa1
commit a18f74d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'groovy'
 apply plugin: 'idea'
 apply plugin: "com.gradle.plugin-publish"
 apply plugin: 'license'
-apply plugin: 'optional-base'
 
 buildscript {
     repositories {
@@ -53,9 +52,12 @@ dependencies {
         exclude group: 'org.apache.maven', module: 'maven-plugin-api'
         exclude group: 'org.apache.maven', module: 'maven-project'
     }
-    compile 'com.android.tools.build:gradle:2.0.+', optional
     compile gradleApi()
 
+    def androidGradlePlugin = 'com.android.tools.build:gradle:2.0.+'
+    compileOnly androidGradlePlugin
+    testCompile androidGradlePlugin
+
     testCompile 'junit:junit:4.11'
     testCompile 'com.google.guava:guava:17.0'
     testCompile('org.spockframework:spock-core:0.7-groovy-2.0') {

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -13,8 +13,9 @@ dependencies {
         exclude group: 'org.apache.maven', module: 'maven-plugin-api'
         exclude group: 'org.apache.maven', module: 'maven-project'
     }
-    compile 'com.android.tools.build:gradle:1.0.+'
     compile gradleApi()
+
+    compileOnly 'com.android.tools.build:gradle:2.0.+'
 }
 
 sourceSets {

diff --git a/src/main/groovy/nl/javadude/gradle/plugins/license/LicenseResolver.groovy b/src/main/groovy/nl/javadude/gradle/plugins/license/LicenseResolver.groovy
@@ -8,7 +8,6 @@ import org.gradle.api.artifacts.FileCollectionDependency
 import org.gradle.api.artifacts.ResolvedArtifact
 import org.gradle.api.logging.Logger
 import org.gradle.api.logging.Logging
-import org.gradle.api.tasks.TaskExecutionException
 
 import static DependencyMetadata.noLicenseMetaData
 
@@ -217,7 +216,7 @@ class LicenseResolver {
             if (ignoreFatalParseErrors) {
                 return noLicenseMetaData(dependencyDesc)
             } else {
-                throw new TaskExecutionException(e.getMessage())
+                throw e
             }
         }