Skip to content

Commit 4482e5d

Browse files
authored
Merge pull request #6 from jdaugherty/7.0.x
Remove old repairPublicFiles workaround now that gradle is updated
2 parents 1e27f5c + 40ba8cf commit 4482e5d

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

plugin/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,5 @@ build/
1414
.classpath
1515
.project
1616

17-
/src/main/resources/static/*
1817
/src/main/resources/public/*
1918
/grails-app/views/console/_*

plugin/build.gradle

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,6 @@ tasks.withType(GroovyCompile) {
7676
}
7777
}
7878

79-
task repairPublicFiles(type: Copy) { // https://github.com/grails/grails-core/issues/629
80-
from 'src/main/resources/static'
81-
into 'build/resources/main/static'
82-
}
83-
processResources.finalizedBy repairPublicFiles
84-
8579
gitProperties {
8680
keys = ['git.branch', 'git.commit.id', 'git.commit.time', 'git.commit.id.abbrev']
8781
failOnNoGitDirectory = true
@@ -93,7 +87,7 @@ generateGitProperties.outputs.upToDateWhen {
9387
} // make sure the generateGitProperties task always executes (even when git.properties is not changed)
9488

9589
jar {
96-
dependsOn repairPublicFiles, generateGitProperties, bootStartScripts, bootDistTar, bootDistZip
90+
dependsOn generateGitProperties, bootStartScripts, bootDistTar, bootDistZip
9791
manifest {
9892
attributes("Built-By": System.getProperty("user.name"))
9993
attributes(["Plugin-Version" : version,
@@ -106,9 +100,6 @@ jar {
106100
exclude 'git.properties'
107101
}
108102

109-
compileTestGroovy.dependsOn repairPublicFiles
110-
resolveMainClassName.dependsOn repairPublicFiles
111-
112103
task sourceJar(type: Jar) {
113104
from sourceSets.main.allSource
114105
}

0 commit comments

Comments
 (0)