port to gradle 4.5.1

Author: Yky

xmvn-connector-gradle/src/main/java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java

@@ -25,6 +25,7 @@
 import org.gradle.api.artifacts.ModuleVersionIdentifier;
 import org.gradle.api.artifacts.component.ComponentArtifactIdentifier;
 import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.internal.ExperimentalFeatures;
 import org.gradle.api.internal.artifacts.ImmutableModuleIdentifierFactory;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ConfiguredModuleComponentRepository;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleComponentRepositoryAccess;
@@ -34,10 +35,13 @@
 import org.gradle.api.internal.artifacts.repositories.AbstractArtifactRepository;
 import org.gradle.api.internal.artifacts.repositories.ResolutionAwareRepository;
 import org.gradle.api.internal.artifacts.repositories.resolver.MetadataFetchingCost;
+import org.gradle.api.internal.attributes.ImmutableAttributesFactory;
 import org.gradle.api.internal.component.ArtifactType;
+import org.gradle.api.internal.model.NamedObjectInstantiator;
 import org.gradle.internal.component.external.model.DefaultModuleComponentArtifactMetadata;
 import org.gradle.internal.component.external.model.DefaultMutableMavenModuleResolveMetadata;
 import org.gradle.internal.component.external.model.FixedComponentArtifacts;
+import org.gradle.internal.component.external.model.MavenDependencyDescriptor;
 import org.gradle.internal.component.external.model.ModuleComponentArtifactMetadata;
 import org.gradle.internal.component.external.model.ModuleComponentResolveMetadata;
 import org.gradle.internal.component.external.model.ModuleDependencyMetadata;
@@ -80,17 +84,28 @@ public class GradleResolver
 {
     public GradleResolver( MetaDataParser<MutableMavenModuleResolveMetadata> pomParser,
                            ImmutableModuleIdentifierFactory moduleIdentifierFactory,
-                           FileResourceRepository fileRepository )
+                           FileResourceRepository fileRepository, ImmutableAttributesFactory immutableAttributesFactory,
+                           NamedObjectInstantiator objectInstantiator, ExperimentalFeatures experimentalFeatures )
     {
         this.pomParser = pomParser;
         this.moduleIdentifierFactory = moduleIdentifierFactory;
         this.fileRepository = fileRepository;
+        this.immutableAttributesFactory = immutableAttributesFactory;
+        this.experimentalFeatures = experimentalFeatures;
+        this.objectInstantiator = objectInstantiator;
+
     }
 
     private MetaDataParser<MutableMavenModuleResolveMetadata> pomParser;
 
     private ImmutableModuleIdentifierFactory moduleIdentifierFactory;
 
+    private ImmutableAttributesFactory immutableAttributesFactory;
+
+    private ExperimentalFeatures experimentalFeatures;
+
+    private NamedObjectInstantiator objectInstantiator;
+
     private FileResourceRepository fileRepository;
 
     private final Logger logger = LoggerFactory.getLogger( GradleResolver.class );
@@ -219,8 +234,11 @@ public void resolveComponentMetaData( ModuleComponentIdentifier id, ComponentOve
                     logger.debug( "Artifact {} found, returning minimal model", artifact3 );
                     ModuleVersionIdentifier mvi =
                         moduleIdentifierFactory.moduleWithVersion( id.getGroup(), id.getModule(), id.getVersion() );
-                    MutableModuleComponentResolveMetadata metaData =
-                        DefaultMutableMavenModuleResolveMetadata.missing( mvi, id );
+                    DefaultMutableMavenModuleResolveMetadata metaData =
+                        new DefaultMutableMavenModuleResolveMetadata( mvi, id,
+                                                                      Collections.<MavenDependencyDescriptor>emptyList(),
+                                                                      immutableAttributesFactory, objectInstantiator,
+                                                                      experimentalFeatures );
                     result.resolved( metaData.asImmutable() );
                     return;
                 }

xmvn-parent/pom.xml

@@ -84,7 +84,7 @@
     <atinjectVersion>1</atinjectVersion>
     <ivyVersion>2.5.0-rc1</ivyVersion>
     <jcommanderVersion>1.72</jcommanderVersion>
-    <gradleVersion>4.4.1</gradleVersion>
+    <gradleVersion>4.5.1</gradleVersion>
     <groovyVersion>2.4.12</groovyVersion>
     <mavenInvokerVersion>2.2</mavenInvokerVersion>
     <mavenResolverVersion>1.3.1</mavenResolverVersion>