Skip to content

Commit

Permalink
Merge pull request #30 from rundeck-plugins/upgrade-gradle-7
Browse files Browse the repository at this point in the history
upgrade grails 7
  • Loading branch information
ltamaster authored Jul 25, 2022
2 parents 224f3d7 + 53597f4 commit 7fdc279
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 19 deletions.
27 changes: 9 additions & 18 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'pl.allegro.tech.build.axion-release' version '1.10.2'
id 'pl.allegro.tech.build.axion-release' version '1.13.14'
}

group 'com.rundeck'
Expand All @@ -19,15 +19,6 @@ scmVersion {
tag {
prefix = ''
versionSeparator = ''
def origDeserialize=deserialize
//apend .0 to satisfy semver if the tag version is only X.Y
deserialize = { config, position, tagName ->
def orig = origDeserialize(config, position, tagName)
if (orig.split('\\.').length < 3) {
orig += ".0"
}
orig
}
}
}
project.version = scmVersion.version
Expand All @@ -42,15 +33,15 @@ repositories {
configurations {
pluginLibs

compile {
implementation {
extendsFrom pluginLibs
}
}

dependencies {
compile 'org.codehaus.groovy:groovy-all:2.3.11'
testCompile group: 'junit', name: 'junit', version: '4.12'
compile group: 'org.rundeck', name: 'rundeck-core', version: '3.3.+'
implementation 'org.codehaus.groovy:groovy-all:2.3.11'
testImplementation group: 'junit', name: 'junit', version: '4.12'
implementation group: 'org.rundeck', name: 'rundeck-core', version: '3.3.+'
pluginLibs (group: 'com.microsoft.azure', name: 'azure', version: '1.3.0'){
exclude group: "com.fasterxml.jackson.core"
}
Expand All @@ -64,10 +55,10 @@ dependencies {
pluginLibs group: 'com.microsoft.azure', name: 'azure-keyvault-core', version: '1.0.0'


testCompile "org.codehaus.groovy:groovy-all:2.3.7"
testCompile "org.spockframework:spock-core:0.7-groovy-2.0"
testCompile "cglib:cglib-nodep:2.2.2"
testCompile 'org.objenesis:objenesis:1.4'
testImplementation "org.codehaus.groovy:groovy-all:2.3.7"
testImplementation "org.spockframework:spock-core:0.7-groovy-2.0"
testImplementation "cglib:cglib-nodep:2.2.2"
testImplementation 'org.objenesis:objenesis:1.4'

constraints {
pluginLibs("com.squareup.retrofit2:adapter-rxjava:2.6.1") {
Expand Down
2 changes: 1 addition & 1 deletion 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-5.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 7fdc279

Please sign in to comment.