SONAR-14617 Fix Gradle configuration

diff --git a/server/sonar-ui-common/build.gradle b/server/sonar-ui-common/build.gradle
index e3f264ae0b050d9e25ba1379bd300dd8595802a5..ab94ef9534c5f48f74175f815d777963e1d0523b 100644 (file)
--- a/server/sonar-ui-common/build.gradle
+++ b/server/sonar-ui-common/build.gradle
@@ -7,9 +7,8 @@ sonarqube {
     property "sonar.test", "components,helpers"
     property "sonar.test.inclusions", "**/__tests__/**"
     property "sonar.eslint.reportPaths", "eslint-report.json"
-    property "sonar.javascript.lcov.reportPaths", "coverage/lcov.info"
     property "sonar.coverage.exclusions", "components/icons/*,helpers/testUtils.ts,helpers/keycodes.ts"
-    property "sonar.typescript.lcov.reportPaths", "build/coverage/lcov.info"
+    property "sonar.javascript.lcov.reportPaths", "build/coverage/lcov.info"
     property "sonar.eslint.reportPaths", "build/eslint-report.json"
   }
 }
@@ -46,8 +45,8 @@ yarn_run {
   ['.eslintrc', 'package.json', 'yarn.lock', 'tsconfig.json'].each {
     inputs.file(it)
   }
-  outputs.file("eslint-report.json")
-  outputs.dir("coverage")
+  outputs.file("build/eslint-report.json")
+  outputs.dir("build/coverage")
   outputs.cacheIf { true }
 
   dependsOn(yarn)

diff --git a/server/sonar-ui-common/package.json b/server/sonar-ui-common/package.json
index 0f4b9b896bac0d40b1d0f994621fcb3631d7146c..ac8c5bf684363561efc58a1d05440f6e8e94ed30 100644 (file)
--- a/server/sonar-ui-common/package.json
+++ b/server/sonar-ui-common/package.json
@@ -88,7 +88,6 @@
     "clean": "rm -rf build/dist",
     "build": "sh scripts/build.sh",
     "package": "yarn build && cd build/dist && yarn pack",
-    "release": "sh scripts/release.sh",
     "test": "jest",
     "format": "prettier --write --list-different \"{,!(build|node_modules)/**/}*.{ts,tsx,css}\"",
     "format-check": "prettier --list-different \"{,!(build|node_modules)/**/}*.{ts,tsx,css}\"",

diff --git a/server/sonar-ui-common/scripts/release.sh b/server/sonar-ui-common/scripts/release.sh
deleted file mode 100755 (executable)
index a34ed5b..0000000
--- a/server/sonar-ui-common/scripts/release.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-
-if [ $# -eq 0 ]
-  then
-    echo "Missing argument for the new version to release"
-    exit 1
-fi
-
-if [ ! $(which npmrc) ]
-  then
-    echo "You need to install npmrc and configure it correctly, check the readme. Call:"
-    echo "  npm install -g npmrc"
-    exit 1
-fi
-
-git stash
-sed "s/## Unreleased/## Unreleased__NEW_LINE__## $1/g" CHANGELOG.md | awk '{ sub(/__NEW_LINE__/,"\n\n"); print }' > CHANGELOG.md.back
-mv CHANGELOG.md.back CHANGELOG.md
-sed "s/\"version\": \".*\",/\"version\": \"$1\",/g" package.json > package.json.back
-mv package.json.back package.json
-yarn
-yarn package
-npmrc npm
-git add CHANGELOG.md package.json
-git commit -m "Prepare version $1"
-git tag $1
-yarn publish ./build/dist/sonar-ui-common-v$1.tgz
-
-if [ $? -gt 0 ]
-  then
-    echo "Publish failed, aborting"
-    git tag -d $1
-    git reset HEAD~
-    git checkout .
-    npmrc default
-    git stash pop
-    exit 1
-fi
-
-git push
-git push origin $1
-npmrc default
-git stash pop
-