Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport 2.x] Fix build failures #1316

Merged
merged 1 commit into from
Feb 2, 2024
Merged

[Backport 2.x] Fix build failures #1316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ buildscript {
}

plugins {
id 'nebula.ospackage' version "8.3.0"
id 'com.netflix.nebula.ospackage' version "11.6.0"
id "com.dorongold.task-tree" version "1.5"
id "jacoco"
}
Expand Down Expand Up @@ -162,15 +162,14 @@ repositories {

compileKotlin {
kotlinOptions {
// This should be 11, but the OpenSearch logger usage checker tool doesn't like classes > 1.8
jvmTarget = "1.8"
jvmTarget = "11"
freeCompilerArgs = ['-Xjsr305=strict'] // Handle OpenSearch @Nullable annotation correctly
}
}

compileTestKotlin {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
freeCompilerArgs = ['-Xjsr305=strict']
}
}
Expand Down Expand Up @@ -536,7 +535,7 @@ jacocoTestReport {
dependsOn test
dependsOn integTest
reports {
xml.enabled true
xml.required.set(true)
}
// We're combining the coverage data for both test and integ tests.
getExecutionData().setFrom(fileTree(buildDir).include("/jacoco/*.exec"))
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading