From 9014d79d52d49615b20c501d8aaaacba628fb2c6 Mon Sep 17 00:00:00 2001 From: gordonmu <70778512+gordonmu@users.noreply.github.com> Date: Thu, 1 Oct 2020 15:43:32 +0200 Subject: [PATCH] upgraded dependencies, downgraded jvm requirement to 1.8 again --- build.gradle | 40 +++++++++++++-------------- coio-tls/build.gradle | 4 +-- coio/src/test/kotlin/FileTests.kt | 4 +-- coio/src/test/kotlin/NioTestServer.kt | 2 +- 4 files changed, 24 insertions(+), 26 deletions(-) diff --git a/build.gradle b/build.gradle index 9bc28ab..96b020c 100644 --- a/build.gradle +++ b/build.gradle @@ -2,25 +2,23 @@ apply plugin: 'idea' apply plugin: 'maven' buildscript { - ext.kotlin_version = '1.3.50' - ext.kotlinxcoroutine_version = '1.3.2' - ext.kotlinlogging_version = '1.7.6' - ext.protobufgradle_version = '0.8.9' - ext.grpc_version = '1.24.0' - ext.tcnative_version = '2.0.25.Final' - ext.junit_version = '4.12' - ext.mockito_version = '1.10.19' + ext.kotlin_version = '1.4.0' + ext.kotlinxcoroutine_version = '1.3.9' + ext.kotlinlogging_version = '1.8.3' + ext.protobufgradle_version = '0.8.13' + ext.grpc_version = '1.31.1' + ext.tcnative_version = '2.0.34.Final' ext.jackson_version = '2.9.8' ext.protoc_version = '3.10.0' ext.kroto_version = '0.6.1' - ext.slf4j_version = '1.7.28' - ext.log4jslf4j_version = '2.12.1' - ext.junit5_version = '5.4.2' - ext.mockk_version = '1.9.3' - ext.assertj_version = '3.12.2' - ext.awaitility_version = '3.1.6' - ext.clikt_version = '2.1.0' - ext.doxygen_version = '0.5' + ext.slf4j_version = '1.7.30' + ext.log4jslf4j_version = '2.13.3' + ext.junit5_version = '5.6.2' + ext.mockk_version = '1.10.0' + ext.assertj_version = '3.17.2' + ext.awaitility_version = '4.0.3' + ext.clikt_version = '2.8.0' + ext.doxygen_version = '0.6' ext.repos = { @@ -71,7 +69,7 @@ allprojects { apply plugin: 'maven-publish' group 'com.github.gordonmu.coio' - version = '0.7.0' + version = '0.7.1' if (!project.hasProperty("release")) { version += '-SNAPSHOT' } @@ -79,14 +77,14 @@ allprojects { repositories repos compileKotlin { - kotlinOptions.jvmTarget = "11" + kotlinOptions.jvmTarget = "1.8" } compileTestKotlin { - kotlinOptions.jvmTarget = "11" + kotlinOptions.jvmTarget = "1.8" } java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } jar { diff --git a/coio-tls/build.gradle b/coio-tls/build.gradle index 4607bd4..b85917f 100644 --- a/coio-tls/build.gradle +++ b/coio-tls/build.gradle @@ -8,8 +8,8 @@ dependencies { implementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-jdk8', version: "$kotlinxcoroutine_version" implementation group: 'io.github.microutils', name: 'kotlin-logging', version: "$kotlinlogging_version" implementation group: 'org.slf4j', name: 'slf4j-api', version: "$slf4j_version" - implementation group: 'io.netty', name: 'netty-buffer', version: '4.1.45.Final' - implementation group: 'io.netty', name: 'netty-handler', version: '4.1.45.Final' + implementation group: 'io.netty', name: 'netty-buffer', version: '4.1.52.Final' + implementation group: 'io.netty', name: 'netty-handler', version: '4.1.52.Final' implementation group: 'com.github.marianobarrios', name: 'tls-channel', version: '0.4.0' runtime group: 'io.netty', name: 'netty-tcnative-boringssl-static', version: "$tcnative_version" diff --git a/coio/src/test/kotlin/FileTests.kt b/coio/src/test/kotlin/FileTests.kt index 1632a35..7d27e27 100644 --- a/coio/src/test/kotlin/FileTests.kt +++ b/coio/src/test/kotlin/FileTests.kt @@ -3,10 +3,10 @@ import kotlinx.coroutines.flow.count import kotlinx.coroutines.runBlocking import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThatCode -import org.junit.Assert import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance +import org.junit.jupiter.api.fail import java.io.File import java.io.IOException import java.nio.ByteBuffer @@ -111,7 +111,7 @@ class FileTests { assertThat(fc.filesCount).isEqualTo(1) assertThat(fc.bytesCount).isEqualTo(testFileSize) val h1 = fc.get("xyz", 1000000) { f -> - Assert.fail("should not regenerate cached file") + fail("should not regenerate cached file") } assertThat(fc.filesCount).isEqualTo(1) assertThat(fc.bytesCount).isEqualTo(testFileSize) diff --git a/coio/src/test/kotlin/NioTestServer.kt b/coio/src/test/kotlin/NioTestServer.kt index 7a10353..423aa68 100644 --- a/coio/src/test/kotlin/NioTestServer.kt +++ b/coio/src/test/kotlin/NioTestServer.kt @@ -3,7 +3,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import java.nio.ByteBuffer -fun main(args: Array) { +fun main() { runBlocking { val inc = CoIOTcp.listen(8775)