diff --git a/build.gradle b/build.gradle index 3774dbb9..e7dbd2c5 100644 --- a/build.gradle +++ b/build.gradle @@ -82,7 +82,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" } @@ -166,15 +166,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 index 68efe1de..8d687878 100644 --- 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