Skip to content

Commit

Permalink
build: upgrade kotlin support to 1.6+ 🍩
Browse files Browse the repository at this point in the history
  • Loading branch information
oldratlee committed Nov 19, 2023
1 parent e6ac337 commit 7a10aa6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<a href="https://github.com/foldright/cffu/actions/workflows/ci.yaml"><img src="https://img.shields.io/github/actions/workflow/status/foldright/cffu/ci.yaml?branch=main&logo=github&logoColor=white&label=strong ci" alt="Github Workflow Build Status"></a>
<a href="https://app.codecov.io/gh/foldright/cffu/tree/main"><img src="https://img.shields.io/codecov/c/github/foldright/cffu/main?logo=codecov&logoColor=white" alt="Codecov"></a>
<a href="https://openjdk.java.net/"><img src="https://img.shields.io/badge/Java-8+-339933?logo=openjdk&logoColor=white" alt="Java support"></a>
<a href="https://kotlinlang.org"><img src="https://img.shields.io/badge/Kotlin-1.5+-7F52FF.svg?logo=kotlin&logoColor=white" alt="Kotlin"></a>
<a href="https://kotlinlang.org"><img src="https://img.shields.io/badge/Kotlin-1.6+-7F52FF.svg?logo=kotlin&logoColor=white" alt="Kotlin"></a>
<a href="https://www.apache.org/licenses/LICENSE-2.0.html"><img src="https://img.shields.io/github/license/foldright/cffu?color=4D7A97&logo=apache" alt="License"></a>
<a href="https://foldright.io/cffu/apidocs/"><img src="https://img.shields.io/github/release/foldright/cffu?label=javadoc&color=339933&logo=microsoft-academic&logoColor=white" alt="Javadocs"></a>
<a href="https://foldright.io/cffu/dokka/"><img src="https://img.shields.io/github/release/foldright/cffu?label=dokka&color=339933&logo=kotlin&logoColor=white" alt="dokka"></a>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@

<!-- testing dependencies versions -->
<junit5.version>5.10.1</junit5.version>
<kotest.version>5.5.5</kotest.version>
<kotest.version>5.8.0</kotest.version>
</properties>

<dependencies>
Expand Down
10 changes: 3 additions & 7 deletions scripts/integration_test
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,16 @@ 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

########################################
# 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
Expand Down

0 comments on commit 7a10aa6

Please sign in to comment.