Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Separate generate resources and classes #129

Merged
merged 1 commit into from
Jun 2, 2018
Merged

Separate generate resources and classes #129

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 12 additions & 11 deletions src/main/groovy/me/champeau/gradle/JMHPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class JMHPlugin implements Plugin<Project> {
final Configuration configuration = project.configurations.create(JMH_NAME)
final Configuration runtimeConfiguration = createJmhRuntimeConfiguration(project, extension)
configuration.incoming.beforeResolve { ResolvableDependencies resolvableDependencies ->
DependencyHandler dependencyHandler = project.getDependencies();
DependencyHandler dependencyHandler = project.getDependencies()
def dependencies = configuration.getDependencies()
dependencies.add(dependencyHandler.create("${JMH_CORE_DEPENDENCY}${extension.jmhVersion}"))
dependencies.add(dependencyHandler.create("${JMH_GENERATOR_DEPENDENCY}${extension.jmhVersion}"))
Expand All @@ -68,15 +68,16 @@ class JMHPlugin implements Plugin<Project> {

def jmhGeneratedSourcesDir = project.file("$project.buildDir/jmh-generated-sources")
def jmhGeneratedClassesDir = project.file("$project.buildDir/jmh-generated-classes")
createJmhRunBytecodeGeneratorTask(project, jmhGeneratedSourcesDir, extension, jmhGeneratedClassesDir)
def jmhGeneratedResourcesDir = project.file("$project.buildDir/jmh-generated-resources")
createJmhRunBytecodeGeneratorTask(project, jmhGeneratedSourcesDir, extension, jmhGeneratedResourcesDir)

createJmhCompileGeneratedClassesTask(project, jmhGeneratedSourcesDir, jmhGeneratedClassesDir, extension)

def metaInfExcludes = ['META-INF/*.SF', 'META-INF/*.DSA', 'META-INF/*.RSA']
if (hasShadow) {
createShadowJmhJar(project, extension, jmhGeneratedClassesDir, metaInfExcludes, runtimeConfiguration)
createShadowJmhJar(project, extension, jmhGeneratedResourcesDir, jmhGeneratedClassesDir, metaInfExcludes, runtimeConfiguration)
} else {
createStandardJmhJar(project, extension, metaInfExcludes, jmhGeneratedClassesDir, runtimeConfiguration)
createStandardJmhJar(project, extension, metaInfExcludes, jmhGeneratedResourcesDir, jmhGeneratedClassesDir, runtimeConfiguration)
}

project.tasks.create(name: JMH_NAME, type: JMHTask) {
Expand Down Expand Up @@ -141,24 +142,22 @@ class JMHPlugin implements Plugin<Project> {
project.tasks.create(name: JMH_TASK_COMPILE_GENERATED_CLASSES_NAME, type: JavaCompile) {
group JMH_GROUP
dependsOn 'jmhRunBytecodeGenerator'
inputs.dir jmhGeneratedSourcesDir
outputs.dir jmhGeneratedClassesDir

classpath = project.sourceSets.jmh.runtimeClasspath
if (extension.includeTests) {
classpath += project.sourceSets.test.output + project.sourceSets.test.runtimeClasspath
}
source = project.fileTree(jmhGeneratedSourcesDir)
source = jmhGeneratedSourcesDir
destinationDir = jmhGeneratedClassesDir
}
}

private Task createJmhRunBytecodeGeneratorTask(Project project, File jmhGeneratedSourcesDir, JMHPluginExtension extension, File jmhGeneratedClassesDir) {
private Task createJmhRunBytecodeGeneratorTask(Project project, File jmhGeneratedSourcesDir, JMHPluginExtension extension, File jmhGeneratedResourcesDir) {
project.tasks.create(name: 'jmhRunBytecodeGenerator', type: JmhBytecodeGeneratorTask) {
group JMH_GROUP
dependsOn 'jmhClasses'
includeTests = extension.includeTestsProvider
generatedClassesDir = jmhGeneratedClassesDir
generatedClassesDir = jmhGeneratedResourcesDir
generatedSourcesDir = jmhGeneratedSourcesDir
}
}
Expand All @@ -174,7 +173,7 @@ class JMHPlugin implements Plugin<Project> {
}
}

private void createShadowJmhJar(Project project, JMHPluginExtension extension, File jmhGeneratedClassesDir, List<String> metaInfExcludes, Configuration runtimeConfiguration) {
private void createShadowJmhJar(Project project, JMHPluginExtension extension, File jmhGeneratedResourcesDir, File jmhGeneratedClassesDir, List<String> metaInfExcludes, Configuration runtimeConfiguration) {
def shadow = project.tasks.create(name: JMH_JAR_TASK_NAME, type: Class.forName('com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar', true, JMHPlugin.classLoader))
shadow.group = JMH_GROUP
shadow.dependsOn(JMH_TASK_COMPILE_GENERATED_CLASSES_NAME)
Expand Down Expand Up @@ -209,13 +208,14 @@ class JMHPlugin implements Plugin<Project> {
}
shadow.from(project.sourceSets.jmh.output)
shadow.from(project.sourceSets.main.output)
shadow.from(project.file(jmhGeneratedResourcesDir))
shadow.from(project.file(jmhGeneratedClassesDir))

shadow.exclude(metaInfExcludes)
shadow.configurations = []
}

private Task createStandardJmhJar(Project project, JMHPluginExtension extension, List<String> metaInfExcludes, File jmhGeneratedClassesDir, Configuration runtimeConfiguration) {
private Task createStandardJmhJar(Project project, JMHPluginExtension extension, List<String> metaInfExcludes, File jmhGeneratedResourcesDir, File jmhGeneratedClassesDir, Configuration runtimeConfiguration) {
project.tasks.create(name: JMH_JAR_TASK_NAME, type: Jar) {
group JMH_GROUP
dependsOn JMH_TASK_COMPILE_GENERATED_CLASSES_NAME
Expand All @@ -226,6 +226,7 @@ class JMHPlugin implements Plugin<Project> {
doFirst {
from(project.sourceSets.jmh.output)
from(project.sourceSets.main.output)
from(project.file(jmhGeneratedResourcesDir))
from(project.file(jmhGeneratedClassesDir))
if (extension.includeTests) {
from(project.sourceSets.test.output)
Expand Down