From b90e1790c312e355077123284d46a8f055a71ece Mon Sep 17 00:00:00 2001 From: Maksym Ostroverkhov Date: Sat, 31 Aug 2019 13:24:40 +0300 Subject: [PATCH] update dependencies --- build.gradle | 42 ++++------------------------- gradle.properties | 15 ++++++++++- gradle/dependency-management.gradle | 21 +++++++++++++++ gradle/publishing.gradle | 2 +- local.properties | 11 -------- test/build.gradle | 3 +++ 6 files changed, 44 insertions(+), 50 deletions(-) create mode 100644 gradle/dependency-management.gradle delete mode 100644 local.properties diff --git a/build.gradle b/build.gradle index e35c38b26..fb93e4c83 100644 --- a/build.gradle +++ b/build.gradle @@ -15,49 +15,17 @@ */ plugins { - id 'com.gradle.build-scan' version '2.3' + id 'com.gradle.build-scan' version '2.4.1' id 'io.spring.dependency-management' version '1.0.8.RELEASE' apply false id 'com.jfrog.bintray' version '1.8.4' apply false - id 'com.jfrog.artifactory' version '4.9.7' apply false - id 'org.jetbrains.kotlin.jvm' version '1.3.31' apply false + id 'com.jfrog.artifactory' version '4.9.8' apply false + id 'org.jetbrains.kotlin.jvm' version '1.3.50' apply false } subprojects { apply plugin: 'java-library' apply plugin: 'kotlin' - apply plugin: 'io.spring.dependency-management' - - ext['netty-buffer.version'] = '4.1.37.Final' - ext['jsr305.version'] = '3.0.2' - ext['kotlin-stdlib-jdk7.version'] = '1.3.41' - ext['rxjava.version'] = '2.2.10' - ext['slf4j-api.version'] = '1.7.25' - ext['junit.version'] = '4.12' - ext['mockito.version'] = '2.28.2' - ext['hamcrest-library.version'] = '1.3' - ext['slf4j-log4j.version'] = '1.7.25' - ext['okhttp.version'] = '3.14.2' - ext['rsocket.java.version'] = '1.0.0-RC1' - - dependencyManagement { - - dependencies { - /*common*/ - dependency "io.netty:netty-buffer:${ext['netty-buffer.version']}" - dependency "com.google.code.findbugs:jsr305:${ext['jsr305.version']}" - dependency "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${ext['kotlin-stdlib-jdk7.version']}" - dependency "io.reactivex.rxjava2:rxjava:${ext['rxjava.version']}" - dependency "org.slf4j:slf4j-api:${ext['slf4j-api.version']}" - /*transports*/ - dependency "com.squareup.okhttp3:okhttp:${ext['okhttp.version']}" - /*test*/ - dependency "junit:junit:${ext['junit.version']}" - dependency "org.mockito:mockito-core:${ext['mockito.version']}" - dependency "org.hamcrest:hamcrest-library:${ext['hamcrest-library.version']}" - dependency "org.slf4j:slf4j-log4j12:${ext['slf4j-log4j.version']}" - dependency "io.rsocket:rsocket-transport-netty:${ext['rsocket.java.version']}" - } - } + apply from: '../gradle/dependency-management.gradle' dependencies { api 'io.netty:netty-buffer' @@ -73,7 +41,7 @@ subprojects { } repositories { - jcenter() + mavenCentral() } test { diff --git a/gradle.properties b/gradle.properties index 315d6ef9b..d5f199f21 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,8 +14,21 @@ # limitations under the License. # -release.scope=patch +group=io.rsocket.kotlin version=0.9.7-SNAPSHOT + +nettyBufferVersion=4.1.37.Final +jsr305Version=3.0.2 +kotlinStdlibJdk7Version=1.3.50 +rxjavaVersion=2.2.12 +slf4jApiVersion=1.7.28 +junitVersion=4.12 +mockitoVersion=2.28.2 +hamcrestLibraryVersion=1.3 +slf4jLog4jVersion=1.7.28 +okhttpVersion=3.14.2 +rsocketJavaVersion=1.0.0-RC3 + org.gradle.parallel=true org.gradle.configureondemand=true diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle new file mode 100644 index 000000000..c9e797fe5 --- /dev/null +++ b/gradle/dependency-management.gradle @@ -0,0 +1,21 @@ +apply plugin: 'io.spring.dependency-management' + +dependencyManagement { + + dependencies { + /*common*/ + dependency "io.netty:netty-buffer:${nettyBufferVersion}" + dependency "com.google.code.findbugs:jsr305:${jsr305Version}" + dependency "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlinStdlibJdk7Version}" + dependency "io.reactivex.rxjava2:rxjava:${rxjavaVersion}" + dependency "org.slf4j:slf4j-api:${slf4jApiVersion}" + /*transports*/ + dependency "com.squareup.okhttp3:okhttp:${okhttpVersion}" + /*test*/ + dependency "junit:junit:${junitVersion}" + dependency "org.mockito:mockito-core:${mockitoVersion}" + dependency "org.hamcrest:hamcrest-library:${hamcrestLibraryVersion}" + dependency "org.slf4j:slf4j-log4j12:${slf4jLog4jVersion}" + dependency "io.rsocket:rsocket-transport-netty:${rsocketJavaVersion}" + } +} diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle index f94abd4f9..3a52bb18c 100644 --- a/gradle/publishing.gradle +++ b/gradle/publishing.gradle @@ -3,7 +3,7 @@ subprojects { publishing { publications { maven(MavenPublication) { - groupId 'io.rsocket.kotlin' + groupId project.group from components.java diff --git a/local.properties b/local.properties deleted file mode 100644 index 047f75159..000000000 --- a/local.properties +++ /dev/null @@ -1,11 +0,0 @@ -## This file is automatically generated by Android Studio. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. -# -# Location of the SDK. This is only used by Gradle. -# For customization when using a Version Control System, please read the -# header note. -#Wed Oct 11 18:35:38 EEST 2017 -sdk.dir=/home/maksym_o/dev/android/sdk diff --git a/test/build.gradle b/test/build.gradle index 8179d1d77..8e96ed60e 100644 --- a/test/build.gradle +++ b/test/build.gradle @@ -13,6 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +repositories { + maven { url 'http://repo.spring.io/milestone' } +} dependencies { testImplementation project(":rsocket-transport-okhttp")