From 7a10aa61d720d518c28e882125f9e228756994d2 Mon Sep 17 00:00:00 2001 From: Jerry Lee Date: Thu, 9 Nov 2023 15:43:29 +0800 Subject: [PATCH] =?UTF-8?q?build:=20upgrade=20`kotlin`=20support=20to=20`1?= =?UTF-8?q?.6+`=20=F0=9F=8D=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- pom.xml | 2 +- scripts/integration_test | 10 +++------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index e2f3ea5c..098a82e4 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Github Workflow Build Status Codecov Java support -Kotlin +Kotlin License Javadocs dokka diff --git a/pom.xml b/pom.xml index 7c455b26..675ba4fa 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ 5.10.1 - 5.5.5 + 5.8.0 diff --git a/scripts/integration_test b/scripts/integration_test index a3e8b9fe..d9463874 100755 --- a/scripts/integration_test +++ b/scripts/integration_test @@ -46,9 +46,6 @@ jvu::switch_to_jdk "$default_build_jdk_version" cu::log_then_run scripts/gen_CffuApiCompatibilityTest.sh -cu::head_line_echo "check kotlin compiler api version 1.5 with kotlin 1.8 " -mvu::mvn_cmd clean test-compile -D kotlin.version=1.8.22 -D kotlin.compiler.apiVersion=1.5 - cu::head_line_echo "build and test with Java $default_build_jdk_version: $JAVA_HOME" mvu::mvn_cmd clean install @@ -56,10 +53,9 @@ mvu::mvn_cmd clean install # test by multiply version jdks ######################################## -readonly KT_VERSION_FOR_JAVA8=1.5.0 -readonly KT_VERSION_FOR_JAVA11=1.6.0 -readonly KT_VERSION_FOR_JAVA17=1.7.0 -readonly KT_VERSION_FOR_JAVA20=1.8.22 +readonly KT_VERSION_FOR_JAVA8=1.6.0 +readonly KT_VERSION_FOR_JAVA11=1.7.0 +readonly KT_VERSION_FOR_JAVA17=1.8.0 # about CI env var # https://docs.github.com/en/actions/learn-github-actions/variables#default-environment-variables