Use sonar-wrapper lib (#50)

codeclimate · Nov 2, 2017 · 1d2987c · 1d2987c
1 parent d5fe9f6
commit 1d2987c
Showing 44 changed files with 6 additions and 1,717 deletions.
diff --git a/bin/codeclimate-sonar b/bin/codeclimate-sonar
@@ -1,16 +1,17 @@
 #!/usr/bin/env sh
 
 BUILD_DIR=$(dirname $0)
-APP=$(find ${BUILD_DIR}/libs -name "codeclimate*.jar" | tr "\n" ":")
-LIBS=$(find ${BUILD_DIR}/libs -name "*.jar" | tr "\n" ":")
+APP=$(find ${BUILD_DIR}/libs -name "codeclimate-sonar-java.jar" | head -n1)
+WRAPPER=$(find ${BUILD_DIR}/libs -name "sonar-wrapper*.jar" | head -n1)
 CORE=$(find ${BUILD_DIR}/libs -name "sonarlint-core*.jar" -or -name "sonarlint-client-api*.jar" | tr "\n" ":")
+LIBS=$(find ${BUILD_DIR}/libs -name "*.jar" | tr "\n" ":")
 
 CODE_DIR=$1; shift
 CONFIG_FILE=$1; shift
 
 java \
   -noverify \
-  -cp ${APP}:${CORE}:${LIBS} \
+  -cp ${APP}:${WRAPPER}:${CORE}:${LIBS} \
   -Djava.awt.headless=true  \
   -Dsonarlint.home="${BUILD_DIR}"  \
   -Dproject.home="${CODE_DIR}"  \

diff --git a/build.gradle b/build.gradle
@@ -2,6 +2,7 @@ apply plugin: "java"
 
 repositories {
     jcenter()
+    maven { url 'https://jitpack.io' }
 }
 
 task copyLibs(type: Copy) {
@@ -32,10 +33,7 @@ build.dependsOn(infra)
 test.dependsOn(infra)
 
 dependencies {
-    compile("org.sonarsource.sonarlint.core:sonarlint-core:2.17.0.899")
-    compile("org.sonarsource.sonarlint.core:sonarlint-client-api:2.17.0.899")
-    compile("org.sonarsource.sonarlint:sonarlint-cli:2.1.0.566")
-    compile("com.google.code.gson:gson:2.8.2")
+    compile("com.github.codeclimate:sonar-wrapper:master-SNAPSHOT")
 
     // Plugins
     compile("org.sonarsource.java:sonar-java-plugin:4.14.0.11784")

diff --git a/fixtures/multiple_paths/Main.java b/fixtures/multiple_paths/Main.java
diff --git a/fixtures/multiple_paths/config.json b/fixtures/multiple_paths/config.json
diff --git a/fixtures/multiple_paths/src/excluded/java/pkg1/HasIssue.java b/fixtures/multiple_paths/src/excluded/java/pkg1/HasIssue.java
diff --git a/fixtures/multiple_paths/src/included/java/pkg1/HasIssue.java b/fixtures/multiple_paths/src/included/java/pkg1/HasIssue.java
diff --git a/fixtures/multiple_paths/src/included/java/pkg1/HasNoIssue.java b/fixtures/multiple_paths/src/included/java/pkg1/HasNoIssue.java
diff --git a/fixtures/multiple_paths/src/test/java/Test.java b/fixtures/multiple_paths/src/test/java/Test.java
diff --git a/fixtures/multiple_paths/src/test2/java/Test.java b/fixtures/multiple_paths/src/test2/java/Test.java
diff --git a/src/main/java/cc/App.java b/src/main/java/cc/App.java
diff --git a/src/main/java/cc/Config.java b/src/main/java/cc/Config.java
diff --git a/src/main/java/cc/analysis/SonarLintFactory.java b/src/main/java/cc/analysis/SonarLintFactory.java
diff --git a/src/main/java/cc/analysis/StandaloneSonarLint.java b/src/main/java/cc/analysis/StandaloneSonarLint.java
diff --git a/src/main/java/cc/files/Collector.java b/src/main/java/cc/files/Collector.java