Skip to content

Commit

Permalink
Fix groovy build and add minimal dependency updates within major vers…
Browse files Browse the repository at this point in the history
…ions (#871)
  • Loading branch information
karianna authored Jan 9, 2024
1 parent 4453b2c commit 477eeed
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
14 changes: 9 additions & 5 deletions pipelines/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
plugins {
id 'com.github.johnrengelman.shadow' version '6.0.0'
// TODO Latest version now at 8.1.1 (2nd Jan 2024) - will force update of base Gradle version
id 'com.github.johnrengelman.shadow' version '6.1.0'
}

// TODO Suspect this should change to adoptium
group 'adoptopenjdk'
version '1.0.0-SNAPSHOT'

apply plugin: 'groovy'

// Get compile errors if using 11
// TODO Get compile errors if using 11
sourceCompatibility = 1.8
targetCompatibility = 1.8

Expand Down Expand Up @@ -35,11 +37,13 @@ shadowJar {
}

dependencies {
// TODO This is the lib from 2017, probably need to use its replacement (2.432) from Nov 14 2023
compile group: 'org.jenkins-ci.main', name: 'jenkins-core', version: '2.85', ext: 'pom'
// TODO This is the lib from 2017, probably need to use its https://mvnrepository.com/artifact/org.jenkins-ci.plugins.workflow/workflow-step-api/650.v14346f713b_00
compile group: 'org.jenkins-ci.plugins.workflow', name: 'workflow-step-api', version: '2.22', ext: 'jar'
compile 'org.codehaus.groovy:groovy-all:3.0.4'
testCompile('org.junit.jupiter:junit-jupiter-api:5.4.1')
testRuntime('org.junit.jupiter:junit-jupiter-engine:5.4.1')
compile 'org.codehaus.groovy:groovy-all:3.0.20'
testCompile('org.junit.jupiter:junit-jupiter-api:5.10.1')
testRuntime('org.junit.jupiter:junit-jupiter-engine:5.10.1')
}

// Checkout Jenkins Helper so that it can be added to the classpath
Expand Down
2 changes: 1 addition & 1 deletion pipelines/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 477eeed

Please sign in to comment.