honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 02:14:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[7.x] Allow different source sets from forbiddenApis (#54731) (#54983)

Browse Source 
ForbiddenApis task via the precommit task currently makes an assumption
that only the test and main source sets are present for any given project.
This commit removes that assumption and allows for any project source set's
compileClasspath class path to be added to the forbiddenApis classpath
configuration.
This commit is contained in:
Jake Landis 2020-04-08 16:31:04 -05:00 committed by GitHub
parent c6cd8ca7c0
commit 2b970e2a8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/PrecommitTasks.groovy
View File

@ -18,7 +18,6 @@
*/
package org.elasticsearch.gradle.precommit
import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis
import de.thetaphi.forbiddenapis.gradle.ForbiddenApisPlugin
import org.elasticsearch.gradle.ExportElasticsearchBuildResourcesTask
@ -31,6 +30,7 @@ import org.gradle.api.artifacts.Configuration
import org.gradle.api.file.FileCollection
import org.gradle.api.plugins.JavaBasePlugin
import org.gradle.api.plugins.quality.Checkstyle
import org.gradle.api.tasks.SourceSet
import org.gradle.api.tasks.TaskProvider
/**
@ -144,18 +144,21 @@ class PrecommitTasks {
project.tasks.withType(CheckForbiddenApis).configureEach {
dependsOn(buildResources)
// use the runtime classpath if we have it, but some qa projects don't have one...
if (name.endsWith('Test')) {
FileCollection runtime = project.sourceSets.test.runtimeClasspath
if (runtime != null) {
classpath = runtime.plus(project.sourceSets.test.compileClasspath)
}
assert name.startsWith(ForbiddenApisPlugin.FORBIDDEN_APIS_TASK_NAME)
String sourceSetName
if (ForbiddenApisPlugin.FORBIDDEN_APIS_TASK_NAME.equals(name)) {
sourceSetName = "main"
} else {
FileCollection runtime = project.sourceSets.main.runtimeClasspath
if (runtime != null) {
classpath = runtime.plus(project.sourceSets.main.compileClasspath)
}
//parse out the sourceSetName
char[] chars = name.substring(ForbiddenApisPlugin.FORBIDDEN_APIS_TASK_NAME.length()).toCharArray()
chars[0] = Character.toLowerCase(chars[0])
sourceSetName = new String(chars)
}
SourceSet sourceSet = project.sourceSets.getByName(sourceSetName)
FileCollection runtime = sourceSet.runtimeClasspath
classpath = runtime.plus(sourceSet.compileClasspath)
targetCompatibility = BuildParams.runtimeJavaVersion.majorVersion
if (BuildParams.runtimeJavaVersion > JavaVersion.VERSION_13) {
project.logger.warn(