forked from gradle/gradle
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Moved IvyBackedArtifactPublisher into a separate package
- Moved associated types - Extracted separate wrapper type for Ivy context setting
- Loading branch information
Showing
13 changed files
with
169 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
...org/gradle/api/internal/artifacts/ivyservice/IvyContextualArtifactDependencyResolver.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /* | ||
| * Copyright 2016 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.gradle.api.internal.artifacts.ivyservice; | ||
|
|
||
| import org.apache.ivy.Ivy; | ||
| import org.gradle.api.Action; | ||
| import org.gradle.api.internal.artifacts.ArtifactDependencyResolver; | ||
| import org.gradle.api.internal.artifacts.GlobalDependencyResolutionRules; | ||
| import org.gradle.api.internal.artifacts.ResolveContext; | ||
| import org.gradle.api.internal.artifacts.ivyservice.resolveengine.artifact.DependencyArtifactsVisitor; | ||
| import org.gradle.api.internal.artifacts.ivyservice.resolveengine.graph.DependencyGraphVisitor; | ||
| import org.gradle.api.internal.artifacts.repositories.ResolutionAwareRepository; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public class IvyContextualArtifactDependencyResolver implements ArtifactDependencyResolver { | ||
| private final ArtifactDependencyResolver delegate; | ||
| private final IvyContextManager ivyContextManager; | ||
|
|
||
| public IvyContextualArtifactDependencyResolver(IvyContextManager ivyContextManager, ArtifactDependencyResolver delegate) { | ||
| this.delegate = delegate; | ||
| this.ivyContextManager = ivyContextManager; | ||
| } | ||
|
|
||
| @Override | ||
| public void resolve(final ResolveContext resolveContext, final List<? extends ResolutionAwareRepository> repositories, final GlobalDependencyResolutionRules metadataHandler, | ||
| final DependencyGraphVisitor graphVisitor, final DependencyArtifactsVisitor artifactsVisitor) { | ||
| ivyContextManager.withIvy(new Action<Ivy>() { | ||
| @Override | ||
| public void execute(Ivy ivy) { | ||
| delegate.resolve(resolveContext, repositories, metadataHandler, graphVisitor, artifactsVisitor); | ||
| } | ||
| }); | ||
| } | ||
| } |
47 changes: 47 additions & 0 deletions
47
...ain/java/org/gradle/api/internal/artifacts/ivyservice/IvyContextualArtifactPublisher.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * Copyright 2016 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.gradle.api.internal.artifacts.ivyservice; | ||
|
|
||
| import org.apache.ivy.Ivy; | ||
| import org.gradle.api.Action; | ||
| import org.gradle.api.artifacts.Configuration; | ||
| import org.gradle.api.artifacts.PublishException; | ||
| import org.gradle.api.internal.artifacts.ArtifactPublisher; | ||
| import org.gradle.api.internal.artifacts.ModuleInternal; | ||
| import org.gradle.api.internal.artifacts.repositories.PublicationAwareRepository; | ||
|
|
||
| import java.io.File; | ||
|
|
||
| public class IvyContextualArtifactPublisher implements ArtifactPublisher { | ||
| private final ArtifactPublisher delegate; | ||
| private final IvyContextManager ivyContextManager; | ||
|
|
||
| public IvyContextualArtifactPublisher(IvyContextManager ivyContextManager, ArtifactPublisher delegate) { | ||
| this.delegate = delegate; | ||
| this.ivyContextManager = ivyContextManager; | ||
| } | ||
|
|
||
| @Override | ||
| public void publish(final Iterable<? extends PublicationAwareRepository> repositories, final ModuleInternal module, final Configuration configuration, final File descriptor) throws PublishException { | ||
| ivyContextManager.withIvy(new Action<Ivy>() { | ||
| @Override | ||
| public void execute(Ivy ivy) { | ||
| delegate.publish(repositories, module, configuration, descriptor); | ||
| } | ||
| }); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.