Skip to content

Commit

Permalink
Merge pull request #546 from rpmoore/5_0_beta_prep
Browse files Browse the repository at this point in the history
Getting the 5.0 sdk ready for a beta release
  • Loading branch information
GraciesPadre committed Mar 15, 2018
2 parents 849e792 + 1d210ab commit 3205977
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
12 changes: 7 additions & 5 deletions build.gradle
Expand Up @@ -23,26 +23,28 @@ buildscript {

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'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.2'
classpath "gradle.plugin.net.ossindex:ossindex-gradle-plugin:0.2.0-beta"
}
}


plugins {
id "com.palantir.git-version" version "0.10.0"
id "com.palantir.git-version" version "0.10.1"
}

allprojects {
group = 'com.spectralogic.ds3'
version = '4.0.1'
version = '5.0.0'
}

subprojects {
apply plugin: 'maven'
apply plugin: 'java'
apply plugin: 'kotlin'
apply plugin: 'findbugs'
apply plugin: 'net.ossindex.audit'

sourceCompatibility = JavaVersion.VERSION_1_8
repositories {
Expand All @@ -62,7 +64,7 @@ subprojects {
}

task wrapper(type: Wrapper) {
gradleVersion = '4.1'
gradleVersion = '4.6'
}

project(':ds3-sdk') {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
#Fri Aug 25 15:48:59 MDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
6 changes: 3 additions & 3 deletions gradlew
Expand Up @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn ( ) {
warn () {
echo "$*"
}

die ( ) {
die () {
echo
echo "$*"
echo
Expand Down Expand Up @@ -155,7 +155,7 @@ if $cygwin ; then
fi

# Escape application args
save ( ) {
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
Expand Down

0 comments on commit 3205977

Please sign in to comment.