Skip to content

Commit

Permalink
Upgrade some dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
guenhter committed Aug 11, 2019
1 parent 9e5440b commit c3bde2d
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 47 deletions.
31 changes: 17 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
buildscript {
ext.kotlin_version = '1.3.30'
ext.kotlin_version = '1.3.41'

repositories {
jcenter()
}

dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.netflix.nebula:nebula-release-plugin:6.1.0'
classpath 'com.netflix.nebula:nebula-bintray-plugin:3.5.2'
classpath('org.jfrog.buildinfo:build-info-extractor-gradle:4.5.4') {
classpath 'com.netflix.nebula:nebula-release-plugin:11.0.0'
classpath 'com.netflix.nebula:nebula-bintray-plugin:6.0.6'
classpath('org.jfrog.buildinfo:build-info-extractor-gradle:4.9.8') {
force = true
}
}
}

plugins {
id 'com.github.ben-manes.versions' version '0.17.0'
id 'com.github.ben-manes.versions' version '0.22.0'
}


allprojects {
group = 'actor.proto'

Expand All @@ -30,20 +29,24 @@ allprojects {
subprojects {
apply plugin: 'kotlin'

ext.coroutines_version = "1.2.2"
ext.protobuf_version = "3.9.1"
ext.grpc_version = "1.22.1"
ext.slf4j_version = "1.7.26"
ext.awaitility_version = "3.1.6"
ext.kotlin_logging_version = "1.7.3"
ext.jctools_version = "2.1.2"
ext.javax_annotations_version = "1.3.2"

repositories {
jcenter()
}

dependencies {
compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: kotlin_version
compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8', version: kotlin_version

testCompile group: 'org.jetbrains.kotlin', name: 'kotlin-test-junit', version: kotlin_version
testCompile group: 'junit', name: 'junit', version:'4.12'
}

kotlin {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"

testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
testImplementation "junit:junit:4.12"
}

compileKotlin {
Expand Down
16 changes: 8 additions & 8 deletions examples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ apply plugin: 'application'
mainClassName = "actor.proto.examples.inprocessbenchmark.InProcessBenchmarkKt"

dependencies {
implementation 'org.jctools:jctools-core:2.1.2'
implementation 'com.google.protobuf:protobuf-java:3.7.1'
implementation 'org.slf4j:slf4j-simple:1.7.26'
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.0"
implementation "org.jctools:jctools-core:${jctools_version}"
implementation "com.google.protobuf:protobuf-java:${protobuf_version}"
implementation "org.slf4j:slf4j-simple:${slf4j_version}"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${coroutines_version}"

implementation project(':proto-actor')
implementation project(':proto-router')
implementation project(':proto-remote')
implementation project(':proto-mailbox')
implementation project(":proto-actor")
implementation project(":proto-router")
implementation project(":proto-remote")
implementation project(":proto-mailbox")
}
15 changes: 8 additions & 7 deletions proto-actor/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ jar {
}

dependencies {
api group: 'com.google.protobuf', name: 'protobuf-java', version:'3.7.1'
api project(':proto-mailbox')
implementation 'io.github.microutils:kotlin-logging:1.6.26'
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.0"
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.2.0'
testImplementation 'org.slf4j:slf4j-simple:1.7.26'
testImplementation 'org.awaitility:awaitility:3.1.6'
api "com.google.protobuf:protobuf-java:${protobuf_version}"
api project(":proto-mailbox")
implementation "io.github.microutils:kotlin-logging:${kotlin_logging_version}"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${coroutines_version}"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:${coroutines_version}"

testImplementation "org.slf4j:slf4j-simple:${slf4j_version}"
testImplementation "org.awaitility:awaitility:${awaitility_version}"
}
6 changes: 3 additions & 3 deletions proto-mailbox/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ artifact {
}

dependencies {
api 'org.jctools:jctools-core:2.1.2'
implementation 'org.slf4j:slf4j-api:1.7.26'
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.0"
api "org.jctools:jctools-core:${jctools_version}"
implementation "org.slf4j:slf4j-api:${slf4j_version}"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${coroutines_version}"
}
20 changes: 10 additions & 10 deletions proto-remote/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ jar {
}

dependencies {
api group: 'io.grpc', name: 'grpc-netty', version:'1.20.0'
api group: 'io.grpc', name: 'grpc-protobuf', version:'1.20.0'
api group: 'io.grpc', name: 'grpc-stub', version:'1.20.0'
api group: 'org.jctools', name: 'jctools-core', version:'2.1.2'
implementation 'com.google.protobuf:protobuf-java-util:3.7.1'
implementation 'io.github.microutils:kotlin-logging:1.6.26'
implementation 'javax.annotation:javax.annotation-api:1.3.2'
api "io.grpc:grpc-netty:${grpc_version}"
api "io.grpc:grpc-protobuf:${grpc_version}"
api "io.grpc:grpc-stub:${grpc_version}"
api "org.jctools:jctools-core:${jctools_version}"
implementation "com.google.protobuf:protobuf-java-util:${protobuf_version}"
implementation "io.github.microutils:kotlin-logging:${kotlin_logging_version}"
implementation "javax.annotation:javax.annotation-api:${javax_annotations_version}"

api project(':proto-actor')
api project(':proto-mailbox')
api project(":proto-actor")
api project(":proto-mailbox")

testImplementation 'org.slf4j:slf4j-simple:1.7.26'
testImplementation "org.slf4j:slf4j-simple:${slf4j_version}"
}
10 changes: 5 additions & 5 deletions proto-router/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ artifact {
}

dependencies {
api project(':proto-actor')
api project(':proto-mailbox')
api 'com.google.protobuf:protobuf-java:3.7.1'
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.0"
api project(":proto-actor")
api project(":proto-mailbox")
api "com.google.protobuf:protobuf-java:${protobuf_version}"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${coroutines_version}"

testImplementation 'org.slf4j:slf4j-simple:1.7.26'
testImplementation "org.slf4j:slf4j-simple:${slf4j_version}"
}

0 comments on commit c3bde2d

Please sign in to comment.