Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update gradle wrapper to 7.4 #81963

Merged
merged 7 commits into from
Feb 14, 2022
Merged

Update gradle wrapper to 7.4 #81963

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a947f76
Update to custom gradle 7.4 snapshot
breskeby Dec 20, 2021
9d5d78d
Revert "Update to custom gradle 7.4 snapshot"
breskeby Dec 21, 2021
80f088a
Tweak abi change in gradle benchmark scenarios
breskeby Dec 21, 2021
2cddb69
Update to 7.4-rc-1
breskeby Jan 18, 2022
0597b08
Make ForbiddenApisPrecommitPlugin plugin Gradle 8.0 compatible
breskeby Dec 21, 2021
0e0e876
Fix deprecations on ignoring empty folders for task inputs
breskeby Jan 18, 2022
442e574
Update Gradle wrapper to 7.4 GA
breskeby Feb 8, 2022
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
Prev Previous commit
Next Next commit
Revert "Update to custom gradle 7.4 snapshot" 
This reverts commit f6a6dfa92ed77c9ca890c4cae3c8b4894a009115.
  • Loading branch information
@breskeby
breskeby committed Feb 8, 2022
commit 9d5d78db8f2a3757a9d6c0b6fd0ec66bcb16c74d
11 changes: 9 additions & 2 deletions ...main/java/org/elasticsearch/gradle/internal/conventions/precommit/LicenseHeadersTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,15 @@
import org.gradle.api.GradleException;
import org.gradle.api.file.FileCollection;
import org.gradle.api.provider.ListProperty;
import org.gradle.api.tasks.*;
import org.gradle.api.tasks.CacheableTask;
import org.gradle.api.tasks.Input;
import org.gradle.api.tasks.InputFiles;
import org.gradle.api.tasks.Internal;
import org.gradle.api.tasks.OutputFile;
import org.gradle.api.tasks.PathSensitive;
import org.gradle.api.tasks.PathSensitivity;
import org.gradle.api.tasks.SkipWhenEmpty;
import org.gradle.api.tasks.TaskAction;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
Expand Down Expand Up @@ -62,7 +70,6 @@ public LicenseHeadersTask() {
@InputFiles
@SkipWhenEmpty
@PathSensitive(PathSensitivity.RELATIVE)
@IgnoreEmptyDirectories
public List<FileCollection> getJavaFiles() {
return getSourceFolders().get();
}
Expand Down
2 changes: 0 additions & 2 deletions ...ternal/src/main/java/org/elasticsearch/gradle/internal/precommit/FilePermissionsTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import org.gradle.api.file.FileTree;
import org.gradle.api.file.ProjectLayout;
import org.gradle.api.provider.ListProperty;
import org.gradle.api.tasks.IgnoreEmptyDirectories;
import org.gradle.api.tasks.InputFiles;
import org.gradle.api.tasks.Internal;
import org.gradle.api.tasks.OutputFile;
Expand Down Expand Up @@ -77,7 +76,6 @@ private static boolean isExecutableFile(File file) {
*/
@InputFiles
@SkipWhenEmpty
@IgnoreEmptyDirectories
public FileCollection getFiles() {
return getSources().get()
.stream()
Expand Down
11 changes: 9 additions & 2 deletions ...rnal/src/main/java/org/elasticsearch/gradle/internal/precommit/ForbiddenPatternsTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,15 @@
import org.gradle.api.provider.ListProperty;
import org.gradle.api.provider.Property;
import org.gradle.api.provider.Provider;
import org.gradle.api.tasks.*;
import org.gradle.api.tasks.Input;
import org.gradle.api.tasks.InputFiles;
import org.gradle.api.tasks.Internal;
import org.gradle.api.tasks.Optional;
import org.gradle.api.tasks.OutputFile;
import org.gradle.api.tasks.PathSensitive;
import org.gradle.api.tasks.PathSensitivity;
import org.gradle.api.tasks.SkipWhenEmpty;
import org.gradle.api.tasks.TaskAction;
import org.gradle.api.tasks.util.PatternFilterable;
import org.gradle.api.tasks.util.PatternSet;

Expand Down Expand Up @@ -84,7 +92,6 @@ public ForbiddenPatternsTask(ProjectLayout projectLayout) {
@InputFiles
@PathSensitive(PathSensitivity.RELATIVE)
@SkipWhenEmpty
@IgnoreEmptyDirectories
public FileCollection getFiles() {
return getSourceFolders().get()
.stream()
Expand Down
3 changes: 1 addition & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ org.gradle.jvmargs=-XX:+HeapDumpOnOutOfMemoryError -Xss2m --add-exports jdk.com
systemProp.org.gradle.dependency.duplicate.project.detection=false

# Enforce the build to fail on deprecated gradle api usage
# temporally disable build failing due to deprecations.
#systemProp.org.gradle.warning.mode=fail
systemProp.org.gradle.warning.mode=fail

# forcing to use TLS1.2 to avoid failure in vault
# see https://github.com/hashicorp/vault/issues/8750#issuecomment-631236121
Expand Down