diff --git a/build-logic/code-quality/build.gradle.kts b/build-logic/code-quality/build.gradle.kts index 3955765d29..a83857d4ef 100644 --- a/build-logic/code-quality/build.gradle.kts +++ b/build-logic/code-quality/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + plugins { `kotlin-dsl` } @@ -10,3 +12,9 @@ dependencies { implementation("org.sonarqube:org.sonarqube.gradle.plugin:2.8") implementation("com.github.autostyle:autostyle-plugin-gradle:3.1") } + +tasks.withType().configureEach { + kotlinOptions { + jvmTarget = "11" + } +} diff --git a/build-logic/jvm/build.gradle.kts b/build-logic/jvm/build.gradle.kts index 5323a4eff8..02f13c982f 100644 --- a/build-logic/jvm/build.gradle.kts +++ b/build-logic/jvm/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + plugins { `kotlin-dsl` } @@ -10,5 +12,11 @@ dependencies { implementation(project(":basics")) implementation(project(":code-quality")) implementation("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.74") - implementation("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.5.10") + implementation("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.6.20") +} + +tasks.withType().configureEach { + kotlinOptions { + jvmTarget = "11" + } } diff --git a/build-logic/jvm/src/main/kotlin/testng.kotlin-library.gradle.kts b/build-logic/jvm/src/main/kotlin/testng.kotlin-library.gradle.kts index 00618ea820..a36651b18e 100644 --- a/build-logic/jvm/src/main/kotlin/testng.kotlin-library.gradle.kts +++ b/build-logic/jvm/src/main/kotlin/testng.kotlin-library.gradle.kts @@ -6,7 +6,7 @@ plugins { } dependencies { - testImplementation(platform("org.jetbrains.kotlin:kotlin-bom:1.6.10")) + testImplementation(platform("org.jetbrains.kotlin:kotlin-bom:1.6.20")) testImplementation("org.jetbrains.kotlin:kotlin-stdlib") } diff --git a/build-logic/publishing/build.gradle.kts b/build-logic/publishing/build.gradle.kts index 5bc085bdfa..5c63433b22 100644 --- a/build-logic/publishing/build.gradle.kts +++ b/build-logic/publishing/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + plugins { `kotlin-dsl` } @@ -12,3 +14,9 @@ dependencies { implementation("com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:7.0.0") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin") } + +tasks.withType().configureEach { + kotlinOptions { + jvmTarget = "11" + } +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 07beaad67f..87f88894ad 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,4 @@ distributionBase=GRADLE_USER_HOME -distributionSha256Sum=b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302 -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/testng-core/src/main/java/org/testng/reporters/jq/Main.java b/testng-core/src/main/java/org/testng/reporters/jq/Main.java index 9d001c2f74..7af3b0f54a 100644 --- a/testng-core/src/main/java/org/testng/reporters/jq/Main.java +++ b/testng-core/src/main/java/org/testng/reporters/jq/Main.java @@ -20,7 +20,7 @@ public class Main implements IReporter { private static final String TESTNG_RESOURCE_PREFIX = "/org/testng/"; private static final String[] RESOURCES = new String[] { - "jquery.min.js", + "jquery-3.6.0.min.js", "testng-reports.css", "testng-reports.js", "testng-reports1.css", @@ -103,11 +103,7 @@ public void generateReport( private InputStream load(String fileName) { String path; - if (fileName.equals("jquery.min.js")) { - path = "/META-INF/resources/webjars/jquery/3.5.1/jquery.min.js"; - } else { - path = Main.TESTNG_RESOURCE_PREFIX + fileName; - } + path = Main.TESTNG_RESOURCE_PREFIX + fileName; return getClass().getResourceAsStream(path); } } diff --git a/testng-core/src/main/resources/org/testng/header b/testng-core/src/main/resources/org/testng/header index f5abbc3e82..d1573f93e8 100644 --- a/testng-core/src/main/resources/org/testng/header +++ b/testng-core/src/main/resources/org/testng/header @@ -7,7 +7,7 @@ - +