Fix build failures (opensearch-project#1315) (opensearch-project#1316)

* Fix build failures Signed-off-by: monusingh-1 <[email protected]> * Enable xml report Signed-off-by: monusingh-1 <[email protected]> --------- Signed-off-by: monusingh-1 <[email protected]> (cherry picked from commit 043a788) Co-authored-by: Monu Singh <[email protected]>
mohitamg · Feb 2, 2024 · 7e2902c · 7e2902c
1 parent 86d3f67
commit 7e2902c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -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"
 }
@@ -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']
     }
 }
@@ -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"))

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -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