Update build badge, update kotlin in integration tests

* Bump Kotlin 1.9 used in integration tests to 1.9.23 * Update the build badge * Explicitly set FIREFOX_BIN for browser tests on MacOs
open-toast · Mar 17, 2024 · 2a7ee17 · 2a7ee17
1 parent 696f366
commit 2a7ee17
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
-        kotlin: [ 1.8.22, 1.9.20 ]
+        kotlin: [ 1.8.22, 1.9.23 ]
         jdk: [ 11, 17 ]
 
     runs-on: ${{ matrix.os }}

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # protokt 
 
-[![CircleCI](https://circleci.com/gh/open-toast/protokt.svg?style=svg)](https://circleci.com/gh/open-toast/protokt)
+[![Github Actions](https://github.com/open-toast/protokt/actions/workflows/ci.yml/badge.svg)](https://github.com/open-toast/protokt/actions/workflows/ci.yml)
 [![Maven Central](https://img.shields.io/maven-central/v/com.toasttab.protokt/protokt-runtime)](https://search.maven.org/artifact/com.toasttab.protokt/protokt-runtime)
 [![Gradle Portal](https://img.shields.io/maven-metadata/v/https/plugins.gradle.org/m2/com/toasttab/protokt/protokt-gradle-plugin/maven-metadata.xml.svg?label=gradle-portal&color=yellowgreen)](https://plugins.gradle.org/plugin/com.toasttab.protokt)
 

diff --git a/buildSrc/src/main/kotlin/LocalProtoktBuild.kt b/buildSrc/src/main/kotlin/LocalProtoktBuild.kt
@@ -53,6 +53,10 @@ fun KotlinJsTargetDsl.configureJsTests() {
         testTask {
             useKarma {
                 useFirefoxHeadless()
+
+                if (System.getProperty("os.name").lowercase().contains("mac")) {
+                    environment["FIREFOX_BIN"] = "/Applications/Firefox.app/Contents/MacOS/firefox"
+                }
             }
         }
     }

diff --git a/gradle-plugin-integration-test/multiplatform/build.gradle.kts b/gradle-plugin-integration-test/multiplatform/build.gradle.kts
@@ -31,6 +31,10 @@ kotlin {
             testTask {
                 useKarma {
                     useFirefoxHeadless()
+
+                    if (System.getProperty("os.name").lowercase().contains("mac")) {
+                        environment["FIREFOX_BIN"] = "/Applications/Firefox.app/Contents/MacOS/firefox"
+                    }
                 }
             }
         }
@@ -73,8 +77,10 @@ kotlin {
         all {
             compilations.all {
                 kotlinOptions {
-                    languageVersion = "1.8"
-                    apiVersion = "1.8"
+                    languageVersion = System.getProperty("kotlin-integration.version")
+                        ?.substringBeforeLast(".")
+                        ?: libs.versions.kotlin.get().substringBeforeLast(".")
+                    apiVersion = languageVersion
                 }
             }
         }