From cb465b1d014c65bf6ebe5306b7095726dfb00f5d Mon Sep 17 00:00:00 2001 From: Oleg Golberg Date: Thu, 14 Mar 2024 08:57:30 -0400 Subject: [PATCH 1/4] badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 79dc60b9b..15b2ab238 100644 --- 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) From 0f4c16484da8b9eb5b8f1b54f3a6e1ecf57f7162 Mon Sep 17 00:00:00 2001 From: Oleg Golberg Date: Thu, 14 Mar 2024 08:57:58 -0400 Subject: [PATCH 2/4] Minor kotlin update for integration tests --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ddbf1373d..283a2a5f3 100644 --- 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 }} From 1deda07e94115e9ecc2efdc8c0b2f08440c71df5 Mon Sep 17 00:00:00 2001 From: Oleg Golberg Date: Sun, 17 Mar 2024 09:07:36 -0400 Subject: [PATCH 3/4] fixup --- buildSrc/src/main/kotlin/LocalProtoktBuild.kt | 5 +++++ .../multiplatform/build.gradle.kts | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/LocalProtoktBuild.kt b/buildSrc/src/main/kotlin/LocalProtoktBuild.kt index fbe211ddd..5bf970404 100644 --- a/buildSrc/src/main/kotlin/LocalProtoktBuild.kt +++ b/buildSrc/src/main/kotlin/LocalProtoktBuild.kt @@ -19,6 +19,7 @@ import org.gradle.api.tasks.compile.JavaCompile import org.gradle.kotlin.dsl.get import org.gradle.kotlin.dsl.withType import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl +import org.jetbrains.kotlin.gradle.targets.js.testing.karma.KotlinKarma import protokt.v1.gradle.CODEGEN_NAME import protokt.v1.gradle.configureProtokt import java.io.File @@ -53,6 +54,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 index 104fa1d3e..163dfec6c 100644 --- 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 } } } From b9e93db6efd0cf3dfe1703d90aae31b173cb9f6b Mon Sep 17 00:00:00 2001 From: Oleg Golberg Date: Sun, 17 Mar 2024 09:12:47 -0400 Subject: [PATCH 4/4] lint --- buildSrc/src/main/kotlin/LocalProtoktBuild.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/LocalProtoktBuild.kt b/buildSrc/src/main/kotlin/LocalProtoktBuild.kt index 5bf970404..13b5cb55f 100644 --- a/buildSrc/src/main/kotlin/LocalProtoktBuild.kt +++ b/buildSrc/src/main/kotlin/LocalProtoktBuild.kt @@ -19,7 +19,6 @@ import org.gradle.api.tasks.compile.JavaCompile import org.gradle.kotlin.dsl.get import org.gradle.kotlin.dsl.withType import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl -import org.jetbrains.kotlin.gradle.targets.js.testing.karma.KotlinKarma import protokt.v1.gradle.CODEGEN_NAME import protokt.v1.gradle.configureProtokt import java.io.File