Revert to build with Gradle 3.5 as it give us compatibily 2.8-4.2 (#20)

ysb33r · Sep 30, 2017 · e3bc051 · e3bc051
1 parent 45f79a0
commit e3bc051
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 16 deletions.
diff --git a/gradle/integration-tests.gradle b/gradle/integration-tests.gradle
@@ -21,7 +21,11 @@ sourceSets {
 }
 
 task integrationTest(type: Test, dependsOn: jar) {
-    testClassesDirs = sourceSets.integrationTest.output.classesDirs
+    if(GradleVersion.current() < GradleVersion.version('4.0')) {
+        testClassesDir = sourceSets.integrationTest.output.classesDir
+    } else {
+        testClassesDirs = sourceSets.integrationTest.output.classesDirs
+    }
     classpath = sourceSets.integrationTest.runtimeClasspath
     mustRunAfter test
 }

diff --git 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.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
diff --git a/src/main/groovy/org/ysb33r/gradle/ivypot/internal/IvyRepository.groovy b/src/main/groovy/org/ysb33r/gradle/ivypot/internal/IvyRepository.groovy
@@ -16,15 +16,9 @@ package org.ysb33r.gradle.ivypot.internal
 
 import groovy.transform.CompileDynamic
 import groovy.transform.CompileStatic
-import groovy.transform.TypeChecked
 import org.gradle.api.Action
-import org.gradle.api.ActionConfiguration
-import org.gradle.api.GradleException
-import org.gradle.api.artifacts.ComponentMetadataSupplier
-import org.gradle.api.artifacts.repositories.AuthenticationContainer
 import org.gradle.api.artifacts.repositories.IvyArtifactRepository
 import org.gradle.api.artifacts.repositories.IvyArtifactRepositoryMetaDataProvider
-import org.gradle.api.artifacts.repositories.PasswordCredentials
 import org.gradle.api.artifacts.repositories.RepositoryLayout
 import org.ysb33r.gradle.ivypot.IvyXml
 
@@ -206,13 +200,13 @@ class IvyRepository implements IvyArtifactRepository, IvyXml, RepositoryTraits {
         ret += '</url>'
     }
 
-    void setMetadataSupplier(Class<? extends ComponentMetadataSupplier> aClass) {
-        throw new GradleException("Metadata is not implemented. If this is a requirement for your use case then register your interest at https://github.com/ysb33r/ivypot-gradle-plugin/issues/23")
-    }
-
-    void setMetadataSupplier(Class<? extends ComponentMetadataSupplier> aClass, Action<? super ActionConfiguration> action) {
-        throw new GradleException("Metadata is not implemented. If this is a requirement for your use case then register your interest at https://github.com/ysb33r/ivypot-gradle-plugin/issues/23")
-    }
+//    void setMetadataSupplier(Class<? extends ComponentMetadataSupplier> aClass) {
+//        throw new GradleException("Metadata is not implemented. If this is a requirement for your use case then register your interest at https://github.com/ysb33r/ivypot-gradle-plugin/issues/23")
+//    }
+//
+//    void setMetadataSupplier(Class<? extends ComponentMetadataSupplier> aClass, Action<? super ActionConfiguration> action) {
+//        throw new GradleException("Metadata is not implemented. If this is a requirement for your use case then register your interest at https://github.com/ysb33r/ivypot-gradle-plugin/issues/23")
+//    }
 
     @CompileDynamic
     private void applyPatterns(final PatternBasedResolver patterns) {

diff --git a/src/main/groovy/org/ysb33r/gradle/ivypot/internal/MavenRepository.groovy b/src/main/groovy/org/ysb33r/gradle/ivypot/internal/MavenRepository.groovy
@@ -60,7 +60,7 @@ class MavenRepository implements MavenArtifactRepository, IvyXml, RepositoryTrai
      *
      * @param urls The URLs.
      */
-    @Override
+//    @Override
     void setArtifactUrls(Set<URI> urls) {
         artifactUrls.clear()
         artifactUrls.addAll(urls)