Skip to content

Commit 0bbae69

Browse files
SONARRUBY-97 Bump Slang version (#81)
1 parent 6bb90af commit 0bbae69

File tree

7 files changed

+11
-9
lines changed

7 files changed

+11
-9
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ subprojects {
6666

6767
apply plugin: 'com.diffplug.spotless'
6868

69-
java.sourceCompatibility = JavaVersion.VERSION_11
69+
java.sourceCompatibility = JavaVersion.VERSION_17
7070
tasks.withType(JavaCompile) {
7171
options.encoding = "UTF-8"
7272
options.release = java.sourceCompatibility.majorVersion as int

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import java.io.File;
2626
import java.util.List;
2727
import java.util.stream.Collectors;
28-
import org.apache.commons.lang.StringUtils;
28+
import org.apache.commons.lang3.StringUtils;
2929
import org.junit.ClassRule;
3030
import org.junit.Test;
3131
import org.sonarqube.ws.client.HttpConnector;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public static void prepare() throws Exception {
7474
.setSonarVersion(System.getProperty(Tests.SQ_VERSION_PROPERTY, Tests.DEFAULT_SQ_VERSION))
7575
.build();
7676

77-
Locators locators = orchestrator.getConfiguration().locators();
77+
Locators locators = orchestrator.getOrchestrator().getLocators();
7878
StandaloneGlobalConfiguration.Builder sonarLintConfigBuilder = StandaloneGlobalConfiguration.builder();
7979
orchestrator.getDistribution().getPluginLocations().stream()
8080
.filter(location -> !location.toString().contains("sonar-reset-data-plugin"))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import com.sonar.orchestrator.locator.Location;
2424
import com.sonar.orchestrator.locator.MavenLocation;
2525
import java.io.File;
26-
import org.apache.commons.lang.StringUtils;
26+
import org.apache.commons.lang3.StringUtils;
2727
import org.junit.ClassRule;
2828
import org.junit.runner.RunWith;
2929
import org.junit.runners.Suite;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import java.util.Map;
3333
import java.util.Scanner;
3434

35-
import org.apache.commons.lang.StringUtils;
35+
import org.apache.commons.lang3.StringUtils;
3636
import org.junit.AfterClass;
3737
import org.junit.BeforeClass;
3838
import org.junit.Ignore;

settings.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ buildCache {
2626
}
2727

2828
dependencyResolutionManagement {
29-
def slangDependenciesVersion = '1.19.0.6612'
29+
def slangDependenciesVersion = '1.20.0.7866'
3030
def analyzerCommonsVersion = '2.20.0.4607'
3131
def pluginApiVersion = '12.0.0.2960'
3232
def sonarqubeVersion = '10.0.0.68432'
33-
def orchestratorVersion = '5.6.2.2625'
34-
def sonarlintVersion = '9.0.0.74282'
33+
def orchestratorVersion = '6.0.1.3892'
34+
def sonarlintVersion = '9.8.0.76914'
3535
// slf4j is provided by SQ, SC or SL, should be aligned with sonar-plugin-api
3636
def slf4jApiVersion = '1.7.30'
3737

@@ -58,6 +58,7 @@ dependencyResolutionManagement {
5858
library("assertj-core", "org.assertj", "assertj-core").version("3.26.3")
5959
library("junit-jupiter-api", "org.junit.jupiter", "junit-jupiter-api").version("5.11.0")
6060
library("junit-jupiter-engine", "org.junit.jupiter", "junit-jupiter-engine").version("5.11.0")
61+
library("junit-platform-launcher", "org.junit.platform", "junit-platform-launcher").version("6.0.1")
6162
}
6263
}
6364
}

sonar-ruby-plugin/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ dependencies {
6666
testImplementation testLibs.sonar.plugin.api.test.fixtures
6767

6868
testRuntimeOnly testLibs.junit.jupiter.engine
69+
testRuntimeOnly testLibs.junit.platform.launcher
6970
}
7071

7172
tasks.register("downloadFromRubygems", Task) {
@@ -167,7 +168,7 @@ jar {
167168
'Sonar-Version': '6.7',
168169
'SonarLint-Supported': 'true',
169170
'Version': "${project.version}",
170-
'Jre-Min-Version': '11',
171+
'Jre-Min-Version': '17',
171172
)
172173
}
173174
}

0 commit comments

Comments
 (0)