From baf2918d49dec2c9e5b51cc220fdbc6a7a30e748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Wed, 18 Feb 2026 23:36:20 +0100 Subject: [PATCH] build(gradle): Migrate from JVM toolchains to Tapmoc --- compat/compat-arrow/build.gradle.kts | 6 +++--- compat/compat-filesystem/build.gradle.kts | 20 ++++++++++++++++++-- compat/compat-java-time/build.gradle.kts | 20 ++++++++++++++++++-- compat/compat-ktor/build.gradle.kts | 4 ++-- compat/compat-parameterize/build.gradle.kts | 6 +++--- runners/runner-kotest/build.gradle.kts | 4 ++-- runners/runner-kotlin-test/build.gradle.kts | 4 ++-- runners/runner-testballoon/build.gradle.kts | 6 +++--- suite/build.gradle.kts | 6 +++--- 9 files changed, 54 insertions(+), 22 deletions(-) diff --git a/compat/compat-arrow/build.gradle.kts b/compat/compat-arrow/build.gradle.kts index 1af3b88..05b505b 100644 --- a/compat/compat-arrow/build.gradle.kts +++ b/compat/compat-arrow/build.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2025, OpenSavvy and contributors. + * Copyright (c) 2025-2026, OpenSavvy and contributors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -77,6 +77,6 @@ library { } } -kotlin { - jvmToolchain(11) +tapmoc { + java(11) } diff --git a/compat/compat-filesystem/build.gradle.kts b/compat/compat-filesystem/build.gradle.kts index 3f68d87..c3604b3 100644 --- a/compat/compat-filesystem/build.gradle.kts +++ b/compat/compat-filesystem/build.gradle.kts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2026, OpenSavvy and contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + plugins { alias(opensavvyConventions.plugins.base) alias(opensavvyConventions.plugins.kotlin.library) @@ -31,6 +47,6 @@ library { } } -kotlin { - jvmToolchain(11) +tapmoc { + java(11) } diff --git a/compat/compat-java-time/build.gradle.kts b/compat/compat-java-time/build.gradle.kts index 940498d..497e9ff 100644 --- a/compat/compat-java-time/build.gradle.kts +++ b/compat/compat-java-time/build.gradle.kts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2026, OpenSavvy and contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + plugins { alias(opensavvyConventions.plugins.base) alias(opensavvyConventions.plugins.kotlin.library) @@ -31,6 +47,6 @@ library { } } -kotlin { - jvmToolchain(11) +tapmoc { + java(11) } diff --git a/compat/compat-ktor/build.gradle.kts b/compat/compat-ktor/build.gradle.kts index 53e2f6f..f85eb16 100644 --- a/compat/compat-ktor/build.gradle.kts +++ b/compat/compat-ktor/build.gradle.kts @@ -91,6 +91,6 @@ library { } } -kotlin { - jvmToolchain(11) +tapmoc { + java(11) } diff --git a/compat/compat-parameterize/build.gradle.kts b/compat/compat-parameterize/build.gradle.kts index daa5ac5..ead6ef1 100644 --- a/compat/compat-parameterize/build.gradle.kts +++ b/compat/compat-parameterize/build.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2025, OpenSavvy and contributors. + * Copyright (c) 2025-2026, OpenSavvy and contributors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -74,6 +74,6 @@ library { } } -kotlin { - jvmToolchain(11) +tapmoc { + java(11) } diff --git a/runners/runner-kotest/build.gradle.kts b/runners/runner-kotest/build.gradle.kts index e2acbd2..77d30b6 100644 --- a/runners/runner-kotest/build.gradle.kts +++ b/runners/runner-kotest/build.gradle.kts @@ -102,6 +102,6 @@ library { } } -kotlin { - jvmToolchain(11) +tapmoc { + java(11) } diff --git a/runners/runner-kotlin-test/build.gradle.kts b/runners/runner-kotlin-test/build.gradle.kts index 08c6171..b022fc0 100644 --- a/runners/runner-kotlin-test/build.gradle.kts +++ b/runners/runner-kotlin-test/build.gradle.kts @@ -70,6 +70,6 @@ library { } } -kotlin { - jvmToolchain(11) +tapmoc { + java(11) } diff --git a/runners/runner-testballoon/build.gradle.kts b/runners/runner-testballoon/build.gradle.kts index 166b8e5..eb6dbf6 100644 --- a/runners/runner-testballoon/build.gradle.kts +++ b/runners/runner-testballoon/build.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2025, OpenSavvy and contributors. + * Copyright (c) 2025-2026, OpenSavvy and contributors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -77,6 +77,6 @@ library { } } -kotlin { - jvmToolchain(11) +tapmoc { + java(11) } diff --git a/suite/build.gradle.kts b/suite/build.gradle.kts index a95ad7c..a9f1eb0 100644 --- a/suite/build.gradle.kts +++ b/suite/build.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2025, OpenSavvy and contributors. + * Copyright (c) 2025-2026, OpenSavvy and contributors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -83,6 +83,6 @@ library { } } -kotlin { - jvmToolchain(11) +tapmoc { + java(11) } -- 2.51.2