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
42 changes: 5 additions & 37 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -73,7 +41,7 @@ subprojects {
}

repositories {
jcenter()
mavenCentral()
}

test {
Expand Down
15 changes: 14 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

21 changes: 21 additions & 0 deletions gradle/dependency-management.gradle
Original file line number Diff line number Diff line change
@@ -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}"
}
}
2 changes: 1 addition & 1 deletion gradle/publishing.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ subprojects {
publishing {
publications {
maven(MavenPublication) {
groupId 'io.rsocket.kotlin'
groupId project.group

from components.java

Expand Down
11 changes: 0 additions & 11 deletions local.properties

This file was deleted.

3 changes: 3 additions & 0 deletions test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down