Skip to content
This repository has been archived by the owner on Feb 11, 2022. It is now read-only.

Update internals #229

Merged
merged 3 commits into from
Oct 7, 2018
Merged

Update internals #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19cf76f
Update JFrog Bintray plugin to latest version (1.8.4)
mr-archano Oct 6, 2018
01723a3
Apply the BintrayPlugin outside afterEvaluate() to avoid issues with …
mr-archano Oct 6, 2018
9dd86bb
Update CI script to include also placeholder user and key for Bintray
mr-archano Oct 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ci/prBuilder.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e
BASEDIR=$(dirname "$0")

# Testing the core plugin
cd $BASEDIR/../ && ./gradlew clean build bintrayUpload -PdryRun=true --info
cd $BASEDIR/../ && ./gradlew clean build bintrayUpload -PdryRun=true -PbintrayUser=user -PbintrayKey=key --info

# Testing the samples
cd $BASEDIR/../samples/ && ./gradlew clean build bintrayUpload -PdryRun=true --info
cd $BASEDIR/../samples/ && ./gradlew clean build bintrayUpload -PdryRun=true -PbintrayUser=user -PbintrayKey=key --info
2 changes: 1 addition & 1 deletion core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ buildProperties {

dependencies {
compile localGroovy()
compile 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
compile 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'

testCompile 'junit:junit:4.12'
testCompile 'org.assertj:assertj-core:3.9.0'
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/groovy/com/novoda/gradle/release/ReleasePlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ class ReleasePlugin implements Plugin<Project> {
PublishExtension extension = project.extensions.create('publish', PublishExtension)
project.afterEvaluate {
extension.validate()
project.apply([plugin: 'maven-publish'])
attachArtifacts(extension, project)
new BintrayPlugin().apply(project)
new BintrayConfiguration(extension).configure(project)
}
project.apply([plugin: 'maven-publish'])
new BintrayPlugin().apply(project)
}

void attachArtifacts(PublishExtension extension, Project project) {
Expand Down