jessebrault/ssg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Improvements to gradle plugin, source set dependencies.

Browse Source
This commit is contained in:
JesseBrault0709 2024-05-30 07:55:09 +02:00
parent d9f8cae0ea
commit d32ac97caf
3 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssg-gradle-model/build.gradle
View File

@ -3,6 +3,10 @@ plugins {
id 'maven-publish' id 'maven-publish'
} }
java {
withSourcesJar()
}
publishing { publishing {
publications { publications {
create('ssgGradleModel', MavenPublication) { create('ssgGradleModel', MavenPublication) {

4
ssg-gradle-plugin/build.gradle
View File

@ -17,6 +17,10 @@ gradlePlugin {
} }
} }
java {
withSourcesJar()
}
publishing { publishing {
publications { publications {
create('ssgGradlePlugin', MavenPublication) { create('ssgGradlePlugin', MavenPublication) {

34
ssg-gradle-plugin/src/main/java/com/jessebrault/ssg/gradle/SsgGradlePlugin.java
View File

@ -64,7 +64,12 @@ public class SsgGradlePlugin implements Plugin<Project> {
return ssgCliConfiguration; return ssgCliConfiguration;
} }
protected void createDomainSourceSet(Project project, SourceSetContainer sourceSets, String name) { protected void createDomainSourceSet(
Project project,
SourceSetContainer sourceSets,
String name,
List<String> sourceSetDependencies
) {
sourceSets.create(name, sourceSet -> { sourceSets.create(name, sourceSet -> {
// first, register the dirs // first, register the dirs
// java // java
@ -101,10 +106,20 @@ public class SsgGradlePlugin implements Plugin<Project> {
project.getTasks().named("ssgJars", ssgJarsTask -> { project.getTasks().named("ssgJars", ssgJarsTask -> {
ssgJarsTask.dependsOn(jarTaskProvider); ssgJarsTask.dependsOn(jarTaskProvider);
}); });
// fourth, configure dependencies on other source sets
project.getConfigurations().named(name + "Implementation").configure(configuration -> {
sourceSetDependencies.forEach(dependencySourceSetName -> {
final SourceSetOutput sourceSetOutput =
sourceSets.getByName(dependencySourceSetName).getOutput();
final Dependency outputDependency = project.getDependencies().create(sourceSetOutput);
configuration.getDependencies().add(outputDependency);
});
});
}); });
} }
protected void createSsgSourceSet(SourceSetContainer sourceSets) { protected void createSsgSourceSet(Project project, SourceSetContainer sourceSets) {
sourceSets.create(SSG_SOURCE_SET, sourceSet -> { sourceSets.create(SSG_SOURCE_SET, sourceSet -> {
// groovy only // groovy only
sourceSet.getExtensions().getByType(GroovySourceDirectorySet.class).setSrcDirs(List.of(SSG_SOURCE_SET)); sourceSet.getExtensions().getByType(GroovySourceDirectorySet.class).setSrcDirs(List.of(SSG_SOURCE_SET));
@ -112,15 +127,18 @@ public class SsgGradlePlugin implements Plugin<Project> {
sourceSet.getResources().setSrcDirs(List.of(SSG_SOURCE_SET)); sourceSet.getResources().setSrcDirs(List.of(SSG_SOURCE_SET));
// disable java // disable java
sourceSet.getJava().setSrcDirs(List.of()); sourceSet.getJava().setSrcDirs(List.of());
// add dependency on main
final SourceSetOutput mainOutput = sourceSets.getByName("main").getOutput();
project.getDependencies().add(SSG_SOURCE_SET + "Implementation", mainOutput);
}); });
} }
protected void configureSourceSets(Project project) { protected void configureSourceSets(Project project) {
final var javaExtension = project.getExtensions().getByType(JavaPluginExtension.class); final var javaExtension = project.getExtensions().getByType(JavaPluginExtension.class);
final var sourceSets = javaExtension.getSourceSets(); final var sourceSets = javaExtension.getSourceSets();
this.createDomainSourceSet(project, sourceSets, PAGES_SOURCE_SET); this.createSsgSourceSet(project, sourceSets);
this.createDomainSourceSet(project, sourceSets, COMPONENTS_SOURCE_SET); this.createDomainSourceSet(project, sourceSets, COMPONENTS_SOURCE_SET, List.of("main"));
this.createSsgSourceSet(sourceSets); this.createDomainSourceSet(project, sourceSets, PAGES_SOURCE_SET, List.of("main", COMPONENTS_SOURCE_SET));
} }
// protected void configureCompileSsgGroovyTask(Project project) { // protected void configureCompileSsgGroovyTask(Project project) {
@ -177,8 +195,10 @@ public class SsgGradlePlugin implements Plugin<Project> {
project.getPlugins().apply(JavaPlugin.class); project.getPlugins().apply(JavaPlugin.class);
project.getPlugins().apply(GroovyPlugin.class); project.getPlugins().apply(GroovyPlugin.class);
// create our ssgJars task, which is just a holder for source set jar tasks // create our ssgJars task, which is just a holder for source set jar tasks, including main
project.getTasks().register("ssgJars"); project.getTasks().register("ssgJars").configure(ssgJars -> {
ssgJars.dependsOn("jar"); // main
});
// configure the repositories, tooling models, and source sets // configure the repositories, tooling models, and source sets
this.configureRepositories(project); this.configureRepositories(project);