From 42c402d6d30754c46d0e4b357585cde9fb1f1785 Mon Sep 17 00:00:00 2001
From: Blundell <paul@novoda.com>
Date: Tue, 31 Oct 2017 15:31:28 +0000
Subject: [PATCH] Upgrade to the latest cradle version (4.2.1)

fixes #138
---
 build.gradle                                  |  2 +-
 .../gradle/release/AndroidLibrary.groovy      | 20 +++++++++++++------
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9effcc8..5a81e4f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,5 +5,5 @@ allprojects {
         google()
         jcenter()
     }
-    version = "0.6.1"
+    version = "0.7.0"
 }
diff --git a/core/src/main/groovy/com/novoda/gradle/release/AndroidLibrary.groovy b/core/src/main/groovy/com/novoda/gradle/release/AndroidLibrary.groovy
index 6eca93c..f3dc715 100644
--- a/core/src/main/groovy/com/novoda/gradle/release/AndroidLibrary.groovy
+++ b/core/src/main/groovy/com/novoda/gradle/release/AndroidLibrary.groovy
@@ -9,19 +9,25 @@ import org.gradle.api.attributes.Usage
 import org.gradle.api.internal.DefaultDomainObjectSet
 import org.gradle.api.internal.component.SoftwareComponentInternal
 import org.gradle.api.internal.component.UsageContext
+import org.gradle.api.model.ObjectFactory
 
 class AndroidLibrary implements SoftwareComponentInternal {
 
     private final UsageContext runtimeUsage
 
     public static AndroidLibrary newInstance(Project project) {
+
+        ObjectFactory objectFactory = project.getObjects();
+        Usage usage = objectFactory.named(Usage.class, Usage.JAVA_RUNTIME);
+
+
         def configuration = project.configurations.getByName("compile")
-        return configuration ? from(configuration) : empty()
+        return configuration ? from(configuration, usage) : empty()
     }
 
-    static AndroidLibrary from(def configuration) {
-        def usage = new RuntimeUsage(configuration.dependencies)
-        new AndroidLibrary(usage)
+    static AndroidLibrary from(def configuration, Usage usage) {
+        def runtimeUsage = new RuntimeUsage(configuration.dependencies, usage)
+        new AndroidLibrary(runtimeUsage)
     }
 
     static AndroidLibrary empty() {
@@ -44,13 +50,15 @@ class AndroidLibrary implements SoftwareComponentInternal {
     private static class RuntimeUsage implements UsageContext {
 
         private final DomainObjectSet<Dependency> runtimeDependencies
+        private final Usage usage;
 
-        RuntimeUsage(DomainObjectSet<Dependency> runtimeDependencies) {
+        RuntimeUsage(DomainObjectSet<Dependency> runtimeDependencies, Usage usage) {
+            this.usage = usage;
             this.runtimeDependencies = runtimeDependencies
         }
 
         Usage getUsage() {
-            return Usage.FOR_RUNTIME
+            return usage;
         }
 
         public Set<PublishArtifact> getArtifacts() {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e87c7a1..56e30c3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-all.zip