Sync buildSrc from main
- Relates to changes in #1001 for gradle 8.4 upgrade - There were additional changes for publish to work
This commit is contained in:
@@ -48,7 +48,7 @@ public class ArtifactoryConventions {
|
||||
// bom is not a java project so plugin doesn't
|
||||
// add defaults for publications.
|
||||
aTask.publications("mavenJava");
|
||||
aTask.publishConfigs("archives");
|
||||
aTask.publishConfigs("docsarchive");
|
||||
|
||||
// plugin is difficult to work with, use this hack
|
||||
// to set props before task does its real work
|
||||
@@ -62,8 +62,8 @@ public class ArtifactoryConventions {
|
||||
propsMap.put("zip.type", "docs");
|
||||
ArtifactSpec spec = ArtifactSpec.builder()
|
||||
.artifactNotation("*:*:*:*@zip")
|
||||
// archives is manually set for zip in root plugin
|
||||
.configuration("archives")
|
||||
// docsarchive is manually set for zip in root plugin
|
||||
.configuration("docsarchive")
|
||||
.properties(propsMap)
|
||||
.build();
|
||||
artifactSpecs.add(spec);
|
||||
|
||||
@@ -40,6 +40,9 @@ class RootPlugin implements Plugin<Project> {
|
||||
PluginManager pluginManager = project.getPluginManager();
|
||||
pluginManager.apply(MavenPublishPlugin.class);
|
||||
pluginManager.apply(PublishLocalPlugin.class);
|
||||
// docsarchive needs to be created before artifactory
|
||||
// conventions are used
|
||||
project.getConfigurations().create("docsarchive");
|
||||
new ArtifactoryConventions().apply(project);
|
||||
Javadoc apiTask = createApiTask(project);
|
||||
Zip zipTask = createZipTask(project);
|
||||
@@ -65,7 +68,9 @@ class RootPlugin implements Plugin<Project> {
|
||||
});
|
||||
});
|
||||
|
||||
project.getArtifacts().add("archives", zipTask);
|
||||
// since gradle 8.3 archives configuration started to fail
|
||||
// so using custom configuration name
|
||||
project.getArtifacts().add("docsarchive", zipTask);
|
||||
return zipTask;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user