Skip to content
This repository was archived by the owner on May 4, 2019. It is now read-only.

Commit 58d61f3

Browse files
committed
Fixing bintray issues
1 parent 90e1057 commit 58d61f3

File tree

2 files changed

+48
-7
lines changed

2 files changed

+48
-7
lines changed

artifactory.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ if (project.hasProperty('netifiArtifactoryUsername') && project.hasProperty('net
3131
}
3232

3333
defaults {
34-
publications('maven')
34+
publications('mavenJava')
3535
}
3636
}
3737
}

build.gradle

Lines changed: 47 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,31 @@
1+
buildscript {
2+
repositories {
3+
maven {
4+
url "https://plugins.gradle.org/m2/"
5+
}
6+
}
7+
dependencies {
8+
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4"
9+
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.8.1"
10+
}
11+
}
12+
113
plugins {
214
id 'com.gradle.build-scan' version '1.16' // declare before any other plugin
315
id 'com.google.osdetector' version '1.4.0'
416
id 'com.github.sherter.google-java-format' version '0.7.1' apply false
517
id 'com.github.johnrengelman.shadow' version '2.0.1' apply false
618
id 'me.champeau.gradle.jmh' version '0.4.7' apply false
719
id 'io.morethan.jmhreport' version '0.6.2.1' apply false
8-
id 'com.jfrog.artifactory' version '4.7.3'
9-
id 'com.jfrog.bintray' version '1.8.4'
1020
id 'io.spring.dependency-management' version '1.0.6.RELEASE' apply false
1121
id 'com.google.protobuf' version '0.8.5' apply false
1222
}
1323

14-
apply from: 'artifactory.gradle'
15-
apply from: 'bintray.gradle'
16-
1724
buildScan { licenseAgreementUrl = 'https://gradle.com/terms-of-service'; licenseAgree = 'yes' }
1825

26+
apply from: "artifactory.gradle"
27+
apply from: "bintray.gradle"
28+
1929
subprojects {
2030
apply plugin: 'io.spring.dependency-management'
2131
apply plugin: 'com.jfrog.bintray'
@@ -24,7 +34,7 @@ subprojects {
2434
apply plugin: 'com.github.sherter.google-java-format'
2535
apply plugin: 'maven'
2636
apply plugin: 'maven-publish'
27-
37+
2838
ext['reactor-bom.version'] = 'Californium-SR1'
2939
ext['rsocket.version'] = '0.11.9'
3040
ext['rsocket-rpc.version'] = '0.2.4'
@@ -163,4 +173,35 @@ subprojects {
163173
testCompile 'io.rsocket:rsocket-transport-local'
164174
testCompile 'org.mockito:mockito-core'
165175
}
176+
177+
// Build Source Jars
178+
def sourcesJarMap = [name: 'sourcesJar', type: Jar, dependsOn: classes]
179+
project.tasks.create(sourcesJarMap, {
180+
classifier = 'sources'
181+
from sourceSets.main.allSource
182+
version = "${project.version}"
183+
})
184+
185+
// Build Javadoc Jars
186+
def javadocJarMap = [name: 'javadocJar', type: Jar, dependsOn: javadoc]
187+
project.tasks.create(javadocJarMap, {
188+
classifier = 'javadoc'
189+
from javadoc.destinationDir
190+
version = "${project.version}"
191+
})
192+
193+
artifacts {
194+
archives sourcesJar
195+
archives javadocJar
196+
}
197+
198+
publishing {
199+
publications {
200+
mavenJava(MavenPublication) {
201+
from components.java
202+
artifact sourcesJar
203+
artifact javadocJar
204+
}
205+
}
206+
}
166207
}

0 commit comments

Comments
 (0)