Skip to content

Commit

Permalink
Update gradle and dependencies
Browse files Browse the repository at this point in the history
Signed-off-by: Matthew DeVenny <matt@boxboat.com>
  • Loading branch information
matthewdevenny committed Aug 7, 2024
1 parent d68f4bc commit f103c83
Show file tree
Hide file tree
Showing 6 changed files with 212 additions and 151 deletions.
15 changes: 7 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
apply plugin: 'groovy'
plugins{
id 'groovy'
}

repositories {
jcenter()
mavenCentral()
maven {
url 'https://repo.jenkins-ci.org/public/'
}
}

dependencies {
// main dependencies
implementation group: 'com.cloudbees', name: 'groovy-cps', version: '3785.vee73da_b_9544e'
implementation group: 'org.jenkins-ci.main', name: 'jenkins-core', version: '2.414.1'
// jenkins-core has a transitive dependency on guava 32.1.1-jre, but that version won't load for gradle
// when jenkins-core is upgraded past 2.414.1 this dependency should be re-evaluated and hopefully removed
implementation group: 'com.google.guava', name: 'guava', version: '32.1.2-jre'
implementation group: 'com.cloudbees', name: 'groovy-cps', version: '3903.v48a_8836749e9'
implementation group: 'org.jenkins-ci.main', name: 'jenkins-core', version: '2.452.2'
implementation group: 'io.jenkins.plugins', name: 'snakeyaml-api', version: '2.2-111.vc6598e30cc65'
compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1'

Expand All @@ -22,7 +21,7 @@ dependencies {

// test dependencies
testImplementation group: 'junit', name: 'junit', version: '4.13.2'
testImplementation group: 'com.lesfurets', name: 'jenkins-pipeline-unit', version: '1.19'
testImplementation group: 'com.lesfurets', name: 'jenkins-pipeline-unit', version: '1.20'
}

task cleanDist(type: Delete) {
Expand Down
2 changes: 1 addition & 1 deletion gradle-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ docker run --rm -i \
-v "$(pwd):/home/gradle/project" \
-w "/home/gradle/project" \
--entrypoint gradle \
gradle:8.3.0-jdk17 \
gradle:8.9.0-jdk17 \
"$@"
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit f103c83

Please sign in to comment.