Unverified Commit c36e0288 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

sonarlint-ls: update 3.14.1 -> 3.17.0 and fix test (#390097)

parents 74a97c51 ac8dacb4

pkgs/by-name/so/sonarlint-ls/package.nix

+44 −56
Original line number Diff line number Diff line
@@ -6,34 +6,27 @@ 
  jdk17,

  makeWrapper,

  writeShellApplication,

  runCommand,

  sonarlint-ls,

  curl,

  pcre,

  common-updater-scripts,

  jq,

  gnused,

  versionCheckHook,

}:



maven.buildMavenPackage rec {

  pname = "sonarlint-ls";

  version = "3.14.1.75775";

  version = "3.17.0.75948";



  src = fetchFromGitHub {

    owner = "SonarSource";

    repo = "sonarlint-language-server";

    rev = version;

    hash = "sha256-QXBSdXpkhqcvfjihcWwy4oCjTMmbAJRZG1T66sa8T4U=";

    hash = "sha256-9ZZPAkfYnHYaPFGo/WfOhUIZ+Aq7SNsVmyXgDwe68gk=";

  };



  # Replaces unavailable versions with available ones in maven central. Can be

  # removed again if

  # https://github.com/SonarSource/sonarlint-language-server/pull/427 is

  # merged.

  patches = [ ./sonar-analyzers-versions.patch ];



  mvnJdk = jdk17;

  mvnHash = "sha256-SKkOf3f9Ze3Rm6i2uYbFkvSnnEySARvaoiAS1e2kFi0=";

  mvnHash = "sha256-tsYkp6Zr9gCgb0l6vQViSB7zcbf6JX+JwO4ZYqeG52c=";



  # Disables failing tests which either need network access or are flaky.

  mvnParameters = lib.escapeShellArgs [
@@ -56,7 +49,6 @@ maven.buildMavenPackage rec { 


    makeWrapper ${jre_headless}/bin/java $out/bin/sonarlint-ls \

      --add-flags "-jar $out/share/sonarlint-ls.jar" \

      --add-flags "-stdio" \

      --add-flags "-analyzers $(ls -1 $out/share/plugins | tr '\n' ' ')"



    runHook postInstall
@@ -64,15 +56,12 @@ maven.buildMavenPackage rec { 


  nativeBuildInputs = [ makeWrapper ];



  passthru = {

    tests = {

      sonarlint-ls-starts-successfully = runCommand "${pname}-test" { } ''

        ${sonarlint-ls}/bin/sonarlint-ls > $out

        cat $out | grep "SonarLint backend started"

      '';

    };

  nativeInstallCheckInputs = [ versionCheckHook ];

  doInstallCheck = true;

  preVersionCheck = "export version=${lib.versions.majorMinor version}";

  versionCheckProgramArg = "-V";



    updateScript =

  passthru.updateScript =

    let

      pkgFile = builtins.toString ./package.nix;

    in
@@ -108,7 +97,6 @@ maven.buildMavenPackage rec { 
        sed -i "0,/mvnHash *= *\"[^\"]*\"/{s#mvnHash = \"[^\"]*\"#mvnHash = \"$NEW_MVN_HASH\"#}" ${pkgFile}

      '';

    });

  };



  meta = {

    description = "Sonarlint language server";

pkgs/by-name/so/sonarlint-ls/sonar-analyzers-versions.patch

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
diff --git a/pom.xml b/pom.xml

index c020fd1..fd4146b 100644

--- a/pom.xml

+++ b/pom.xml

@@ -34,10 +34,10 @@

     <sonar.python.version>4.17.0.14845</sonar.python.version>

     <sonar.html.version>3.16.0.5274</sonar.html.version>

     <sonar.xml.version>2.10.0.4108</sonar.xml.version>

-    <sonar.text.version>2.18.0.4812</sonar.text.version>

+    <sonar.text.version>2.18.0.4866</sonar.text.version>

     <sonar.go.version>1.15.0.4655</sonar.go.version>

     <sonar.iac.version>1.27.0.9518</sonar.iac.version>

-    <sonar.csharp.version>10.2.0.103721</sonar.csharp.version>

+    <sonar.csharp.version>10.2.0.105762</sonar.csharp.version>

     <sonarlint.omnisharp.version>1.25.0.100242</sonarlint.omnisharp.version>

     <gitRepositoryName>sonarlint-language-server</gitRepositoryName>

     <!-- Release: enable publication to Bintray -->