[gradle-debian-helper] 01/01: Update to Gradle 3.2

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository gradle-debian-helper.

commit d26d2ef80233b2b24327d636995ed4499e57ae21
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Dec 22 11:39:30 2016 +0100

    Update to Gradle 3.2
---
 debian/changelog                                        |  6 ++++++
 debian/control                                          |  4 ++--
 .../debian/gradle/MavenDebianArtifactRepository.java    | 17 ++++++++++++++---
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b9ebdb3..5bd74b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gradle-debian-helper (1.5.1) unstable; urgency=medium
+
+  * Update to Gradle 3.2
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 22 Dec 2016 11:39:19 +0100
+
 gradle-debian-helper (1.5) unstable; urgency=medium
 
   * Use the package name as the name of the root project when rootProject.name
diff --git a/debian/control b/debian/control
index 3cbbf91..538839f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,14 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg at apache.org>,
            Kai-Chung Yan <seamlikok at gmail.com>
-Build-Depends: debhelper (>= 10), default-jdk-headless | default-jdk, maven-debian-helper, gradle (>= 3.1)
+Build-Depends: debhelper (>= 10), default-jdk-headless | default-jdk, maven-debian-helper, gradle (>= 3.2)
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/gradle-debian-helper.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/gradle-debian-helper.git
 
 Package: gradle-debian-helper
 Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java7-runtime-headless, maven-repo-helper, gradle (>= 3.1)
+Depends: ${misc:Depends}, default-jre-headless | java7-runtime-headless, maven-repo-helper, gradle (>= 3.2)
 Recommends: debhelper
 Description: Helper tools for building Debian packages with Gradle
  gradle-debian-helper contains helper tools to ease the packaging of Gradle
diff --git a/gradle-helper-plugin/src/main/java/org/debian/gradle/MavenDebianArtifactRepository.java b/gradle-helper-plugin/src/main/java/org/debian/gradle/MavenDebianArtifactRepository.java
index 685fe21..45980b7 100644
--- a/gradle-helper-plugin/src/main/java/org/debian/gradle/MavenDebianArtifactRepository.java
+++ b/gradle-helper-plugin/src/main/java/org/debian/gradle/MavenDebianArtifactRepository.java
@@ -24,26 +24,33 @@ import org.debian.maven.repo.Dependency;
 import org.debian.maven.repo.DependencyRule;
 import org.debian.maven.repo.DependencyRuleSetFiles;
 import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.internal.artifacts.ivyservice.ArtifactCacheMetaData;
+import org.gradle.api.internal.artifacts.ivyservice.DefaultArtifactCacheMetaData;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ConfiguredModuleComponentRepository;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.GradlePomModuleDescriptorParser;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.DefaultVersionComparator;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.DefaultVersionSelectorScheme;
+import org.gradle.api.internal.artifacts.mvnsettings.DefaultLocalMavenRepositoryLocator;
+import org.gradle.api.internal.artifacts.mvnsettings.DefaultMavenFileLocations;
+import org.gradle.api.internal.artifacts.mvnsettings.DefaultMavenSettingsProvider;
+import org.gradle.api.internal.artifacts.mvnsettings.LocalMavenRepositoryLocator;
 import org.gradle.api.internal.artifacts.repositories.AbstractArtifactRepository;
 import org.gradle.api.internal.artifacts.repositories.ResolutionAwareRepository;
 import org.gradle.api.internal.artifacts.repositories.resolver.MavenResolver;
 import org.gradle.api.internal.filestore.ivy.ArtifactIdentifierFileStore;
+import org.gradle.cache.internal.DefaultCacheScopeMapping;
 import org.gradle.internal.component.external.model.DefaultModuleComponentIdentifier;
 import org.gradle.internal.component.external.model.ModuleComponentArtifactMetadata;
-import org.gradle.internal.component.external.model.MutableModuleComponentResolveMetadata;
 import org.gradle.internal.component.model.ComponentOverrideMetadata;
 import org.gradle.internal.component.model.DefaultComponentOverrideMetadata;
 import org.gradle.internal.component.model.DefaultIvyArtifactName;
 import org.gradle.internal.component.model.IvyArtifactName;
 import org.gradle.internal.resolve.result.BuildableModuleComponentMetaDataResolveResult;
 import org.gradle.internal.resource.local.LocallyAvailableResourceFinder;
-import org.gradle.internal.resource.local.LocallyAvailableResourceFinderSearchableFileStoreAdapter;
 import org.gradle.internal.resource.local.PathKeyFileStore;
+import org.gradle.internal.resource.local.ivy.LocallyAvailableResourceFinderFactory;
 import org.gradle.internal.resource.transport.file.FileTransport;
+import org.gradle.util.GradleVersion;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -70,7 +77,11 @@ public class MavenDebianArtifactRepository extends AbstractArtifactRepository im
     public MavenDebianArtifactRepository() {
         this.pomParser = new GradlePomModuleDescriptorParser(new DefaultVersionSelectorScheme(new DefaultVersionComparator()));
         this.artifactFileStore = new ArtifactIdentifierFileStore(new PathKeyFileStore(repositoryPath), new DebianTemporaryFileProvider());
-        this.locallyAvailableResourceFinder = new LocallyAvailableResourceFinderSearchableFileStoreAdapter<>(artifactFileStore);
+
+        ArtifactCacheMetaData artifactCacheMetaData = new DefaultArtifactCacheMetaData(new DefaultCacheScopeMapping(new File(System.getProperty("user.home")),null, GradleVersion.current()));
+        LocalMavenRepositoryLocator localMavenRepositoryLocator = new DefaultLocalMavenRepositoryLocator(new DefaultMavenSettingsProvider(new DefaultMavenFileLocations()));
+        LocallyAvailableResourceFinderFactory locallyAvailableResourceFinderFactory = new LocallyAvailableResourceFinderFactory(artifactCacheMetaData, localMavenRepositoryLocator, artifactFileStore);
+        this.locallyAvailableResourceFinder = locallyAvailableResourceFinderFactory.create();
 
         log.info("\tLoading the Maven rules...");
         ArgumentsMap args = new ArgumentsMap(new ArgumentsIterable(new String[] { "--rules=debian/maven.rules", "--ignore-rules=debian/maven.ignoreRules"}));

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-debian-helper.git