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

Support dependencySet of Spring Dependency management plugin #12

Merged
merged 2 commits into from
Nov 17, 2018
Merged

Support dependencySet of Spring Dependency management plugin #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bffa4ba
Support dependencySet of Spring dependency plugin
usr42 Nov 14, 2018
cdffdd7
Add tests and support non-variable version for dependencySet
usr42 Nov 16, 2018
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
8 changes: 8 additions & 0 deletions src/main/groovy/se/patrikerdes/DependencyUpdate.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ class DependencyUpdate {
"(group[ \\t]*:[ \\t]*[\"']" + this.group + "[\"'][ \\t]*,[ \\t]*name[ \\t]*:[ \\t]*[\"']" + this.name +
"[\"'][ \\t]*,[ \\t]*version[ \\t]*:[ \\t]*[\"']).*?([\"'])"
}
String oldModuleVersionDependencySetString() {
"(dependencySet\\s*\\(\\s*group\\s*:\\s*[\"']" + this.group +
"[\"']\\s*,\\s*version\\s*:\\s*[\"'])[^\\s\"']+?([\"'][\\s)]\\s*\\{[^}]*entry\\s*[\"']" + this.name + "[\"'])"
}
String oldPluginVersionMatchString() {
"(id[ \\t\\(]+[\"']" + this.group + "[\"'][ \\t\\)]+version[ \\t]+[\"'])" + this.oldVersion + "([\"'])"
}
Expand All @@ -41,6 +45,10 @@ class DependencyUpdate {
"group[ \\t]*:[ \\t]*[\"']" + this.group + "[\"'][ \\t]*,[ \\t]*name[ \\t]*:[ \\t]*[\"']" + this.name +
"[\"'][ \\t]*,[ \\t]*version[ \\t]*:[ \\t]*([^\\s\"']+?)[\\s)]"
}
String variableInDependencySetString() {
"dependencySet\\s*\\(\\s*group\\s*:\\s*[\"']" + this.group +
"[\"']\\s*,\\s*version\\s*:\\s*([^\\s\"']+?)[\\s)]\\s*\\{[^}]*entry\\s*[\"']" + this.name + "[\"']"
}
String toString() {
"${this.group}:${this.name} [${this.oldVersion} -> ${this.newVersion}]"
}
Expand Down
10 changes: 10 additions & 0 deletions src/main/groovy/se/patrikerdes/UseLatestVersionsTask.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ class UseLatestVersionsTask extends DefaultTask {
gradleFileContents[dotGradleFileName] =
gradleFileContents[dotGradleFileName].replaceAll(
update.oldModuleVersionMapFormatMatchString(), update.newVersionString())

// dependencySet notation
gradleFileContents[dotGradleFileName] =
gradleFileContents[dotGradleFileName].replaceAll(
update.oldModuleVersionDependencySetString(), update.newVersionString())
}
}
}
Expand Down Expand Up @@ -115,6 +120,11 @@ class UseLatestVersionsTask extends DefaultTask {
variableMatch = gradleFileContents[dotGradleFileName] =~
update.variableUseMapFormatMatchString()
getVariablesFromMatches(variableMatch, versionVariables, update, problemVariables)

// Variable in dependencySet format
variableMatch = gradleFileContents[dotGradleFileName] =~
update.variableInDependencySetString()
getVariablesFromMatches(variableMatch, versionVariables, update, problemVariables)
}
}

Expand Down
40 changes: 40 additions & 0 deletions src/test/groovy/se/patrikerdes/ModuleUpdatesFunctionalTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,4 +172,44 @@ class ModuleUpdatesFunctionalTest extends BaseFunctionalTest {
updatedBuildFile.contains('junit:junit:4.12')
updatedSecondFile.contains("log4j:log4j:$CurrentVersions.LOG4J")
}


void "spring gradle dependency management plugin annotation with variable"() {
given:
buildFile << """
plugins {
id 'se.patrikerdes.use-latest-versions'
id 'com.github.ben-manes.versions' version '$CurrentVersions.VERSIONS'
id "io.spring.dependency-management" version "1.0.6.RELEASE"
}

apply plugin: 'java'

repositories {
mavenCentral()
}

dependencyManagement {
dependencies {
dependency "junit:junit:4.0"
dependencySet(group: 'log4j', version: "1.2.16") {
entry 'log4j'
}
}
}

dependencies {
testCompile "junit:junit"
compile "log4j:log4j"
}
"""

when:
useLatestVersions()
String updatedBuildFile = buildFile.getText('UTF-8')

then:
updatedBuildFile.contains("dependency \"junit:junit:$CurrentVersions.JUNIT\"")
updatedBuildFile.contains("dependencySet(group: 'log4j', version: \"$CurrentVersions.LOG4J\")")
}
}
51 changes: 51 additions & 0 deletions src/test/groovy/se/patrikerdes/VariableUpdatesFunctionalTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,4 +366,55 @@ class VariableUpdatesFunctionalTest extends BaseFunctionalTest {
!updatedSecondFile.contains("junit_version = '$CurrentVersions.JUNIT'")
result.output.contains('A problem was detected')
}

void "spring gradle dependency management plugin annotation"() {
given:
buildFile << """
plugins {
id 'se.patrikerdes.use-latest-versions'
id 'com.github.ben-manes.versions' version '$CurrentVersions.VERSIONS'
id "io.spring.dependency-management" version "1.0.6.RELEASE"
}

apply plugin: 'java'

repositories {
mavenCentral()
}

def junit_version = '4.0'
def log4j_version = '1.2.16'

dependencyManagement {
dependencies {
dependency "junit:junit:\$junit_version"
dependencySet(group: 'log4j', version: log4j_version) {
entry 'log4j'
}
}
}

dependencies {
testCompile "junit:junit"
compile "log4j:log4j"
}
"""

when:
useLatestVersions()
String updatedBuildFile = buildFile.getText('UTF-8')

then:
updatedBuildFile.contains("def junit_version = '$CurrentVersions.JUNIT'")
updatedBuildFile.contains("def log4j_version = '$CurrentVersions.LOG4J'")
updatedBuildFile.contains("""
dependencyManagement {
dependencies {
dependency "junit:junit:\$junit_version"
dependencySet(group: 'log4j', version: log4j_version) {
entry 'log4j'
}
}
}""")
}
}