Skip to content

Commit 9372edf

Browse files
committed
Merge branch 'master' of https://github.com/scm4j/scm4j-vcs-git
# Conflicts: # build.gradle
2 parents ad84187 + c7ea71a commit 9372edf

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

build.gradle

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,12 @@ repositories {
3535

3636
dependencies {
3737
// load managed dependencies
38-
def s = '[ \t]*', w = '[^:#@]+?'
39-
(file('mdeps').text =~ /(?m)^$s($w):($w):($w)?(:$w)?(@$w)?$s(?:#$s($w)?$s)?$/).each {
40-
match, group, name, version, classifier, ext, configuration ->
41-
add(configuration ?: name.contains('test') ? 'testCompile' : 'compile', "$group:$name:${version?:''}${classifier?:''}${ext?:''}")
42-
}
38+
// def s = '[ \t]*', w = '[^:#@]+?'
39+
// (file('mdeps').text =~ /(?m)^$s($w):($w):($w)?(:$w)?(@$w)?$s(?:#$s($w)?$s)?$/).each {
40+
// match, group, name, version, classifier, ext, configuration ->
41+
// add(configuration ?: name.contains('test') ? 'testCompile' : 'compile', "$group:$name:${version?:''}${classifier?:''}${ext?:''}")
42+
// }
43+
compile 'com.github.scm4j:scm4j-vcs-api:master-SNAPSHOT'
4344
compile 'org.eclipse.jgit:org.eclipse.jgit:4.3.0.201604071810-r'
4445

4546
testCompile 'org.mockito:mockito-core:2.0.62-beta'

0 commit comments

Comments
 (0)