SONARKT-375 - Prepare for release (#389)

* SONARKT-375 - Update dependencies, rules metadata, Detekt, AndroidLint and KtLint.

* Raise available memory for build to 12G

This should be a temporary measure, it seems that the updated Gradle
scanner has issues with memory usage/management.

---------

Co-authored-by: Johann Beleites <[email protected]>

Author: Angelo Buono

.cirrus.yml

@@ -46,7 +46,7 @@ linux_3_5_cpu_7G_template: &LINUX_3_5_CPU_7G
   eks_container:
     <<: *LINUX_IMAGE
     cpu: 3.5
-    memory: 7G
+    memory: 12G # TODO: decrease back to 7G when we fix the memory issues with the Gradle scanner
 
 linux_6_cpu_12G_java_17_template: &LINUX_6_CPU_12G_JAVA_17
   eks_container:

build.gradle.kts

@@ -1,15 +1,14 @@
-
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import org.sonarsource.kotlin.buildsrc.tasks.CreateKotlinRuleStubsTask
 import org.sonarsource.kotlin.buildsrc.tasks.CreateKotlinGradleRuleStubsTask
+import org.sonarsource.kotlin.buildsrc.tasks.CreateKotlinRuleStubsTask
 import org.sonarsource.kotlin.buildsrc.tasks.FetchRuleMetadata
 
 plugins {
     java
     id("jacoco")
     id("com.jfrog.artifactory") version "4.25.1"
-    id("io.spring.dependency-management") version "1.0.11.RELEASE" apply false
-    id("org.sonarqube") version "3.3"
+    id("io.spring.dependency-management") version "1.1.4" apply false
+    id("org.sonarqube") version "4.4.1.3373"
     id("org.jetbrains.kotlin.jvm") apply false
     id("com.diffplug.spotless") version "6.11.0"
     `maven-publish`
@@ -18,7 +17,7 @@ plugins {
 
 val projectTitle: String by project
 
-configure(subprojects.filter { it.name != "kotlin-checks-test-sources"}) {
+configure(subprojects.filter { it.name != "kotlin-checks-test-sources" }) {
     apply(plugin = "com.diffplug.spotless")
 
     configure<com.diffplug.gradle.spotless.SpotlessExtension> {
@@ -168,13 +167,13 @@ subprojects {
 
     val sourcesJar by tasks.creating(Jar::class) {
         dependsOn(JavaPlugin.CLASSES_TASK_NAME)
-        classifier = "sources"
+        archiveClassifier.set("sources")
         from(sourceSets.main.get().allSource)
     }
 
     val javadocJar by tasks.creating(Jar::class) {
         dependsOn(javadoc)
-        classifier = "javadoc"
+        archiveClassifier.set("javadoc")
         from(tasks["javadoc"])
     }
 

gradle.properties

@@ -2,5 +2,5 @@ group=org.sonarsource.kotlin
 version=2.19-SNAPSHOT
 description=Code Analyzer for Kotlin
 projectTitle=Kotlin
-kotlinVersion=1.9.0
+kotlinVersion=1.9.21
 org.gradle.jvmargs=-Xmx4096M

its/plugin/build.gradle.kts

@@ -1,6 +1,6 @@
 dependencies {
     testImplementation(testLibs.sonarlint.core)
-    testImplementation(testLibs.sonar.orchestrator)
+    testImplementation(testLibs.sonar.orchestrator.junit4)
     testImplementation(testLibs.assertj.core)
     testImplementation(testLibs.sonar.ws)
     testImplementation(libs.sonar.analyzer.commons)

its/plugin/src/test/java/org/sonarsource/slang/SonarLintTest.java

@@ -19,8 +19,8 @@
  */
 package org.sonarsource.slang;
 
-import com.sonar.orchestrator.Orchestrator;
-import com.sonar.orchestrator.OrchestratorBuilder;
+import com.sonar.orchestrator.junit4.OrchestratorRule;
+import com.sonar.orchestrator.junit4.OrchestratorRuleBuilder;
 import com.sonar.orchestrator.locator.Locators;
 import java.io.File;
 import java.io.IOException;
@@ -61,9 +61,9 @@ public class SonarLintTest {
   @BeforeClass
   public static void prepare() throws Exception {
     // Orchestrator is used only to retrieve plugin artifacts from filesystem or maven
-    OrchestratorBuilder orchestratorBuilder = Orchestrator.builderEnv();
+    OrchestratorRuleBuilder orchestratorBuilder = OrchestratorRule.builderEnv();
     Tests.addLanguagePlugins(orchestratorBuilder);
-    Orchestrator orchestrator = orchestratorBuilder
+    OrchestratorRule orchestrator = orchestratorBuilder
       .useDefaultAdminCredentialsForBuilds(true)
       .setSonarVersion(System.getProperty(Tests.SQ_VERSION_PROPERTY, Tests.DEFAULT_SQ_VERSION))
       .build();

its/plugin/src/test/java/org/sonarsource/slang/SurefireTest.java

@@ -19,8 +19,8 @@
  */
 package org.sonarsource.slang;
 
-import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.MavenBuild;
+import com.sonar.orchestrator.junit4.OrchestratorRule;
 import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -36,7 +36,7 @@
 public class SurefireTest extends TestBase {
 
   @ClassRule
-  public static final Orchestrator ORCHESTRATOR = Tests.ORCHESTRATOR;
+  public static final OrchestratorRule ORCHESTRATOR = Tests.ORCHESTRATOR;
   private static final Path BASE_DIRECTORY = Paths.get("projects");
 
 

its/plugin/src/test/java/org/sonarsource/slang/TestBase.java

@@ -19,8 +19,8 @@
  */
 package org.sonarsource.slang;
 
-import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
+import com.sonar.orchestrator.junit4.OrchestratorRule;
 import java.io.File;
 import java.util.Arrays;
 import java.util.Collections;
@@ -44,7 +44,7 @@
 public abstract class TestBase {
 
   @ClassRule
-  public static final Orchestrator ORCHESTRATOR = Tests.ORCHESTRATOR;
+  public static final OrchestratorRule ORCHESTRATOR = Tests.ORCHESTRATOR;
 
   protected SonarScanner getSonarScanner(String projectKey, String directoryToScan, String languageKey) {
     return getSonarScanner(projectKey, directoryToScan, languageKey, null);

its/plugin/src/test/java/org/sonarsource/slang/Tests.java

@@ -19,8 +19,9 @@
  */
 package org.sonarsource.slang;
 
-import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.OrchestratorBuilder;
+import com.sonar.orchestrator.junit4.OrchestratorRule;
+import com.sonar.orchestrator.junit4.OrchestratorRuleBuilder;
 import com.sonar.orchestrator.locator.FileLocation;
 import com.sonar.orchestrator.locator.Location;
 import com.sonar.orchestrator.locator.MavenLocation;
@@ -48,10 +49,10 @@ public class Tests {
   private static final Set<String> LANGUAGES = new HashSet<>(Collections.singletonList("kotlin"));
 
   @ClassRule
-  public static final Orchestrator ORCHESTRATOR;
+  public static final OrchestratorRule ORCHESTRATOR;
 
   static {
-    OrchestratorBuilder orchestratorBuilder = Orchestrator.builderEnv();
+    OrchestratorRuleBuilder orchestratorBuilder = OrchestratorRule.builderEnv();
     addLanguagePlugins(orchestratorBuilder);
     ORCHESTRATOR = orchestratorBuilder
       .useDefaultAdminCredentialsForBuilds(true)

its/ruling/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    testImplementation(testLibs.sonar.orchestrator)
+    testImplementation(testLibs.sonar.orchestrator.junit4)
     testImplementation(testLibs.assertj.core)
     testImplementation(libs.sonar.analyzer.commons)
 }

its/ruling/src/test/java/org/sonarsource/slang/SlangRulingTest.java

@@ -19,11 +19,12 @@
  */
 package org.sonarsource.slang;
 
-import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.OrchestratorBuilder;
 import com.sonar.orchestrator.build.Build;
 import com.sonar.orchestrator.build.GradleBuild;
 import com.sonar.orchestrator.build.SonarScanner;
+import com.sonar.orchestrator.junit4.OrchestratorRule;
+import com.sonar.orchestrator.junit4.OrchestratorRuleBuilder;
 import com.sonar.orchestrator.locator.FileLocation;
 import com.sonar.orchestrator.locator.Location;
 import com.sonar.orchestrator.locator.MavenLocation;
@@ -56,15 +57,15 @@ public class SlangRulingTest {
   private static final String SQ_VERSION_PROPERTY = "sonar.runtimeVersion";
   private static final String DEFAULT_SQ_VERSION = "LATEST_RELEASE";
 
-  private static Orchestrator orchestrator;
+  private static OrchestratorRule orchestrator;
   private static boolean keepSonarqubeRunning = "true".equals(System.getProperty("keepSonarqubeRunning"));
   private static final boolean IGNORE_EXPECTED_ISSUES_AND_REPORT_ALL = "true".equals(System.getProperty("reportAll"));
   private static final boolean CLEAN_PROJECT_BINARIES = "true".equals(System.getProperty("cleanProjects"));
   private static final Set<String> LANGUAGES = new HashSet<>(Collections.singletonList("kotlin"));
 
   @BeforeClass
   public static void setUp() {
-    OrchestratorBuilder builder = Orchestrator.builderEnv()
+    OrchestratorRuleBuilder builder = OrchestratorRule.builderEnv()
       .useDefaultAdminCredentialsForBuilds(true)
       .setSonarVersion(System.getProperty(SQ_VERSION_PROPERTY, DEFAULT_SQ_VERSION))
       .addPlugin(MavenLocation.of("org.sonarsource.sonar-lits-plugin", "sonar-lits-plugin", "0.11.0.2659"));