ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-25 02:56:29 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Publications now publish JARs again. Install task now publishes again.

Browse Source
This commit is contained in:
Clinton Alexander 2016-12-06 11:28:22 +00:00
parent bf49dda731
commit b24c628e34
7 changed files with 25 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -44,7 +44,6 @@ plugins {
apply plugin: 'kotlin'
apply plugin: 'project-report'
apply plugin: 'com.github.ben-manes.versions'
apply plugin: 'maven-publish'
apply plugin: 'net.corda.plugins.publish-utils'
apply plugin: 'net.corda.plugins.quasar-utils'
apply plugin: 'net.corda.plugins.cordformation'
@ -153,9 +152,6 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['build']) {
}
}
// Aliasing the publishToMavenLocal for simplicity.
task(install, dependsOn: 'publishToMavenLocal')
bintrayConfig {
user = System.getenv('CORDA_BINTRAY_USER')
key = System.getenv('CORDA_BINTRAY_KEY')

2
client/build.gradle
View File

@ -1,8 +1,6 @@
apply plugin: 'kotlin'
apply plugin: 'net.corda.plugins.quasar-utils'
apply plugin: 'net.corda.plugins.publish-utils'
apply plugin: 'maven-publish'
apply plugin: 'com.jfrog.bintray'
description 'Corda client modules'

2
core/build.gradle
View File

@ -1,8 +1,6 @@
apply plugin: 'kotlin'
apply plugin: 'net.corda.plugins.quasar-utils'
apply plugin: 'net.corda.plugins.publish-utils'
apply plugin: 'maven-publish'
apply plugin: 'com.jfrog.bintray'
description 'Corda core'

2
finance/build.gradle
View File

@ -2,8 +2,6 @@ apply plugin: 'kotlin'
apply plugin: CanonicalizerPlugin
apply plugin: 'net.corda.plugins.publish-utils'
apply plugin: 'net.corda.plugins.quasar-utils'
apply plugin: 'maven-publish'
apply plugin: 'com.jfrog.bintray'
description 'Corda finance modules'

46
gradle-plugins/publish-utils/src/main/groovy/net/corda/plugins/PublishTasks.groovy
View File

@ -24,38 +24,40 @@ class PublishTasks implements Plugin<Project> {
createTasks()
createExtensions()
checkAndApplyPublishing()
checkAndConfigurePublishing()
}
void checkAndApplyPublishing() {
void checkAndConfigurePublishing() {
project.logger.info("Checking whether to publish ${project.name}")
def bintrayConfig = project.rootProject.extensions.findByType(BintrayConfigExtension.class)
if((bintrayConfig != null) && (bintrayConfig.publications) && (bintrayConfig.publications.findAll { it == project.name }.size() > 0)) {
applyPublishing(bintrayConfig)
configurePublishing(bintrayConfig)
}
}
void applyPublishing(BintrayConfigExtension bintrayConfig) {
void configurePublishing(BintrayConfigExtension bintrayConfig) {
project.afterEvaluate {
project.logger.info("Configuring bintray for ${project.name}")
project.configure(project) {
apply plugin: 'maven-publish'
apply plugin: 'com.jfrog.bintray'
}
def bintray = project.extensions.findByName("bintray")
configureBintray(bintray, bintrayConfig)
project.publishing.publications.create(project.name, MavenPublication) {
from project.components.java
groupId project.group
artifactId project.name
artifact project.tasks.sourceJar
artifact project.tasks.javadocJar
extendPomForMavenCentral(pom, bintrayConfig)
}
configureMavenPublish(bintrayConfig)
configureBintray(bintrayConfig)
}
}
void configureMavenPublish(BintrayConfigExtension bintrayConfig) {
project.apply([plugin: 'maven-publish'])
project.publishing.publications.create(project.name, MavenPublication) {
from project.components.java
groupId project.group
artifactId project.name
artifact project.tasks.sourceJar
artifact project.tasks.javadocJar
extendPomForMavenCentral(pom, bintrayConfig)
}
project.task("install", dependsOn: "publishToMavenLocal")
}
// Maven central requires all of the below fields for this to be a valid POM
void extendPomForMavenCentral(MavenPom pom, BintrayConfigExtension config) {
pom.withXml {
@ -87,7 +89,9 @@ class PublishTasks implements Plugin<Project> {
}
}
void configureBintray(def bintray, BintrayConfigExtension bintrayConfig) {
void configureBintray(BintrayConfigExtension bintrayConfig) {
project.apply([plugin: 'com.jfrog.bintray'])
def bintray = project.extensions.findByName("bintray")
bintray.user = bintrayConfig.user
bintray.key = bintrayConfig.key
bintray.publications = [ project.name ]

2
node/build.gradle
View File

@ -2,8 +2,6 @@ apply plugin: 'kotlin'
apply plugin: 'java'
apply plugin: 'net.corda.plugins.quasar-utils'
apply plugin: 'net.corda.plugins.publish-utils'
apply plugin: 'maven-publish'
apply plugin: 'com.jfrog.bintray'
description 'Corda node modules'

3
test-utils/build.gradle
View File

@ -1,8 +1,6 @@
apply plugin: 'kotlin'
apply plugin: 'net.corda.plugins.quasar-utils'
apply plugin: 'net.corda.plugins.publish-utils'
apply plugin: 'maven-publish'
apply plugin: 'com.jfrog.bintray'
description 'Testing utilities for Corda'
@ -20,7 +18,6 @@ repositories {
//noinspection GroovyAssignabilityCheck
configurations {
// we don't want isolated.jar in classPath, since we want to test jar being dynamically loaded as an attachment
runtime.exclude module: 'isolated'
}