Moved publishing to bintray to correct gradle file.

This commit is contained in:
Clinton Alexander 2016-11-15 17:38:50 +00:00
parent c83232e1de
commit 8e342e81d3
2 changed files with 25 additions and 14 deletions

View File

@ -20,10 +20,10 @@ buildscript {
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
// Can run 'gradle dependencyUpdates' to find new versions of things.
classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
}
}
@ -31,7 +31,6 @@ plugins {
// TODO The capsule plugin requires the newer DSL plugin block.It would be nice if we could unify all the plugins into one style,
// but the DSL has some restrictions e.g can't be used on the allprojects section. So we should revisit this if there are improvements in Gradle.
id "us.kirchmeier.capsule" version "1.0.2"
id "com.jfrog.bintray" version "1.7"
}
apply plugin: 'kotlin'
@ -40,18 +39,6 @@ apply plugin: 'com.github.ben-manes.versions'
apply plugin: 'maven-publish'
apply plugin: QuasarPlugin
bintray {
user = System.getenv('CORDA_BINTRAY_USER')
key = System.getenv('CORDA_BINTRAY_KEY')
publications = ['publishUtils']
pkg {
repo = 'corda'
name = 'publish-utils'
userOrg = 'r3'
licenses = ['Apache-2.0']
}
}
allprojects {
apply plugin: 'java'
apply plugin: 'jacoco'

View File

@ -1,5 +1,7 @@
apply plugin: 'groovy'
apply plugin: 'net.corda.plugins.publish-utils' // TODO: Remove when bintray publishing code is in master
apply plugin: 'maven-publish'
apply plugin: 'com.jfrog.bintray'
dependencies {
compile gradleApi()
@ -10,6 +12,28 @@ repositories {
mavenCentral()
}
task("sourceJar", type: Jar, dependsOn: classes) {
classifier = 'sources'
from sourceSets.main.allSource
}
task("javadocJar", type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
from javadoc.destinationDir
}
bintray {
user = System.getenv('CORDA_BINTRAY_USER')
key = System.getenv('CORDA_BINTRAY_KEY')
publications = ['publishUtils']
pkg {
repo = 'corda'
name = 'publish-utils'
userOrg = 'r3'
licenses = ['Apache-2.0']
}
}
publishing {
publications {
publishUtils(MavenPublication) {