From c1b08b4686b1c1c208a9e2f169c3fb50f3c05e76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Fri, 14 Jan 2022 12:52:56 +0100
Subject: [PATCH] Upgrade Gradle including plugins
Upgrade Gradle to 7.3.3
Upgrade Shadow to 7.1.2
Upgrade Spotbugs to 4.5.3 (Gradle Plugin 5.0.4)
---
theodolite-benchmarks/buildSrc/build.gradle | 15 ++-------------
.../groovy/theodolite.java-conventions.gradle | 2 +-
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
3 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/theodolite-benchmarks/buildSrc/build.gradle b/theodolite-benchmarks/buildSrc/build.gradle
index 4c099de32..e3c3a8cb4 100644
--- a/theodolite-benchmarks/buildSrc/build.gradle
+++ b/theodolite-benchmarks/buildSrc/build.gradle
@@ -1,14 +1,3 @@
-buildscript {
- repositories {
- maven {
- url "https://plugins.gradle.org/m2/"
- }
- }
- dependencies {
- classpath "com.github.jengelman.gradle.plugins:shadow:6.0.0"
- }
-}
-
// to discover the precompiled script plugins
plugins {
id 'groovy-gradle-plugin'
@@ -19,6 +8,6 @@ repositories {
}
dependencies {
- implementation 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.6.0'
- implementation 'com.github.jengelman.gradle.plugins:shadow:6.0.0'
+ implementation 'com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.4'
+ implementation 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2'
}
diff --git a/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.java-conventions.gradle b/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.java-conventions.gradle
index 5b0e2a8a1..a2912d962 100644
--- a/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.java-conventions.gradle
+++ b/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.java-conventions.gradle
@@ -66,5 +66,5 @@ spotbugs {
reportLevel = "low"
effort = "max"
ignoreFailures = false
- toolVersion = '4.1.4'
+ toolVersion = '4.5.3'
}
diff --git a/theodolite-benchmarks/gradle/wrapper/gradle-wrapper.properties b/theodolite-benchmarks/gradle/wrapper/gradle-wrapper.properties
index 442d9132e..2e6e5897b 100644
--- a/theodolite-benchmarks/gradle/wrapper/gradle-wrapper.properties
+++ b/theodolite-benchmarks/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
--
GitLab