Skip to content

Commit f11eadc

Browse files
committed
testcases now use newest gradle
1 parent 3955f49 commit f11eadc

29 files changed

+57
-62
lines changed

.gitignore

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ build/
88
src/test/integration/test/.git/
99
src/test/integration/test/build/
1010
src/test/integration/test/.gradle/
11-
src/test/integration/test/build.gradle
11+
src/test/integration/test/build.gradle.kts
1212
src/test/integration/test/content
1313
.idea/
14-
*.iml
14+
*.iml
15+

src/test/integration/contexts/distance-depth/jgitver.gradle

-3
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
jgitver {
2+
distanceCalculatorKind = fr.brouillard.oss.jgitver.impl.DistanceCalculator.CalculatorKind.DEPTH
3+
}

src/test/integration/contexts/distance-first_parent/jgitver.gradle

-3
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
jgitver {
2+
distanceCalculatorKind = fr.brouillard.oss.jgitver.impl.DistanceCalculator.CalculatorKind.FIRST_PARENT
3+
}

src/test/integration/contexts/distance-log/jgitver.gradle

-3
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
jgitver {
2+
distanceCalculatorKind = fr.brouillard.oss.jgitver.impl.DistanceCalculator.CalculatorKind.LOG
3+
}

src/test/integration/contexts/maven-like/jgitver.gradle

-3
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
jgitver {
2+
strategy = fr.brouillard.oss.jgitver.Strategies.MAVEN
3+
}

src/test/integration/contexts/merged-branches/jgitver.gradle

-3
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
jgitver {
2+
strategy = fr.brouillard.oss.jgitver.Strategies.CONFIGURABLE
3+
}

src/test/integration/contexts/policy-latest/jgitver.gradle

-3
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
jgitver {
2+
policy = fr.brouillard.oss.jgitver.LookupPolicy.LATEST
3+
}

src/test/integration/contexts/policy-nearest/jgitver.gradle

-3
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
jgitver {
2+
policy = fr.brouillard.oss.jgitver.LookupPolicy.NEAREST
3+
}

src/test/integration/contexts/tag-regexp/jgitver.gradle

-4
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
jgitver {
2+
strategy = fr.brouillard.oss.jgitver.Strategies.PATTERN
3+
regexVersionTag = "r(.*)"
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
./build.sh v1.2-tags-regexp $JGITVER_GRADLE_PLUGIN_VERSION 1.2.3-1

src/test/integration/contexts/v1.2-tags-regexp/jgitver.gradle

-4
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
jgitver {
2+
strategy = fr.brouillard.oss.jgitver.Strategies.PATTERN
3+
regexVersionTag = "v(1\\.2.*)"
4+
}

src/test/integration/contexts/version-strategy-normal/jgitver.gradle

-5
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
jgitver {
2+
strategy = fr.brouillard.oss.jgitver.Strategies.PATTERN
3+
versionPattern = "\${v}-standard"
4+
tagVersionPattern = "\${v}-tag"
5+
}

src/test/integration/contexts/version-strategy-tag/jgitver.gradle

-5
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
jgitver {
2+
strategy = fr.brouillard.oss.jgitver.Strategies.PATTERN
3+
versionPattern = "\${v}-standard"
4+
tagVersionPattern = "\${v}-tag"
5+
}

src/test/integration/test/base-build.gradle

-18
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
plugins {
2+
id("fr.brouillard.oss.gradle.jgitver") version "0.9.1"
3+
}
4+
5+
repositories {
6+
mavenLocal()
7+
maven {
8+
url = uri("https://plugins.gradle.org/m2/")
9+
}
10+
jcenter()
11+
}

src/test/integration/test/build.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ if [[ $# -ne 3 ]] ; then
1515
exit 1
1616
fi
1717

18-
if [[ -f ../contexts/$1/jgitver.gradle ]] ; then
18+
if [[ -f ../contexts/$1/jgitver.gradle.kts ]] ; then
1919
if [[ -f ../contexts/$1/git-history.sh ]] ; then
2020
../contexts/$1/git-history.sh
21-
cat base-build.gradle ../contexts/$1/jgitver.gradle > build.gradle
22-
(export JGITVER_GRADLE_VERSION=$2 && ./gradlew -b build.gradle version) | tee build.log
21+
cat base-build.gradle.kts ../contexts/$1/jgitver.gradle.kts > build.gradle.kts
22+
(export JGITVER_GRADLE_VERSION=$2 && ./gradlew -b build.gradle.kts version) | tee build.log
2323
COMPUTED_VERSION=`grep Version: build.log | cut -f 2 -d ' '`
2424
rm build.log
2525
if [ "$COMPUTED_VERSION" != "$3" ]; then

0 commit comments

Comments
 (0)