Skip to content

Commit f340b29

Browse files
update dependencies (#67)
1 parent 4a25957 commit f340b29

File tree

6 files changed

+44
-50
lines changed

6 files changed

+44
-50
lines changed

build.gradle

Lines changed: 5 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -15,49 +15,17 @@
1515
*/
1616

1717
plugins {
18-
id 'com.gradle.build-scan' version '2.3'
18+
id 'com.gradle.build-scan' version '2.4.1'
1919
id 'io.spring.dependency-management' version '1.0.8.RELEASE' apply false
2020
id 'com.jfrog.bintray' version '1.8.4' apply false
21-
id 'com.jfrog.artifactory' version '4.9.7' apply false
22-
id 'org.jetbrains.kotlin.jvm' version '1.3.31' apply false
21+
id 'com.jfrog.artifactory' version '4.9.8' apply false
22+
id 'org.jetbrains.kotlin.jvm' version '1.3.50' apply false
2323
}
2424

2525
subprojects {
2626
apply plugin: 'java-library'
2727
apply plugin: 'kotlin'
28-
apply plugin: 'io.spring.dependency-management'
29-
30-
ext['netty-buffer.version'] = '4.1.37.Final'
31-
ext['jsr305.version'] = '3.0.2'
32-
ext['kotlin-stdlib-jdk7.version'] = '1.3.41'
33-
ext['rxjava.version'] = '2.2.10'
34-
ext['slf4j-api.version'] = '1.7.25'
35-
ext['junit.version'] = '4.12'
36-
ext['mockito.version'] = '2.28.2'
37-
ext['hamcrest-library.version'] = '1.3'
38-
ext['slf4j-log4j.version'] = '1.7.25'
39-
ext['okhttp.version'] = '3.14.2'
40-
ext['rsocket.java.version'] = '1.0.0-RC1'
41-
42-
dependencyManagement {
43-
44-
dependencies {
45-
/*common*/
46-
dependency "io.netty:netty-buffer:${ext['netty-buffer.version']}"
47-
dependency "com.google.code.findbugs:jsr305:${ext['jsr305.version']}"
48-
dependency "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${ext['kotlin-stdlib-jdk7.version']}"
49-
dependency "io.reactivex.rxjava2:rxjava:${ext['rxjava.version']}"
50-
dependency "org.slf4j:slf4j-api:${ext['slf4j-api.version']}"
51-
/*transports*/
52-
dependency "com.squareup.okhttp3:okhttp:${ext['okhttp.version']}"
53-
/*test*/
54-
dependency "junit:junit:${ext['junit.version']}"
55-
dependency "org.mockito:mockito-core:${ext['mockito.version']}"
56-
dependency "org.hamcrest:hamcrest-library:${ext['hamcrest-library.version']}"
57-
dependency "org.slf4j:slf4j-log4j12:${ext['slf4j-log4j.version']}"
58-
dependency "io.rsocket:rsocket-transport-netty:${ext['rsocket.java.version']}"
59-
}
60-
}
28+
apply from: '../gradle/dependency-management.gradle'
6129

6230
dependencies {
6331
api 'io.netty:netty-buffer'
@@ -73,7 +41,7 @@ subprojects {
7341
}
7442

7543
repositories {
76-
jcenter()
44+
mavenCentral()
7745
}
7846

7947
test {

gradle.properties

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,21 @@
1414
# limitations under the License.
1515
#
1616

17-
release.scope=patch
17+
group=io.rsocket.kotlin
1818
version=0.9.7-SNAPSHOT
19+
20+
nettyBufferVersion=4.1.37.Final
21+
jsr305Version=3.0.2
22+
kotlinStdlibJdk7Version=1.3.50
23+
rxjavaVersion=2.2.12
24+
slf4jApiVersion=1.7.28
25+
junitVersion=4.12
26+
mockitoVersion=2.28.2
27+
hamcrestLibraryVersion=1.3
28+
slf4jLog4jVersion=1.7.28
29+
okhttpVersion=3.14.2
30+
rsocketJavaVersion=1.0.0-RC3
31+
1932
org.gradle.parallel=true
2033
org.gradle.configureondemand=true
2134

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
apply plugin: 'io.spring.dependency-management'
2+
3+
dependencyManagement {
4+
5+
dependencies {
6+
/*common*/
7+
dependency "io.netty:netty-buffer:${nettyBufferVersion}"
8+
dependency "com.google.code.findbugs:jsr305:${jsr305Version}"
9+
dependency "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlinStdlibJdk7Version}"
10+
dependency "io.reactivex.rxjava2:rxjava:${rxjavaVersion}"
11+
dependency "org.slf4j:slf4j-api:${slf4jApiVersion}"
12+
/*transports*/
13+
dependency "com.squareup.okhttp3:okhttp:${okhttpVersion}"
14+
/*test*/
15+
dependency "junit:junit:${junitVersion}"
16+
dependency "org.mockito:mockito-core:${mockitoVersion}"
17+
dependency "org.hamcrest:hamcrest-library:${hamcrestLibraryVersion}"
18+
dependency "org.slf4j:slf4j-log4j12:${slf4jLog4jVersion}"
19+
dependency "io.rsocket:rsocket-transport-netty:${rsocketJavaVersion}"
20+
}
21+
}

gradle/publishing.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ subprojects {
33
publishing {
44
publications {
55
maven(MavenPublication) {
6-
groupId 'io.rsocket.kotlin'
6+
groupId project.group
77

88
from components.java
99

local.properties

Lines changed: 0 additions & 11 deletions
This file was deleted.

test/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
repositories {
17+
maven { url 'http://repo.spring.io/milestone' }
18+
}
1619

1720
dependencies {
1821
testImplementation project(":rsocket-transport-okhttp")

0 commit comments

Comments
 (0)