SONAR-10890 Move branding into private

1 files changed, 6 insertions, 25 deletions

diff --git a/server/sonar-web/build.gradle b/server/sonar-web/build.gradle
index 57567dc7ac4..9709c52724e 100644
--- a/server/sonar-web/build.gradle
+++ b/server/sonar-web/build.gradle
@@ -9,46 +9,27 @@ sonarqube {
   }
 }
 
+apply plugin: 'com.moowork.node'
+
 configurations {
   branding
 }
+
 dependencies {
   branding 'com.sonarsource:sonarsource-branding:1.3.0.307@war'
 }
 
 def webappDir = "${buildDir}/webapp"
-def brandingDir = "${buildDir}/branding"
 
-task unzipBranding(type: Copy) {
-  from { zipTree(configurations.branding.singleFile) }
-  into brandingDir
-}
-task copyBrandingSrc(type: Copy, dependsOn: unzipBranding) {
+task copyBranding(type: Copy) {
   into projectDir
-  from file(brandingDir)
-  include '**/*.js'
-  includeEmptyDirs = false
-}
-task copyBrandingWebapp(type: Copy, dependsOn: unzipBranding) {
-  into "${projectDir}/public"
-  from file("${brandingDir}/src/main/webapp")
-  include '**/*.svg'
-  includeEmptyDirs = false
-}
-task copyBrandingFile(type: Copy, dependsOn: unzipBranding) {
-  into "${projectDir}/public"
-  from file(brandingDir)
-  include '**/branding'
+  from project(':private:branding').file('.')
   includeEmptyDirs = false
 }
-task copyBranding() {
-  dependsOn copyBrandingSrc
-  dependsOn copyBrandingWebapp
-  dependsOn copyBrandingFile
-}
 
 yarn_run {
   if (official) { dependsOn copyBranding }
+  
   inputs.property('official', official)
   ['config', 'public', 'scripts', 'src', '../sonar-docs/src'].each {
     inputs.dir(it).withPathSensitivity(PathSensitivity.RELATIVE)