Merge pull request #48 from ysb33r/development

Release 0.11

.travis.yml

@@ -9,7 +9,7 @@ script:
  - ./gradlew  -S clean build --console=plain --info --scan
 
 jdk:
- - oraclejdk8
+ - openjdk8
 
 os:
  - linux

CHANGELOG.adoc

@@ -2,6 +2,17 @@
 :issue: link:https://github.com/ysb33r/ivypot-gradle-plugin/issues/
 :contributor: link:https://github.com/
 
+== 0.11
+
+=== Improvements
+
+* {issue}44[#44] Compatible with Gradle 6.1.
+* {issue}47[#47] Honour order of repositories as listed.
+
+=== Compatibility
+
+* Gradle compatibility tested 5.0 - 6.1
+
 == 0.10
 
 === Improvements

README.adoc

@@ -177,16 +177,19 @@ apply plugin : 'org.ysb33r.ivypot'
 
 syncRemoteRepositories {
 
-    addAllProjects() // <1>
+    repoDir offlineRepoDir <1>
 
-    addProject ':a:b'  // <2>
+    addAllProjects() // <2>
 
-    addProject ':a:b','compile','testCompile'  // <3>
+    addProject ':a:b'  // <3>
+
+    addProject ':a:b','compile','testCompile'  // <4>
 }
 ----
-<1> Adds all configurations from all subprojects and the rootproject with the exception of the current project. `buildscript` dependencies are not added via this call.
-<2> Adds all configurations from project `:a:b` as long as the current project is not called `:a:b`.
-<3> Adds only the `compile` and `testCompile` configurations from project `:a:b`. Once again `:a:b` must not be the current project.
+<1> Set offline repository root to a variable that is visible to all projects.
+<2> Adds all configurations from all subprojects and the rootproject with the exception of the current project. `buildscript` dependencies are not added via this call.
+<3> Adds all configurations from project `:a:b` as long as the current project is not called `:a:b`.
+<4> Adds only the `compile` and `testCompile` configurations from project `:a:b`. Once again `:a:b` must not be the current project.
 
 Now you just have to run `./gradlew syncRemoteRepositories` or `./gradlew :sync:syncRemoteRepositories` from the top.
 

build.gradle

@@ -33,7 +33,7 @@ buildScan {
 
 apply from: 'gradle/integration-tests.gradle'
 
-version = '0.10'
+version = '0.11-SNAPSHOT'
 group = 'org.ysb33r.gradle'
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -143,6 +143,7 @@ publishPlugins {
 }
 
 gradleTest {
+    versions '6.1'
     versions '5.4.1'
     versions '5.0'
 

src/integrationTest/groovy/org/ysb33r/gradle/ivypot/OfflineRepositorySyncIntegrationSpec.groovy

@@ -88,6 +88,44 @@ class OfflineRepositorySyncIntegrationSpec extends Specification {
         }
     }
 
+    @Issue([
+        'https://github.com/ysb33r/ivypot-gradle-plugin/issues/47',
+        'https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/528'
+    ])
+    void 'Order of repositories should be honoured for resolving  artifacts'() {
+
+        setup:
+        File ivySettingsXml = new File(projectDir, 'build/tmp/syncRemoteRepositories/ivysettings.xml')
+        writeBuildFile """
+        configurations {
+                compile
+            }
+
+            // tag::example_two_repos[]
+            dependencies {
+                compile 'org.codehaus.groovy:groovy-all:2.3.11'
+            }
+
+            syncRemoteRepositories {
+                repositories {
+                    mavenCentral()
+                    jcenter()
+                }
+            }
+            // end::example_two_repos[]
+        """
+
+        when:
+        BuildResult result = build()
+        def ivySettings = new XmlSlurper().parse(ivySettingsXml)
+
+        then:
+        file_exists 'org.codehaus.groovy/groovy-all/2.3.11/ivy-2.3.11.xml'
+
+        ivySettings.resolvers.chain.ibiblio[0].@name == 'MavenRepo'
+        ivySettings.resolvers.chain.ibiblio[1].@name == 'BintrayJCenter'
+    }
+
     void 'Honour non-transitive dependencies'() {
 
         setup:
@@ -247,7 +285,7 @@ class OfflineRepositorySyncIntegrationSpec extends Specification {
 
             syncRemoteRepositories {
                 repositories {
-                    maven { url 'http://rubygems.lasagna.io/proxy/maven/releases' }
+                    maven { url 'https://mavengems.jruby.org' }
                 }
             }
             // end::example_rubygems[]
@@ -350,11 +388,11 @@ class OfflineRepositorySyncIntegrationSpec extends Specification {
 
     private BuildResult build() {
         GradleRunner.create().withDebug(true)
-                .withPluginClasspath()
-                .withProjectDir(projectDir)
-                .withArguments(['-i', '-s', DEFAULT_TASK])
-                .forwardOutput()
-                .build()
+            .withPluginClasspath()
+            .withProjectDir(projectDir)
+            .withArguments(['-i', '-s', DEFAULT_TASK])
+            .forwardOutput()
+            .build()
     }
 
     void withBuildScript(String content) {

src/main/groovy/org/ysb33r/gradle/ivypot/OfflineRepositorySync.groovy

@@ -55,22 +55,8 @@ class OfflineRepositorySync extends DefaultTask {
 
     @CompileDynamic
     OfflineRepositorySync() {
-
         repositories = new RepositoryHandler(project)
 
-        inputs.properties.put('project configurations', { OfflineRepositorySync ors ->
-            Set<Configuration> configs = ors.getConfigurations()
-            configs.collect { Configuration c ->
-                c.dependencies.collect { Dependency d ->
-                    "${d.group}:${d.name}:${d.version}"
-                }.join(',')
-            }.join('|')
-        }.curry(this))
-
-        inputs.properties.put('cached binaries', { OfflineRepositorySync ors ->
-            ors.binaries*.toString().join('')
-        }.curry(this))
-
         binaryRepositories = project.container(BinaryRepository) { String repoName ->
             DefaultBinaryRepository.create(repoName, null, null)
         }
@@ -80,6 +66,24 @@ class OfflineRepositorySync extends DefaultTask {
         }
 
         extBinaries = extensions.create('cachedBinaries', DependencyHandlerExtension, project)
+
+        Closure projectConfigurations = { OfflineRepositorySync ors ->
+            Set<Configuration> configs = ors.getConfigurations()
+            configs.collect { Configuration c ->
+                c.dependencies.collect { Dependency d ->
+                    "${d.group}:${d.name}:${d.version}"
+                }.join(',')
+            }.join('|')
+        }.curry(this)
+
+        Closure cachedBinaries = { OfflineRepositorySync ors ->
+            ors.binaries*.toString().join('')
+        }.curry(this)
+
+        inputs.properties([
+            'project configurations': projectConfigurations,
+            'cached binaries': cachedBinaries
+        ])
     }
 
     /** The pattern that will be used to write artifacts into the target repository

src/main/groovy/org/ysb33r/gradle/ivypot/internal/IvyUtils.groovy

@@ -17,6 +17,7 @@ package org.ysb33r.gradle.ivypot.internal
 import groovy.transform.CompileDynamic
 import groovy.transform.CompileStatic
 import groovy.xml.MarkupBuilder
+import org.ysb33r.gradle.ivypot.repositories.Repository
 import org.ysb33r.gradle.ivypot.repositories.RepositoryHandler
 import org.ysb33r.grolifant.api.FileUtils
 
@@ -27,13 +28,17 @@ class IvyUtils {
     @CompileDynamic
     static void writeSettingsFile(
             File settingsFile,
-            RepositoryHandler repositories,
+            RepositoryHandler repositoryHandler,
             File repoRoot,
             File cacheDir,
             String ivyPattern,
             String artifactPattern,
             Iterable<Map<String, String>> repositoryCredentials
     ) {
+        List<Repository> repositories = repositoryHandler.sort { a,b ->
+                a.index <=> b.index
+        }
+
         def xmlWriter = new StringWriter()
         def xml = new MarkupBuilder(xmlWriter)
         xml.ivysettings {

src/main/groovy/org/ysb33r/gradle/ivypot/repositories/Repository.groovy

@@ -19,9 +19,17 @@ import org.gradle.api.Named
 import org.ysb33r.gradle.ivypot.IvyXml
 
 /**
- * @since 1.0
+ *
  */
 @CompileStatic
 interface Repository extends Named, IvyXml {
     void setName(final String name)
+
+    /**
+     *
+     * @param idx
+     *
+     * @since 0.11
+     */
+    void setIndex(int idx)
 }

src/main/groovy/org/ysb33r/gradle/ivypot/repositories/RepositoryHandler.groovy

@@ -39,24 +39,24 @@ class RepositoryHandler {
     }
 
     MavenArtifactRepository jcenter() {
-        (MavenArtifactRepository)addByName('BintrayJCenter', new JCenter())
+        (MavenArtifactRepository) addByName('BintrayJCenter', new JCenter())
     }
 
     MavenArtifactRepository mavenCentral() {
-        (MavenArtifactRepository)addByName('MavenRepo', new MavenCentral())
+        (MavenArtifactRepository) addByName('MavenRepo', new MavenCentral())
     }
 
     MavenArtifactRepository mavenLocal() {
-        (MavenArtifactRepository)addByName('MavenLocal', new MavenLocal())
+        (MavenArtifactRepository) addByName('MavenLocal', new MavenLocal())
     }
 
     MavenArtifactRepository google() {
-        (MavenArtifactRepository)addByName('Google', new Google())
+        (MavenArtifactRepository) addByName('Google', new Google())
     }
 
     MavenArtifactRepository maven(Closure configurator) {
         MavenArtifactRepository repo = new MavenArtifactRepository()
-        Closure cfg = (Closure)configurator.clone()
+        Closure cfg = (Closure) configurator.clone()
         cfg.resolveStrategy = Closure.DELEGATE_FIRST
         cfg.delegate = repo
         addByName(
@@ -67,12 +67,12 @@ class RepositoryHandler {
     }
 
     MavenArtifactRepository maven(Action<? super MavenArtifactRepository> configurator) {
-        addByName( "maven_${postfix}", new MavenArtifactRepository(), configurator)
+        addByName("maven_${postfix}", new MavenArtifactRepository(), configurator)
     }
 
     IvyArtifactRepository ivy(Closure configurator) {
         IvyArtifactRepository repo = new IvyArtifactRepository()
-        Closure cfg = (Closure)configurator.clone()
+        Closure cfg = (Closure) configurator.clone()
         cfg.resolveStrategy = Closure.DELEGATE_FIRST
         cfg.delegate = repo
         addByName(
@@ -83,24 +83,27 @@ class RepositoryHandler {
     }
 
     IvyArtifactRepository ivy(Action<? super IvyArtifactRepository> configurator) {
-        addByName( "ivy_${postfix}", new IvyArtifactRepository(), configurator)
+        addByName("ivy_${postfix}", new IvyArtifactRepository(), configurator)
     }
 
     private Repository addByName(final String name, Repository repo) {
         repo.name = name
+        repo.index = registeredRepositories.size() + 1
         registeredRepositories.add(repo)
         repo
     }
 
     private MavenArtifactRepository addByName(final String name, MavenArtifactRepository repo, Action<? super MavenArtifactRepository> configurator) {
         repo.name = name
+        repo.index = registeredRepositories.size() + 1
         configurator.execute(repo)
         registeredRepositories.add(repo)
         repo
     }
 
     private IvyArtifactRepository addByName(final String name, IvyArtifactRepository repo, Action<? super IvyArtifactRepository> configurator) {
         repo.name = name
+        repo.index = registeredRepositories.size() + 1
         configurator.execute(repo)
         registeredRepositories.add(repo)
         repo

src/main/groovy/org/ysb33r/gradle/ivypot/repositories/RepositoryTraits.groovy

@@ -14,7 +14,7 @@
 
 package org.ysb33r.gradle.ivypot.repositories
 
-import groovy.transform.CompileDynamic
+
 import groovy.transform.CompileStatic
 import org.gradle.api.Action
 import org.gradle.api.GradleException
@@ -91,18 +91,12 @@ trait RepositoryTraits {
      * Configure the Credentials for this repository using the supplied Closure.
      *
      * @code
-     * repositories {
-     *   maven {
-     *     credentials {
-     *       username = 'joe'
+     * repositories {*   maven {*     credentials {*       username = 'joe'
      *       password = 'secret'
-     *     }
-     *   }
-     * }
-     * @endcode
+     *}*}*}* @endcode
      */
     void credentials(Closure closure) {
-        Closure cfg = (Closure)(closure.clone())
+        Closure cfg = (Closure) (closure.clone())
         cfg.delegate = this.credentials
         cfg()
     }
@@ -126,7 +120,7 @@ trait RepositoryTraits {
      */
     def <T extends org.gradle.api.credentials.Credentials> T getCredentials(Class<T> aClass) {
         if (this.credentials instanceof T) {
-            return (T)(this.credentials)
+            return (T) (this.credentials)
         } else {
             throw new IllegalArgumentException("${Credentials.class.name} cannot be converted to ${aClass.name}")
         }
@@ -170,6 +164,26 @@ trait RepositoryTraits {
         this.name = name
     }
 
+    /** Returns the proposed order number for this repository
+     *
+     * @return Order number
+     *
+     * @since 0.11
+     */
+    int getIndex() {
+        this.order
+    }
+
+    /** Sets an order number for this repository
+     *
+     * @param idx Order number
+     *
+     * @since 0.11
+     */
+    void setIndex(int idx) {
+        this.order = idx
+    }
+
     void authentication(Action<? super AuthenticationContainer> action) {
         throw new GradleException("Authentication containers are not implemented. If this is a requirement for your use case then register your interest at https://github.com/ysb33r/ivypot-gradle-plugin/issues/24")
     }
@@ -178,7 +192,7 @@ trait RepositoryTraits {
         throw new GradleException("Authentication containers are not implemented. If this is a requirement for your use case then register your interest at https://github.com/ysb33r/ivypot-gradle-plugin/issues/24")
     }
 
-
+    private int order
     private String name
     private Object url
     private Credentials credentials = new Credentials()