Skip to content

Commit fda2092

Browse files
committed
Enabling snapshot builds again after bintray reconfiguration
1 parent 3ea6d46 commit fda2092

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

build.gradle

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ subprojects {
6868

6969
java {
7070
withSourcesJar()
71-
// withJavadocJar()
71+
withJavadocJar()
7272
}
7373

7474
publishing {
@@ -140,7 +140,11 @@ subprojects {
140140
contextUrl = 'http://oss.jfrog.org'
141141
publish {
142142
repository {
143-
repoKey = 'oss-snapshot-local'
143+
if (project.version.endsWith("-SNAPSHOT")) {
144+
repoKey = 'oss-snapshot-local'
145+
} else {
146+
repoKey = 'oss-release-local'
147+
}
144148
username = System.env.BINTRAY_USER ?: project.findProperty('BINTRAY_USER') ?: ''
145149
password = System.env.BINTRAY_PASS ?: project.findProperty('BINTRAY_PASS') ?: ''
146150
}
@@ -151,7 +155,7 @@ subprojects {
151155
}
152156
}
153157
resolve {
154-
repoKey = 'jcenter'
158+
repoKey = 'oss-snapshot-local'
155159
}
156160
clientConfig.info.setBuildNumber(System.getProperty('build.number'))
157161
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=0.0.1
1+
version=0.0.1-SNAPSHOT
22

33
PROJECT_GROUP = com.graphql-java-kickstart
44
PROJECT_NAME = graphql-spring-webclient

travis-build.sh

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,15 @@ EOL
1515
}
1616

1717
if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ]; then
18-
# if [ "${RELEASE}" = "true" ]; then
18+
if [ "${RELEASE}" = "true" ]; then
1919
echo "Deploying release to Bintray"
20-
# NEXT_VERSION="$(gradle properties -q | grep "version:" | grep -v "kotlin_version:" | awk '{print $2}' | tr -d '[:space:]')b$(date +%Y%m%d%H%M)"
21-
NEXT_VERSION="$(./gradlew properties -q | grep "version:" | grep -v "kotlin_version:" | awk '{print $2}' | tr -d '[:space:]')b${TRAVIS_BUILD_NUMBER}"
22-
sed -i -E "s/^version(\s)?=.*/version=${NEXT_VERSION}/" gradle.properties
2320
saveGitCredentials
2421
./gradlew clean assemble && ./gradlew check --info && ./gradlew bintrayUpload -x check --info
25-
# else
26-
# echo "Deploying snapshot"
27-
# saveGitCredentials
28-
# ./gradlew artifactoryPublish -Dsnapshot=true -Dbuild.number="${TRAVIS_BUILD_NUMBER}"
29-
# fi
22+
else
23+
echo "Deploying snapshot"
24+
saveGitCredentials
25+
./gradlew artifactoryPublish -Dsnapshot=true -Dbuild.number="${TRAVIS_BUILD_NUMBER}"
26+
fi
3027
else
3128
echo "Verify"
3229
./gradlew clean assemble && ./gradlew check --info

0 commit comments

Comments
 (0)