kotlin dependency upgrades

Author: yschimke

build.gradle

@@ -1,22 +1,22 @@
 buildscript {
-    ext.kotlin_version = '1.2.51'
-    repositories {
-        maven { url "http://dl.bintray.com/kotlin/kotlin-dev" }
-        mavenCentral()
-        jcenter()
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "com.github.shyiko:ktlint:0.24.0"
-    }
+  ext.kotlin_version = '1.3-M1'
+  repositories {
+    maven { url "http://dl.bintray.com/kotlin/kotlin-eap" }
+    mavenCentral()
+    jcenter()
+  }
+  dependencies {
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    classpath "com.github.shyiko:ktlint:0.27.0"
+  }
 }
 
 plugins {
-    id "com.gradle.build-scan" version "1.15.1"
-    id 'com.github.ben-manes.versions' version '0.20.0'
-    id 'net.nemerosa.versioning' version '2.7.1'
-    id 'io.codearte.nexus-staging' version '0.11.0'
-    id "org.jlleitschuh.gradle.ktlint" version "3.3.0"
+  id "com.gradle.build-scan" version "1.15.2"
+  id 'com.github.ben-manes.versions' version '0.20.0'
+  id 'net.nemerosa.versioning' version '2.7.1'
+  id 'io.codearte.nexus-staging' version '0.11.0'
+  id 'org.jmailen.kotlinter' version '1.16.0'
 }
 
 buildScan { licenseAgreementUrl = 'https://gradle.com/terms-of-service'; licenseAgree = 'yes' }
@@ -84,19 +84,20 @@ repositories {
   maven { url 'https://dl.bintray.com/reactivesocket/RSocket' }
   maven { url "https://oss.sonatype.org/content/repositories/releases" }
   maven { url "https://jitpack.io" }
+  maven { url "http://dl.bintray.com/kotlin/kotlin-eap" }
   mavenCentral()
   jcenter()
 }
 
 dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}"
-  implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.23.4'
-  implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-reactor:0.23.4'
+  implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.24.0-eap13'
+  implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-reactor:0.24.0-eap13'
 
 //  implementation 'io.projectreactor:reactor-core:Bismuth-SR10'
-  implementation 'io.rsocket:rsocket-transport-netty:0.11.3'
-  implementation 'io.rsocket:rsocket-transport-local:0.11.3'
-  implementation 'io.rsocket:rsocket-core:0.11.3'
+  implementation 'io.rsocket:rsocket-transport-netty:0.11.5'
+  implementation 'io.rsocket:rsocket-transport-local:0.11.5'
+  implementation 'io.rsocket:rsocket-core:0.11.5'
 //  implementation 'io.netty:netty-buffer:4.1.27.Final'
 //  implementation 'io.netty:netty-codec:4.1.27.Final'
 //  implementation 'io.netty:netty-codec-http:4.1.27.Final'
