From 40ba8cf7577166365e2f0e7cf258c52448c70b0d Mon Sep 17 00:00:00 2001 From: James Daugherty Date: Tue, 15 Oct 2024 12:56:28 -0400 Subject: [PATCH] Remove old repairPublicFiles workaround now that gradle is updated --- plugin/.gitignore | 1 - plugin/build.gradle | 11 +---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/plugin/.gitignore b/plugin/.gitignore index fa436fe..5c26b88 100644 --- a/plugin/.gitignore +++ b/plugin/.gitignore @@ -14,6 +14,5 @@ build/ .classpath .project -/src/main/resources/static/* /src/main/resources/public/* /grails-app/views/console/_* \ No newline at end of file diff --git a/plugin/build.gradle b/plugin/build.gradle index 5da5de1..6440622 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -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 @@ -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, @@ -106,9 +100,6 @@ jar { exclude 'git.properties' } -compileTestGroovy.dependsOn repairPublicFiles -resolveMainClassName.dependsOn repairPublicFiles - task sourceJar(type: Jar) { from sourceSets.main.allSource }