Skip to content

Commit

Permalink
Merge pull request #6 from jdaugherty/7.0.x
Browse files Browse the repository at this point in the history
Remove old repairPublicFiles workaround now that gradle is updated
  • Loading branch information
codeconsole authored Oct 15, 2024
2 parents 1e27f5c + 40ba8cf commit 4482e5d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
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

0 comments on commit 4482e5d

Please sign in to comment.