Skip to content

Commit 4815eff

Browse files
committed
Update Gradle to 7.4.1
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
1 parent f1d35d0 commit 4815eff

File tree

12 files changed

+19
-15
lines changed

12 files changed

+19
-15
lines changed

buildSrc/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ dependencies {
112112
api 'commons-io:commons-io:2.7'
113113
api "net.java.dev.jna:jna:5.10.0"
114114
api 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2'
115-
api 'de.thetaphi:forbiddenapis:3.2'
115+
api 'de.thetaphi:forbiddenapis:3.3'
116116
api 'com.avast.gradle:gradle-docker-compose-plugin:0.14.12'
117117
api 'org.apache.maven:maven-model:3.6.2'
118118
api 'com.networknt:json-schema-validator:1.0.67'

buildSrc/src/main/groovy/org/opensearch/gradle/precommit/LicenseHeadersTask.groovy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import org.opensearch.gradle.AntTask
3535
import org.gradle.api.file.FileCollection
3636
import org.gradle.api.tasks.Input
3737
import org.gradle.api.tasks.InputFiles
38+
import org.gradle.api.tasks.IgnoreEmptyDirectories;
3839
import org.gradle.api.tasks.OutputFile
3940
import org.gradle.api.tasks.SkipWhenEmpty
4041

@@ -78,6 +79,7 @@ class LicenseHeadersTask extends AntTask {
7879
*/
7980
@InputFiles
8081
@SkipWhenEmpty
82+
@IgnoreEmptyDirectories
8183
List<FileCollection> getJavaFiles() {
8284
return project.sourceSets.collect({it.allJava})
8385
}

buildSrc/src/main/java/org/opensearch/gradle/precommit/FilePermissionsTask.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import org.gradle.api.GradleException;
4747
import org.gradle.api.file.FileCollection;
4848
import org.gradle.api.file.FileTree;
49+
import org.gradle.api.tasks.IgnoreEmptyDirectories;
4950
import org.gradle.api.tasks.InputFiles;
5051
import org.gradle.api.tasks.OutputFile;
5152
import org.gradle.api.tasks.SkipWhenEmpty;
@@ -92,6 +93,7 @@ private static boolean isExecutableFile(File file) {
9293
*/
9394
@InputFiles
9495
@SkipWhenEmpty
96+
@IgnoreEmptyDirectories
9597
public FileCollection getFiles() {
9698
return GradleUtils.getJavaSourceSets(getProject())
9799
.stream()

buildSrc/src/main/java/org/opensearch/gradle/precommit/ForbiddenPatternsTask.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.gradle.api.file.FileCollection;
3838
import org.gradle.api.file.FileTree;
3939
import org.gradle.api.plugins.JavaPluginConvention;
40+
import org.gradle.api.tasks.IgnoreEmptyDirectories;
4041
import org.gradle.api.tasks.Input;
4142
import org.gradle.api.tasks.InputFiles;
4243
import org.gradle.api.tasks.OutputFile;
@@ -100,6 +101,7 @@ public ForbiddenPatternsTask() {
100101

101102
@InputFiles
102103
@SkipWhenEmpty
104+
@IgnoreEmptyDirectories
103105
public FileCollection getFiles() {
104106
return getProject().getConvention()
105107
.getPlugin(JavaPluginConvention.class)

buildSrc/src/main/java/org/opensearch/gradle/precommit/LoggerUsageTask.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.gradle.api.plugins.JavaPluginConvention;
3838
import org.gradle.api.tasks.CacheableTask;
3939
import org.gradle.api.tasks.Classpath;
40+
import org.gradle.api.tasks.IgnoreEmptyDirectories;
4041
import org.gradle.api.tasks.InputFiles;
4142
import org.gradle.api.tasks.PathSensitive;
4243
import org.gradle.api.tasks.PathSensitivity;
@@ -79,6 +80,7 @@ public void setClasspath(FileCollection classpath) {
7980
@InputFiles
8081
@PathSensitive(PathSensitivity.RELATIVE)
8182
@SkipWhenEmpty
83+
@IgnoreEmptyDirectories
8284
public FileCollection getClassDirectories() {
8385
return getProject().getConvention()
8486
.getPlugin(JavaPluginConvention.class)

buildSrc/src/main/java/org/opensearch/gradle/precommit/ThirdPartyAuditTask.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import org.gradle.api.tasks.CacheableTask;
4848
import org.gradle.api.tasks.Classpath;
4949
import org.gradle.api.tasks.CompileClasspath;
50+
import org.gradle.api.tasks.IgnoreEmptyDirectories;
5051
import org.gradle.api.tasks.Input;
5152
import org.gradle.api.tasks.InputFile;
5253
import org.gradle.api.tasks.InputFiles;
@@ -195,6 +196,7 @@ public Set<String> getMissingClassExcludes() {
195196

196197
@Classpath
197198
@SkipWhenEmpty
199+
@IgnoreEmptyDirectories
198200
public Set<File> getJarsToScan() {
199201
// These are SelfResolvingDependency, and some of them backed by file collections, like the Gradle API files,
200202
// or dependencies added as `files(...)`, we can't be sure if those are third party or not.

buildSrc/src/main/java/org/opensearch/gradle/test/rest/CopyRestApiTask.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import org.gradle.api.file.FileTree;
4444
import org.gradle.api.plugins.JavaPluginConvention;
4545
import org.gradle.api.provider.ListProperty;
46+
import org.gradle.api.tasks.IgnoreEmptyDirectories;
4647
import org.gradle.api.tasks.Input;
4748
import org.gradle.api.tasks.InputFiles;
4849
import org.gradle.api.tasks.OutputDirectory;
@@ -112,6 +113,7 @@ public boolean isSkipHasRestTestCheck() {
112113
return skipHasRestTestCheck;
113114
}
114115

116+
@IgnoreEmptyDirectories
115117
@SkipWhenEmpty
116118
@InputFiles
117119
public FileTree getInputDir() {

buildSrc/src/main/java/org/opensearch/gradle/test/rest/CopyRestTestsTask.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import org.gradle.api.file.FileTree;
4444
import org.gradle.api.plugins.JavaPluginConvention;
4545
import org.gradle.api.provider.ListProperty;
46+
import org.gradle.api.tasks.IgnoreEmptyDirectories;
4647
import org.gradle.api.tasks.Input;
4748
import org.gradle.api.tasks.InputFiles;
4849
import org.gradle.api.tasks.OutputDirectory;
@@ -104,6 +105,7 @@ String getSourceSetName() {
104105
return sourceSetName;
105106
}
106107

108+
@IgnoreEmptyDirectories
107109
@SkipWhenEmpty
108110
@InputFiles
109111
public FileTree getInputDir() {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.6.1
1+
7.4.1

gradle/missing-javadoc.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ configure([
178178
class MissingJavadocTask extends DefaultTask {
179179
@InputFiles
180180
@SkipWhenEmpty
181+
@IgnoreEmptyDirectories
181182
SourceDirectorySet srcDirSet;
182183

183184
@OutputDirectory

0 commit comments

Comments
 (0)