diff --git a/.travis.yml b/.travis.yml index 8d5b0b1e1..b39a2f0a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: java jdk: - oraclejdk8 -script: ./gradlew -S clean jar ds3-sdk:test ds3-utils:test ds3-metadata:test +script: ./gradlew -S clean jar ds3_java_sdk:test ds3-utils:test ds3-metadata:test diff --git a/build.gradle b/build.gradle index 1fd5a771b..94aae99d1 100644 --- a/build.gradle +++ b/build.gradle @@ -14,14 +14,17 @@ */ buildscript { - ext.kotlin_version = '1.1.4-2' + ext.kotlin_version = '1.1.4-3' repositories { mavenCentral() + jcenter() } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' + classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.1' } } @@ -58,7 +61,7 @@ task wrapper(type: Wrapper) { gradleVersion = '4.1' } -project(':ds3-sdk') { +project(':ds3_java_sdk') { dependencies { compile project(':ds3-interfaces') compile project(':ds3-utils') @@ -74,14 +77,14 @@ project(':ds3-metadata') { project(':ds3-sdk-integration') { dependencies { - compile project(':ds3-sdk') + compile project(':ds3_java_sdk') compile project(':ds3-metadata') } } project(':ds3-sdk-samples') { dependencies { - compile project(':ds3-sdk') + compile project(':ds3_java_sdk') } } diff --git a/ds3-interfaces/build.gradle b/ds3-interfaces/build.gradle new file mode 100644 index 000000000..a82804d4d --- /dev/null +++ b/ds3-interfaces/build.gradle @@ -0,0 +1 @@ +apply from: "$rootDir/gradle/scripts/publish.gradle" diff --git a/ds3-metadata/build.gradle b/ds3-metadata/build.gradle index 6002069a0..19ee26af8 100644 --- a/ds3-metadata/build.gradle +++ b/ds3-metadata/build.gradle @@ -13,15 +13,10 @@ * **************************************************************************** */ -buildscript { - repositories { jcenter() } - dependencies { - classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.1' - } -} - apply plugin: 'com.github.johnrengelman.shadow' +apply from: "$rootDir/gradle/scripts/publish.gradle" + shadowJar { relocate 'org.apache', 'ds3metafatjar.org.apache' relocate 'com.google', 'ds3metafatjar.com.google' diff --git a/ds3-sdk/build.gradle b/ds3-sdk/build.gradle index 5b74d8b55..a683f7683 100644 --- a/ds3-sdk/build.gradle +++ b/ds3-sdk/build.gradle @@ -16,15 +16,10 @@ import java.nio.file.Files import java.nio.file.Path -buildscript { - repositories { jcenter() } - dependencies { - classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.1' - } -} - apply plugin: 'com.github.johnrengelman.shadow' +apply from: "$rootDir/gradle/scripts/publish.gradle" + shadowJar { relocate 'com.google', 'ds3fatjar.com.google' relocate 'org.jetbrains', 'ds3fatjar.org.jetbrains' diff --git a/ds3-utils/build.gradle b/ds3-utils/build.gradle index f8f974efa..219664d5c 100644 --- a/ds3-utils/build.gradle +++ b/ds3-utils/build.gradle @@ -14,9 +14,10 @@ * **************************************************************************** */ +apply from: "$rootDir/gradle/scripts/publish.gradle" + dependencies { compile "commons-codec:commons-codec:$commonscodecVersion" compile "commons-io:commons-io:$commonsioVersion" compile "com.google.guava:guava:$guavaVersion" } - diff --git a/gradle/scripts/publish.gradle b/gradle/scripts/publish.gradle new file mode 100644 index 000000000..7a3b70027 --- /dev/null +++ b/gradle/scripts/publish.gradle @@ -0,0 +1,23 @@ +apply plugin: 'com.jfrog.bintray' + +bintray { + user = System.getenv('BINTRAY_USER') + key = System.getenv('BINTRAY_KEY') + + configurations = ['archives'] + + //dryRun = true + publish = true + + pkg { + name = "$project.name" + repo = "ds3" + userOrg = "spectralogic" + websiteUrl = "https://github.com/SpectraLogic/ds3_java_sdk" + vcsUrl = "https://github.com/SpectraLogic/ds3_java_sdk.git" + licenses = ['Apache-2.0'] + version { + name = "$project.version" + } + } +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index d0a85a6f1..b7a6f649c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,3 +16,4 @@ include 'ds3-sdk-integration', 'ds3-sdk', 'ds3-sdk-samples', 'ds3-interfaces', 'ds3-metadata', 'ds3-utils' rootProject.name = 'ds3-java-sdk' +project(":ds3-sdk").name = "ds3_java_sdk"