diff --git a/.buildscripts/upload_artifacts.sh b/.buildscripts/upload_artifacts.sh index c6ed5dc1..c1bd1144 100755 --- a/.buildscripts/upload_artifacts.sh +++ b/.buildscripts/upload_artifacts.sh @@ -16,7 +16,7 @@ elif [ -z "$BINTRAY_KEY" ]; then echo "Skipping upload: Expected BINTRAY_KEY to be set." elif [ "$TRAVIS_BRANCH" = "master" ]; then echo "Uploading SNAPSHOT build to oss.jfrog.org..." - ./gradlew clean publishSdkPublicationToJFrogRepository + ./gradlew clean assemble publishSdkPublicationToSnapshotRepository echo "Build uploaded!" elif [[ $TRAVIS_BRANCH =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then echo "Uploading RELEASE build to Bintray..." diff --git a/build.gradle b/build.gradle index 10c8c910..b30bc70d 100644 --- a/build.gradle +++ b/build.gradle @@ -29,11 +29,11 @@ allprojects { mavenLocal() jcenter() } -} -group = 'com.constantcontact' -def isRelease = Boolean.valueOf(project.hasProperty("release") ? project.property("release") as String : "false") -version = '5.2.0' + (isRelease ? "" : "-SNAPSHOT") + group = 'com.constantcontact' + def isRelease = Boolean.valueOf(project.hasProperty("release") ? project.property("release") as String : "false") + version = '5.2.0' + (isRelease ? "" : "-SNAPSHOT") +} apply plugin: "net.wooga.github" @@ -90,8 +90,8 @@ subprojects { publishing { repositories { maven { - name = "JFrog" - url "https://oss.jfrog.org/artifactory/oss-snapshot-local/" + name = "Snapshot" + url "https://oss.jfrog.org/artifactory/oss-snapshot-local" credentials(PasswordCredentials) { username = bintray.user password = bintray.key