Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ subprojects {
}

def publishBuild = Boolean.parseBoolean(findProperty('publishBuild') ?: 'false')
def autoServiceVersion = publishBuild ? libs.versions.autoService.asProvider().get() : libs.versions.autoService.development.get()
def autoServiceVersion = publishBuild ? rootProject.libs.versions.autoService.asProvider().get() : rootProject.libs.versions.autoService.development.get()

project.configurations.all {
resolutionStrategy.eachDependency {details ->
Expand Down
3 changes: 1 addition & 2 deletions gradle/check.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def classLoader = plugins['com.github.spotbugs'].class.classLoader
def SpotBugsEffort = classLoader.findLoadedClass('com.github.spotbugs.snom.Effort')
def SpotBugsTaskClass = classLoader.findLoadedClass('com.github.spotbugs.snom.SpotBugsTask')
spotbugs {
toolVersion = libs.versions.spotbugs.get()
toolVersion = rootProject.libs.versions.spotbugs.get()

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be referenced explicitly by rootProject to avoid a new deprecation warning (will become an error in Gradle 10). The exact situations where this must be done is very situational, and I've only made the changes where it's necessary by the build. This is in the subprojects lambda of the main build.gradle file and in the files imported from that spot. It's not necessary in the bulk of cases (i.e., within a subproject file's list of dependencies)

ignoreFailures = false
effort = SpotBugsEffort.MAX
excludeFilter = rootProject.file('gradle/codequality/spotbugs_exclude.xml')
Expand Down Expand Up @@ -119,7 +119,6 @@ apply plugin: 'pmd'
pmd {
consoleOutput = true
ignoreFailures = false
targetJdk = '1.7'

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is no longer necessary. PMD now figures this out from the JDK configuration. This has been deprecated with no replacement

sourceSets = [sourceSets.main]
toolVersion = '6.44.0'
// an annoying hack to get around Gradle defaults
Expand Down
4 changes: 2 additions & 2 deletions gradle/testing.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import org.gradle.api.tasks.testing.TestListener
apply plugin: 'jacoco'
// configure for test, other *Test are configured below
jacoco {
toolVersion = libs.versions.jacoco.get()
toolVersion = rootProject.libs.versions.jacoco.get()
}

// Resolved to the mockito-core jar so it can be installed as a -javaagent on every Test JVM.
Expand All @@ -40,7 +40,7 @@ configurations {
mockitoAgent
}
dependencies {
mockitoAgent(libs.mockito) { transitive = false }
mockitoAgent(rootProject.libs.mockito) { transitive = false }
}

// if you add to or modify these testing configurations, make sure to update the CONTRIBUTING.md to include any updates
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading