Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion plugin/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,5 @@ build/
.classpath
.project

/src/main/resources/static/*
/src/main/resources/public/*
/grails-app/views/console/_*
11 changes: 1 addition & 10 deletions plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,6 @@ tasks.withType(GroovyCompile) {
}
}

task repairPublicFiles(type: Copy) { // https://github.com/grails/grails-core/issues/629
from 'src/main/resources/static'
into 'build/resources/main/static'
}
processResources.finalizedBy repairPublicFiles

gitProperties {
keys = ['git.branch', 'git.commit.id', 'git.commit.time', 'git.commit.id.abbrev']
failOnNoGitDirectory = true
Expand All @@ -93,7 +87,7 @@ generateGitProperties.outputs.upToDateWhen {
} // make sure the generateGitProperties task always executes (even when git.properties is not changed)

jar {
dependsOn repairPublicFiles, generateGitProperties, bootStartScripts, bootDistTar, bootDistZip
dependsOn generateGitProperties, bootStartScripts, bootDistTar, bootDistZip
manifest {
attributes("Built-By": System.getProperty("user.name"))
attributes(["Plugin-Version" : version,
Expand All @@ -106,9 +100,6 @@ jar {
exclude 'git.properties'
}

compileTestGroovy.dependsOn repairPublicFiles
resolveMainClassName.dependsOn repairPublicFiles

task sourceJar(type: Jar) {
from sourceSets.main.allSource
}
Expand Down
Loading