Skip to content

Commit

Permalink
upgraded dependencies, downgraded jvm requirement to 1.8 again
Browse files Browse the repository at this point in the history
  • Loading branch information
gordonmu committed Oct 1, 2020
1 parent 7203fb9 commit 9014d79
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 26 deletions.
40 changes: 19 additions & 21 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -71,22 +69,22 @@ allprojects {
apply plugin: 'maven-publish'

group 'com.github.gordonmu.coio'
version = '0.7.0'
version = '0.7.1'
if (!project.hasProperty("release")) {
version += '-SNAPSHOT'
}

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 {
Expand Down
4 changes: 2 additions & 2 deletions coio-tls/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions coio/src/test/kotlin/FileTests.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion coio/src/test/kotlin/NioTestServer.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import java.nio.ByteBuffer

fun main(args: Array<String>) {
fun main() {
runBlocking {
val inc = CoIOTcp.listen(8775)

Expand Down

0 comments on commit 9014d79

Please sign in to comment.