Projects >> gradle >>210b2d8202b8250b4d99a582dca57706cb2d191a

Chunk
Conflicting content 
import org.gradle.api.artifacts.component.ComponentIdentifier;
import org.gradle.api.artifacts.component.ProjectComponentIdentifier;
import org.gradle.api.artifacts.component.ProjectComponentSelector;
<<<<<<< HEAD
import org.gradle.api.internal.component.ArtifactType;
import org.gradle.internal.component.local.model.LocalComponentArtifactIdentifier;
import org.gradle.internal.component.local.model.LocalComponentMetaData;
import org.gradle.internal.component.model.*;
import org.gradle.internal.resolve.resolver.ArtifactResolver;
=======
import org.gradle.api.internal.artifacts.ivyservice.LocalComponentFactory;
import org.gradle.internal.component.local.model.DefaultProjectComponentSelector;
import org.gradle.internal.component.local.model.LocalComponentMetaData;
import org.gradle.internal.component.model.ComponentOverrideMetadata;
import org.gradle.internal.component.model.DependencyMetaData;
import org.gradle.internal.resolve.ModuleVersionResolveException;
>>>>>>> c9f207f9bbcb65a44b39c82043815e9bfc1bb990
import org.gradle.internal.resolve.resolver.ComponentMetaDataResolver;
import org.gradle.internal.resolve.resolver.DependencyToComponentIdResolver;
import org.gradle.internal.resolve.result.BuildableArtifactResolveResult;
Solution content 
import org.gradle.api.artifacts.component.ComponentIdentifier;
import org.gradle.api.artifacts.component.ProjectComponentIdentifier;
import org.gradle.api.artifacts.component.ProjectComponentSelector;
import org.gradle.api.internal.component.ArtifactType;
import org.gradle.internal.component.local.model.DefaultProjectComponentSelector;
import org.gradle.internal.component.local.model.LocalComponentArtifactIdentifier;
import org.gradle.internal.component.local.model.LocalComponentMetaData;
import org.gradle.internal.component.model.*;
import org.gradle.internal.resolve.ModuleVersionResolveException;
import org.gradle.internal.resolve.resolver.ArtifactResolver;
import org.gradle.internal.resolve.resolver.ComponentMetaDataResolver;
import org.gradle.internal.resolve.resolver.DependencyToComponentIdResolver;
import org.gradle.internal.resolve.result.BuildableArtifactResolveResult;
File
ProjectDependencyResolver.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
    public void resolve(DependencyMetaData dependency, BuildableComponentIdResolveResult result) {
        if (dependency.getSelector() instanceof ProjectComponentSelector) {
            ProjectComponentSelector selector = (ProjectComponentSelector) dependency.getSelector();
<<<<<<< HEAD
            LocalComponentMetaData componentMetaData = projectComponentRegistry.getProject(selector.getProjectPath());
            result.resolved(componentMetaData.toResolveMetaData());
=======
            String projectPath = selector.getProjectPath();
            LocalComponentMetaData componentMetaData = projectComponentRegistry.getProject(projectPath);
            if (componentMetaData == null) {
                result.failed(new ModuleVersionResolveException(selector, "project '" + projectPath + "' not found."));
            } else {
                result.resolved(componentMetaData.toResolveMetaData());
            }
        } else {
            delegateIdResolver.resolve(dependency, result);
>>>>>>> c9f207f9bbcb65a44b39c82043815e9bfc1bb990
        }
    }
Solution content 
    public void resolve(DependencyMetaData dependency, BuildableComponentIdResolveResult result) {
        if (dependency.getSelector() instanceof ProjectComponentSelector) {
            ProjectComponentSelector selector = (ProjectComponentSelector) dependency.getSelector();
            String projectPath = selector.getProjectPath();
            LocalComponentMetaData componentMetaData = projectComponentRegistry.getProject(projectPath);
            if (componentMetaData == null) {
                result.failed(new ModuleVersionResolveException(selector, "project '" + projectPath + "' not found."));
            } else {
                result.resolved(componentMetaData.toResolveMetaData());
            }
        }
    }
File
ProjectDependencyResolver.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
    public void resolve(ComponentIdentifier identifier, ComponentOverrideMetadata componentOverrideMetadata, BuildableComponentResolveResult result) {
        if (identifier instanceof ProjectComponentIdentifier) {
<<<<<<< HEAD
            LocalComponentMetaData componentMetaData = projectComponentRegistry.getProject(((ProjectComponentIdentifier) identifier).getProjectPath());
            result.resolved(componentMetaData.toResolveMetaData());
=======
            String projectPath = ((ProjectComponentIdentifier) identifier).getProjectPath();
            LocalComponentMetaData componentMetaData = projectComponentRegistry.getProject(projectPath);
            if (componentMetaData == null) {
                result.failed(new ModuleVersionResolveException(new DefaultProjectComponentSelector(projectPath), "project '" + projectPath + "' not found."));
            } else {
                result.resolved(componentMetaData.toResolveMetaData());
            }
        } else {
            delegateComponentResolver.resolve(identifier, componentOverrideMetadata, result);
>>>>>>> c9f207f9bbcb65a44b39c82043815e9bfc1bb990
        }
    }
Solution content 
    public void resolve(ComponentIdentifier identifier, ComponentOverrideMetadata componentOverrideMetadata, BuildableComponentResolveResult result) {
        if (identifier instanceof ProjectComponentIdentifier) {
            String projectPath = ((ProjectComponentIdentifier) identifier).getProjectPath();
            LocalComponentMetaData componentMetaData = projectComponentRegistry.getProject(projectPath);
            if (componentMetaData == null) {
                result.failed(new ModuleVersionResolveException(new DefaultProjectComponentSelector(projectPath), "project '" + projectPath + "' not found."));
            } else {
                result.resolved(componentMetaData.toResolveMetaData());
            }
        }
    }
File
ProjectDependencyResolver.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Variable