Skip to content

Commit

Permalink
Update to Gradle 8.5 (#72)
Browse files Browse the repository at this point in the history
Signed-off-by: Andriy Redko <[email protected]>
  • Loading branch information
reta authored Jan 30, 2024
1 parent 876721b commit 6be7e93
Show file tree
Hide file tree
Showing 110 changed files with 307 additions and 223 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ jobs:
issue-title: 'Release spring-data-opensearch ${{ steps.get_data.outputs.version }}'
issue-body: "Please approve or deny the release of spring-data-opensearch **TAG**: ${{ github.ref_name }} **COMMIT**: ${{ github.sha }} **VERSION** : ${{ steps.get_data.outputs.version }} "
exclude-workflow-initiator-as-approver: true
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
java-version: 17
java-version: 21
distribution: 'temurin'
cache: gradle
- name: Build with Gradle
Expand Down
4 changes: 2 additions & 2 deletions build-tools/coverage.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ jacocoTestReport {
getSourceDirectories().from(sourceSets.main.allSource)
getClassDirectories().from(sourceSets.main.output)
reports {
html.enabled = true // human readable
xml.enabled = true // for coverlay
html.required = true // human readable
xml.required = true // for coverlay
}
}

Expand Down
18 changes: 10 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,18 @@ plugins {
id 'application'
id 'java-library'
id 'maven-publish'
id 'com.diffplug.spotless' version '5.11.0'
id 'com.github.spotbugs' version '5.0.13'
id 'com.diffplug.spotless' version '6.25.0'
id 'com.github.spotbugs' version '6.0.7'
}

spotbugsMain {
excludeFilter = file("checkstyle/findbugs-exclude.xml")
effort = 'max'
effort = com.github.spotbugs.snom.Effort.MAX
ignoreFailures = true // TODO: Set this to false later as they are too many warnings to be fixed.

reports {
xml.enabled = false
html.enabled = true
xml.required = false
html.required = true
}
}

Expand All @@ -65,8 +65,10 @@ allprojects {
version = buildVersion
}

targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_11
java {
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_11
}

apply plugin: 'java'
apply plugin: 'jacoco'
Expand Down Expand Up @@ -149,7 +151,7 @@ distributions {
spotless {
java {
licenseHeaderFile(file('license-header'))
googleJavaFormat('1.12.0').aosp()
googleJavaFormat('1.19.2').aosp()
importOrder()
removeUnusedImports()
trimTrailingWhitespace()
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Tue Jan 28 11:59:31 PST 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
Expand Down
Loading

0 comments on commit 6be7e93

Please sign in to comment.