Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -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
11 changes: 7 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}

Expand Down Expand Up @@ -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')
Expand All @@ -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')
}
}

Expand Down
1 change: 1 addition & 0 deletions ds3-interfaces/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
apply from: "$rootDir/gradle/scripts/publish.gradle"
9 changes: 2 additions & 7 deletions ds3-metadata/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
9 changes: 2 additions & 7 deletions ds3-sdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
3 changes: 2 additions & 1 deletion ds3-utils/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

23 changes: 23 additions & 0 deletions gradle/scripts/publish.gradle
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
1 change: 1 addition & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"