@@ -118,7 +119,7 @@ dependencies {
   implementation 'org.mortbay.jetty.alpn:alpn-boot:8.1.12.v20180117'
   implementation 'com.spotify:completable-futures:0.3.2'
 
-  implementation 'com.baulsupp:oksocial-output:4.9.0'
+  implementation 'com.baulsupp:oksocial-output:4.15.0'
 
   implementation 'org.slf4j:slf4j-jdk14:1.8.0-beta2'
 
@@ -145,24 +146,24 @@ test {
 }
 
 dependencyUpdates.resolutionStrategy = {
-    componentSelection { rules ->
-        rules.all { ComponentSelection selection ->
-            boolean rejected = (selection.candidate.group == "io.netty" && selection.candidate.version ==~ /5\..*/) ||
-            	(selection.candidate.version ==~ /.*(beta.*|M\d|alpha.*)/)
-            if (rejected) {
-                selection.reject('Release candidate')
-            }
-        }
+  componentSelection { rules ->
+    rules.all { ComponentSelection selection ->
+      boolean rejected = (selection.candidate.group == "io.netty" && selection.candidate.version ==~ /5\..*/) ||
+        (selection.candidate.version ==~ /.*(beta.*|M\d|alpha.*)/)
+      if (rejected) {
+        selection.reject('Release candidate')
+      }
     }
+  }
 }
 
 test {
-    useJUnitPlatform {
-        excludeTags 'slow'
-        includeEngines 'junit-jupiter', 'junit-vintage'
-    }
+  useJUnitPlatform {
+    excludeTags 'slow'
+    includeEngines 'junit-jupiter', 'junit-vintage'
+  }
 
-    failFast = true
+  failFast = true
 }
 
 kotlin {

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -2,5 +2,4 @@
 
 ./gradlew -q --console plain installDist
 
-JAVA_OPTS=-Xbootclasspath/p:$HOME/.m2/repository/org/mortbay/jetty/alpn/alpn-boot/8.1.9.v20160720/alpn-boot-8.1.9.v20160720.jar \
 ./build/install/rsocket-cli/bin/rsocket-cli "$@"

rsocket-cli

@@ -35,11 +35,11 @@ import io.rsocket.transport.TransportHeaderAware
 import io.rsocket.uri.UriTransportRegistry
 import io.rsocket.util.DefaultPayload
 import io.rsocket.util.EmptyPayload
-import kotlinx.coroutines.experimental.reactive.awaitFirst
-import kotlinx.coroutines.experimental.reactive.awaitFirstOrNull
-import kotlinx.coroutines.experimental.reactor.mono
-import kotlinx.coroutines.experimental.runBlocking
-import kotlinx.coroutines.experimental.withTimeout
+import kotlinx.coroutines.reactive.awaitFirst
+import kotlinx.coroutines.reactive.awaitFirstOrNull
+import kotlinx.coroutines.reactor.mono
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withTimeout
 import org.reactivestreams.Publisher
 import org.slf4j.LoggerFactory
 import reactor.core.publisher.Flux

src/main/kotlin/io/rsocket/cli/Main.kt

@@ -3,10 +3,12 @@ package io.rsocket.cli.http2
 import io.netty.buffer.ByteBuf
 import io.netty.buffer.Unpooled
 import io.netty.channel.ChannelHandlerContext
+import io.netty.handler.codec.LengthFieldBasedFrameDecoder
 import io.rsocket.DuplexConnection
 import io.rsocket.Frame
 import io.rsocket.exceptions.ConnectionCloseException
-import io.rsocket.transport.netty.RSocketLengthCodec
+import io.rsocket.frame.FrameHeaderFlyweight.FRAME_LENGTH_MASK
+import io.rsocket.frame.FrameHeaderFlyweight.FRAME_LENGTH_SIZE
 import org.eclipse.jetty.http.HttpFields
 import org.eclipse.jetty.http.HttpURI
 import org.eclipse.jetty.http.HttpVersion
@@ -112,8 +114,7 @@ class Http2DuplexConnection : DuplexConnection {
   private fun dataFrame(f: Frame): DataFrame =
     DataFrame(stream!!.id, f.content().nioBuffer(), false)
 
-  class MyRSocketLengthCodec : RSocketLengthCodec() {
-    @Throws(Exception::class)
+  class MyRSocketLengthCodec : LengthFieldBasedFrameDecoder(FRAME_LENGTH_MASK, 0, FRAME_LENGTH_SIZE, 0, 0) {
     public override fun decode(ctx: ChannelHandlerContext?, `in`: ByteBuf): ByteBuf? {
       return super.decode(ctx, `in`) as ByteBuf?
     }

src/main/kotlin/io/rsocket/cli/http2/Http2DuplexConnection.kt

@@ -10,7 +10,7 @@ import com.google.common.io.Files
 import io.airlift.airline.ParseException
 import io.netty.util.internal.logging.InternalLoggerFactory
 import io.netty.util.internal.logging.JdkLoggerFactory
-import kotlinx.coroutines.experimental.reactor.mono
+import kotlinx.coroutines.reactor.mono
 import reactor.core.publisher.Flux
 import reactor.core.publisher.Mono
 import java.io.File

src/main/kotlin/io/rsocket/cli/util.kt

@@ -7,12 +7,12 @@ import io.rsocket.RSocket
 import io.rsocket.RSocketFactory
 import io.rsocket.cli.LineInputPublishers
 import io.rsocket.cli.Main
-import io.rsocket.exceptions.ApplicationException
+import io.rsocket.exceptions.ApplicationErrorException
 import io.rsocket.transport.local.LocalClientTransport
 import io.rsocket.transport.local.LocalServerTransport
 import io.rsocket.util.DefaultPayload
-import kotlinx.coroutines.experimental.reactive.awaitFirstOrNull
-import kotlinx.coroutines.experimental.runBlocking
+import kotlinx.coroutines.reactive.awaitFirstOrNull
+import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Ignore
@@ -164,11 +164,11 @@ class BasicOperationTest {
 
     requestHandler = object : AbstractRSocket() {
       override fun requestResponse(payload: Payload?): Mono<Payload> {
-        return Mono.error(ApplicationException("server failure"))
+        return Mono.error(ApplicationErrorException("server failure"))
       }
     }
 
-    expectedShowError("error from server", ApplicationException("server failure"))
+    expectedShowError("error from server", ApplicationErrorException("server failure"))
 
     run()
 
@@ -207,15 +207,15 @@ class BasicOperationTest {
       override fun requestStream(payload: Payload): Flux<Payload> {
         val flux = Flux.range(1, 3)
           .map { DefaultPayload.create("i $it") }
-          .concatWith(Mono.error(ApplicationException("failed")))
+          .concatWith(Mono.error(ApplicationErrorException("failed")))
         return flux
       }
     }
 
     expectedShowOutput("i 1")
     expectedShowOutput("i 2")
     expectedShowOutput("i 3")
-    expectedShowError("error from server", ApplicationException("failed"))
+    expectedShowError("error from server", ApplicationErrorException("failed"))
 
     run()