Merge pull request #180 from gradle/tt/remove-usage-of-publish-lazy-a…

…rtifact
gradle · Jan 24, 2023 · b2d5223 · b2d5223
2 parents 6834669 + 175eebe
commit b2d5223
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/docs/asciidoc/50-changes.adoc b/src/docs/asciidoc/50-changes.adoc
@@ -1,5 +1,11 @@
 == Change Log
 
+[discrete]
+=== v0.13 (2023-01-24)
+* Remove usage of internal Gradle API org.gradle.api.internal.artifacts.dsl.LazyPublishArtifact
+* Update wrapper to Gradle 6.9.3
+* Clean unused imports
+
 [discrete]
 === v0.12 (2021-06-10)
 

diff --git a/src/main/java/org/gradle/playframework/plugins/PlayApplicationPlugin.java b/src/main/java/org/gradle/playframework/plugins/PlayApplicationPlugin.java
@@ -5,15 +5,13 @@
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.ConfigurationPublications;
-import org.gradle.api.artifacts.PublishArtifact;
 import org.gradle.api.artifacts.component.ComponentIdentifier;
 import org.gradle.api.artifacts.component.ProjectComponentIdentifier;
 import org.gradle.api.artifacts.dsl.DependencyHandler;
 import org.gradle.api.artifacts.type.ArtifactTypeDefinition;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.file.SourceDirectorySet;
 import org.gradle.api.internal.artifacts.ArtifactAttributes;
-import org.gradle.api.internal.artifacts.dsl.LazyPublishArtifact;
 import org.gradle.api.plugins.scala.ScalaPlugin;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.TaskProvider;
@@ -131,9 +129,8 @@ private TaskProvider<Jar> createAssetsJarTask(Project project) {
 
     private void registerOutgoingArtifact(Project project, TaskProvider<Jar> assetsJarTask) {
         Configuration runtimeElementsConfiguration = project.getConfigurations().getByName(RUNTIME_ELEMENTS_CONFIGURATION_NAME);
-        PublishArtifact jarArtifact = new LazyPublishArtifact(assetsJarTask);
         ConfigurationPublications publications = runtimeElementsConfiguration.getOutgoing();
-        publications.getArtifacts().add(jarArtifact);
+        publications.artifact(assetsJarTask);
         publications.getAttributes().attribute(ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.JAR_TYPE);
     }
 

diff --git a/src/main/java/org/gradle/playframework/plugins/PlayIdeaPlugin.java b/src/main/java/org/gradle/playframework/plugins/PlayIdeaPlugin.java
@@ -1,17 +1,12 @@
 package org.gradle.playframework.plugins;
 
-import groovy.util.Node;
-import groovy.util.NodeList;
-import groovy.xml.QName;
 import org.gradle.api.JavaVersion;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.file.SourceDirectorySet;
 import org.gradle.api.internal.ConventionMapping;
 import org.gradle.api.internal.plugins.DslObject;
-import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.TaskProvider;
-import org.gradle.language.scala.internal.DefaultScalaPlatform;
 import org.gradle.playframework.extensions.PlayExtension;
 import org.gradle.playframework.extensions.PlayPlatform;
 import org.gradle.playframework.tasks.JavaScriptMinify;
@@ -22,15 +17,12 @@
 import org.gradle.plugins.ide.idea.model.IdeaModule;
 
 import java.io.File;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Callable;
 
 import static org.gradle.playframework.plugins.PlayApplicationPlugin.PLAY_EXTENSION_NAME;
-import static org.gradle.playframework.plugins.internal.PlayPluginHelper.*;
+import static org.gradle.playframework.plugins.internal.PlayPluginHelper.getMainScalaSourceDirectorySet;
 
 public class PlayIdeaPlugin implements Plugin<Project> {