Skip to content

Commit 152c1bb

Browse files
mostroverkhovmostroverkhov
authored
update gradle plugin to 5.6.1 (#70)
use dependency locking
1 parent 939c67c commit 152c1bb

20 files changed

+301
-28
lines changed

‎build.gradle‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,22 @@
1515
*/
1616

1717
plugins {
18-
id 'com.gradle.build-scan' version '2.4.1'
19-
id 'io.spring.dependency-management' version '1.0.8.RELEASE' apply false
20-
id 'com.jfrog.bintray' version '1.8.4' 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
18+
id 'com.gradle.build-scan'
19+
id 'io.spring.dependency-management' apply false
20+
id 'com.jfrog.bintray' apply false
21+
id 'com.jfrog.artifactory' apply false
22+
id 'org.jetbrains.kotlin.jvm' apply false
23+
}
24+
25+
allprojects {
26+
dependencyLocking {
27+
lockAllConfigurations()
28+
}
2329
}
2430

2531
subprojects {
2632
apply plugin: 'java-library'
2733
apply plugin: 'kotlin'
28-
apply from: '../gradle/dependency-management.gradle'
2934

3035
dependencies {
3136
api 'io.netty:netty-buffer'
@@ -66,6 +71,7 @@ subprojects {
6671
}
6772
}
6873

74+
apply from: 'gradle/dependency-management.gradle'
6975
apply from: 'gradle/publishing.gradle'
7076
apply from: 'gradle/bintray.gradle'
7177

‎gradle.properties‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@
1717
group=io.rsocket.kotlin
1818
version=0.9.7-SNAPSHOT
1919

20+
buildScanPluginVersion=2.4.1
21+
dependencyManagementPluginVersion=1.0.8.RELEASE
22+
bintrayPluginVersion=1.8.4
23+
artifactoryPluginVersion=4.9.8
24+
kotlinPluginVersion=1.3.50
25+
2026
nettyBufferVersion=4.1.37.Final
2127
jsr305Version=3.0.2
2228
kotlinStdlibJdk7Version=1.3.50

‎gradle/dependency-management.gradle‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
1-
apply plugin: 'io.spring.dependency-management'
1+
subprojects {
2+
apply plugin: 'io.spring.dependency-management'
23

3-
dependencyManagement {
4+
dependencyManagement {
45

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}"
6+
dependencies {
7+
/*common*/
8+
dependency "io.netty:netty-buffer:${nettyBufferVersion}"
9+
dependency "com.google.code.findbugs:jsr305:${jsr305Version}"
10+
dependency "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlinStdlibJdk7Version}"
11+
dependency "io.reactivex.rxjava2:rxjava:${rxjavaVersion}"
12+
dependency "org.slf4j:slf4j-api:${slf4jApiVersion}"
13+
/*transports*/
14+
dependency "com.squareup.okhttp3:okhttp:${okhttpVersion}"
15+
/*test*/
16+
dependency "junit:junit:${junitVersion}"
17+
dependency "org.mockito:mockito-core:${mockitoVersion}"
18+
dependency "org.hamcrest:hamcrest-library:${hamcrestLibraryVersion}"
19+
dependency "org.slf4j:slf4j-log4j12:${slf4jLog4jVersion}"
20+
dependency "io.rsocket:rsocket-transport-netty:${rsocketJavaVersion}"
21+
}
2022
}
21-
}
23+
}

‎gradle/wrapper/gradle-wrapper.jar‎

908 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-bin.zip
34
zipStoreBase=GRADLE_USER_HOME
45
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip

‎gradlew‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
#!/usr/bin/env sh
22

3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
319
##############################################################################
420
##
521
## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
2844
APP_BASE_NAME=`basename "$0"`
2945

3046
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31-
DEFAULT_JVM_OPTS=""
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
3248

3349
# Use the maximum available, or set MAX_FD != -1 to use that value.
3450
MAX_FD="maximum"

‎gradlew.bat‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem https://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
117
@if "%DEBUG%" == "" @echo off
218
@rem ##########################################################################
319
@rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
1430
set APP_HOME=%DIRNAME%
1531

1632
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17-
set DEFAULT_JVM_OPTS=
33+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
1834

1935
@rem Find java.exe
2036
if defined JAVA_HOME goto findJavaFromJavaHome

‎rsocket-core/gradle/dependency-locks/compileClasspath.lockfile‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# This is a Gradle generated file for dependency locking.
2+
# Manual edits can break the build and are not advised.
3+
# This file is expected to be part of source control.
4+
com.google.code.findbugs:jsr305:3.0.2
5+
io.netty:netty-buffer:4.1.37.Final
6+
io.netty:netty-common:4.1.37.Final
7+
io.reactivex.rxjava2:rxjava:2.2.12
8+
org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50
9+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50
10+
org.jetbrains.kotlin:kotlin-stdlib:1.3.50
11+
org.jetbrains:annotations:13.0
12+
org.reactivestreams:reactive-streams:1.0.2

‎rsocket-core/gradle/dependency-locks/kotlinCompilerClasspath.lockfile‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# This is a Gradle generated file for dependency locking.
2+
# Manual edits can break the build and are not advised.
3+
# This file is expected to be part of source control.
4+
org.jetbrains.intellij.deps:trove4j:1.0.20181211
5+
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.3.50
6+
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.3.50
7+
org.jetbrains.kotlin:kotlin-reflect:1.3.50
8+
org.jetbrains.kotlin:kotlin-script-runtime:1.3.50
9+
org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50
10+
org.jetbrains.kotlin:kotlin-stdlib:1.3.50
11+
org.jetbrains:annotations:13.0

‎rsocket-core/gradle/dependency-locks/kotlinCompilerPluginClasspath.lockfile‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# This is a Gradle generated file for dependency locking.
2+
# Manual edits can break the build and are not advised.
3+
# This file is expected to be part of source control.
4+
org.jetbrains.kotlin:kotlin-reflect:1.3.50
5+
org.jetbrains.kotlin:kotlin-script-runtime:1.3.50
6+
org.jetbrains.kotlin:kotlin-scripting-common:1.3.50
7+
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.3.50
8+
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.3.50
9+
org.jetbrains.kotlin:kotlin-scripting-jvm:1.3.50
10+
org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50
11+
org.jetbrains.kotlin:kotlin-stdlib:1.3.50
12+
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1
13+
org.jetbrains:annotations:13.0

0 commit comments

Comments
 (0)