Skip to content

Commit ad05368

Browse files
committed
Merge pull request #2609 from akarnokd/BuildFix
Fixed comment and missing value
2 parents 3e5d8c8 + 4b3fb79 commit ad05368

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ javadoc {
1717
exclude "**/rx/internal/**"
1818
}
1919

20-
# support for snapshot/final releases with the various branches RxJava uses
20+
// support for snapshot/final releases with the various branches RxJava uses
2121
nebulaRelease {
2222
addReleaseBranchPattern(/\d+\.\d+\.\d+/)
2323
addReleaseBranchPattern('HEAD')
2424
}
2525

26-
# the snapshot versioning should increment the path number
27-
release.scope=patch
26+
// the snapshot versioning should increment the path number
27+
// release.scope=patch
2828

2929
if (project.hasProperty('release.useLastTag')) {
3030
tasks.prepare.enabled = false

gradle/buildViaTravis.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if [ "$TRAVIS_PULL_REQUEST" == "true" ]; then
77
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then
88
echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']'
99
./gradlew -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" snapshot --stacktrace
10-
elif if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then
10+
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then
1111
echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG']'
1212
./gradlew -Prelease.useLastTag=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" final --stacktrace
1313
else

0 commit comments

Comments
 (0)