From be2131b351e350f4d33abddf88c6c27b65e4729c Mon Sep 17 00:00:00 2001 From: Thomas Tresansky Date: Mon, 23 Jan 2023 16:15:11 -0500 Subject: [PATCH 1/5] Update wrapper to 6.9.3 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index da9702f9..d355f4c4 100644 --- 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 From 1788b4855c1dc33b2c2760c72509cc4285c25c22 Mon Sep 17 00:00:00 2001 From: Thomas Tresansky Date: Mon, 23 Jan 2023 16:15:28 -0500 Subject: [PATCH 2/5] Remove unused imports --- .../gradle/playframework/plugins/PlayIdeaPlugin.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/main/java/org/gradle/playframework/plugins/PlayIdeaPlugin.java b/src/main/java/org/gradle/playframework/plugins/PlayIdeaPlugin.java index 3f355ed8..6ba8c75c 100644 --- 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 { From bfe88146aa4517fb237a3a7b70b061d30fb3b519 Mon Sep 17 00:00:00 2001 From: Thomas Tresansky Date: Mon, 23 Jan 2023 16:15:55 -0500 Subject: [PATCH 3/5] Replace usage of LazyPublishArtifact with anonymous class --- .../plugins/PlayApplicationPlugin.java | 42 ++++++++++++++++++- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gradle/playframework/plugins/PlayApplicationPlugin.java b/src/main/java/org/gradle/playframework/plugins/PlayApplicationPlugin.java index 67728223..edf3d358 100644 --- a/src/main/java/org/gradle/playframework/plugins/PlayApplicationPlugin.java +++ b/src/main/java/org/gradle/playframework/plugins/PlayApplicationPlugin.java @@ -13,9 +13,9 @@ 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.TaskDependency; import org.gradle.api.tasks.TaskProvider; import org.gradle.api.tasks.bundling.Jar; import org.gradle.playframework.extensions.PlayExtension; @@ -27,7 +27,10 @@ import org.gradle.playframework.tasks.TwirlCompile; import org.gradle.util.VersionNumber; +import java.io.File; import java.util.Arrays; +import java.util.Collections; +import java.util.Date; import static org.gradle.api.plugins.BasePlugin.ASSEMBLE_TASK_NAME; import static org.gradle.api.plugins.JavaPlugin.*; @@ -131,7 +134,42 @@ private TaskProvider createAssetsJarTask(Project project) { private void registerOutgoingArtifact(Project project, TaskProvider assetsJarTask) { Configuration runtimeElementsConfiguration = project.getConfigurations().getByName(RUNTIME_ELEMENTS_CONFIGURATION_NAME); - PublishArtifact jarArtifact = new LazyPublishArtifact(assetsJarTask); + PublishArtifact jarArtifact = new PublishArtifact() { + @Override + public String getName() { + return assetsJarTask.get().getArchiveFileName().get(); + } + + @Override + public String getExtension() { + return "jar"; + } + + @Override + public String getType() { + return "jar"; + } + + @Override + public String getClassifier() { + return assetsJarTask.get().getArchiveClassifier().get(); + } + + @Override + public File getFile() { + return assetsJarTask.get().getArchiveFile().get().getAsFile(); + } + + @Override + public Date getDate() { + return new Date(); + } + + @Override + public TaskDependency getBuildDependencies() { + return task -> Collections.singleton(assetsJarTask.get()); + } + }; ConfigurationPublications publications = runtimeElementsConfiguration.getOutgoing(); publications.getArtifacts().add(jarArtifact); publications.getAttributes().attribute(ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.JAR_TYPE); From 87840a2f38acfcd477aa4686ab1234c6243b2624 Mon Sep 17 00:00:00 2001 From: Thomas Tresansky Date: Mon, 23 Jan 2023 16:52:19 -0500 Subject: [PATCH 4/5] Remove anonymous implementation of PublishArtifact with usage of artifact(Object) to add the jar --- .../plugins/PlayApplicationPlugin.java | 43 +------------------ 1 file changed, 1 insertion(+), 42 deletions(-) diff --git a/src/main/java/org/gradle/playframework/plugins/PlayApplicationPlugin.java b/src/main/java/org/gradle/playframework/plugins/PlayApplicationPlugin.java index edf3d358..e3ac06e3 100644 --- a/src/main/java/org/gradle/playframework/plugins/PlayApplicationPlugin.java +++ b/src/main/java/org/gradle/playframework/plugins/PlayApplicationPlugin.java @@ -5,7 +5,6 @@ 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; @@ -15,7 +14,6 @@ import org.gradle.api.internal.artifacts.ArtifactAttributes; import org.gradle.api.plugins.scala.ScalaPlugin; import org.gradle.api.tasks.SourceSet; -import org.gradle.api.tasks.TaskDependency; import org.gradle.api.tasks.TaskProvider; import org.gradle.api.tasks.bundling.Jar; import org.gradle.playframework.extensions.PlayExtension; @@ -27,10 +25,7 @@ import org.gradle.playframework.tasks.TwirlCompile; import org.gradle.util.VersionNumber; -import java.io.File; import java.util.Arrays; -import java.util.Collections; -import java.util.Date; import static org.gradle.api.plugins.BasePlugin.ASSEMBLE_TASK_NAME; import static org.gradle.api.plugins.JavaPlugin.*; @@ -134,44 +129,8 @@ private TaskProvider createAssetsJarTask(Project project) { private void registerOutgoingArtifact(Project project, TaskProvider assetsJarTask) { Configuration runtimeElementsConfiguration = project.getConfigurations().getByName(RUNTIME_ELEMENTS_CONFIGURATION_NAME); - PublishArtifact jarArtifact = new PublishArtifact() { - @Override - public String getName() { - return assetsJarTask.get().getArchiveFileName().get(); - } - - @Override - public String getExtension() { - return "jar"; - } - - @Override - public String getType() { - return "jar"; - } - - @Override - public String getClassifier() { - return assetsJarTask.get().getArchiveClassifier().get(); - } - - @Override - public File getFile() { - return assetsJarTask.get().getArchiveFile().get().getAsFile(); - } - - @Override - public Date getDate() { - return new Date(); - } - - @Override - public TaskDependency getBuildDependencies() { - return task -> Collections.singleton(assetsJarTask.get()); - } - }; ConfigurationPublications publications = runtimeElementsConfiguration.getOutgoing(); - publications.getArtifacts().add(jarArtifact); + publications.artifact(assetsJarTask); publications.getAttributes().attribute(ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.JAR_TYPE); } From 175eebeb4305a16207554038f7515679fc8f910c Mon Sep 17 00:00:00 2001 From: Thomas Tresansky Date: Mon, 23 Jan 2023 16:52:44 -0500 Subject: [PATCH 5/5] Update release notes in change log to prep for 2023-01-23 release --- src/docs/asciidoc/50-changes.adoc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/docs/asciidoc/50-changes.adoc b/src/docs/asciidoc/50-changes.adoc index bb644382..5c8f0254 100644 --- 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)