From f1e674dcec5f9e830cf3746483fa9dd3b063acda Mon Sep 17 00:00:00 2001 From: Danilo Pianini Date: Tue, 14 Nov 2023 12:33:26 +0100 Subject: [PATCH] chore(deps): update plugin multijvmtesting to v0.5.6 --- gradle/libs.versions.toml | 2 +- .../gradle/test/multiproject/app/build.gradle.kts | 1 + .../gradle/test/multiproject/build.gradle.kts | 7 +++++++ .../gradle/test/multiproject/buildSrc/build.gradle.kts | 7 +++++++ .../gradle/test/multiproject/buildSrc/settings.gradle.kts | 3 +++ .../gradle/test/multiproject/list/build.gradle.kts | 1 + .../gradle/test/multiproject/settings.gradle.kts | 3 --- .../gradle/test/multiproject/utilities/build.gradle.kts | 1 + .../org/danilopianini/gradle/test/test0/build.gradle.kts | 1 + 9 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 src/test/resources/org/danilopianini/gradle/test/multiproject/buildSrc/settings.gradle.kts diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 31493135..d6681e92 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,7 +23,7 @@ gitSemVer = { id = "org.danilopianini.git-sensitive-semantic-versioning", versio gradlePluginPublish = { id = "com.gradle.plugin-publish", version = "1.2.1" } kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } kotlin-qa = { id = "org.danilopianini.gradle-kotlin-qa", version = "0.54.0" } -multiJvmTesting = { id = "org.danilopianini.multi-jvm-test-plugin", version = "0.5.5" } +multiJvmTesting = { id = "org.danilopianini.multi-jvm-test-plugin", version = "0.5.6" } nexus-publish = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexus-publish" } publishOnCentral = { id = "org.danilopianini.publish-on-central", version = "5.0.19" } taskTree = { id = "com.dorongold.task-tree", version = "2.1.1" } diff --git a/src/test/resources/org/danilopianini/gradle/test/multiproject/app/build.gradle.kts b/src/test/resources/org/danilopianini/gradle/test/multiproject/app/build.gradle.kts index 088c8bf4..5f6448b4 100644 --- a/src/test/resources/org/danilopianini/gradle/test/multiproject/app/build.gradle.kts +++ b/src/test/resources/org/danilopianini/gradle/test/multiproject/app/build.gradle.kts @@ -6,6 +6,7 @@ plugins { id("multiproject.kotlin-application-conventions") + id("org.danilopianini.multi-jvm-test-plugin") } dependencies { diff --git a/src/test/resources/org/danilopianini/gradle/test/multiproject/build.gradle.kts b/src/test/resources/org/danilopianini/gradle/test/multiproject/build.gradle.kts index 65754a6b..fa77169c 100644 --- a/src/test/resources/org/danilopianini/gradle/test/multiproject/build.gradle.kts +++ b/src/test/resources/org/danilopianini/gradle/test/multiproject/build.gradle.kts @@ -1,9 +1,16 @@ plugins { id("org.danilopianini.publish-on-central") + id("org.danilopianini.multi-jvm-test-plugin") version "0.5.6" } group = "io.github.danysk" version = "0.1.0" +java { + toolchain { + languageVersion = JavaLanguageVersion.of(8) + } +} + /* subprojects { apply(plugin = "org.danilopianini.publish-on-central") diff --git a/src/test/resources/org/danilopianini/gradle/test/multiproject/buildSrc/build.gradle.kts b/src/test/resources/org/danilopianini/gradle/test/multiproject/buildSrc/build.gradle.kts index d6223a62..201a22f8 100644 --- a/src/test/resources/org/danilopianini/gradle/test/multiproject/buildSrc/build.gradle.kts +++ b/src/test/resources/org/danilopianini/gradle/test/multiproject/buildSrc/build.gradle.kts @@ -7,6 +7,7 @@ plugins { // Support convention plugins written in Kotlin. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build. `kotlin-dsl` + id("org.danilopianini.multi-jvm-test-plugin") version "0.5.6" } repositories { @@ -14,6 +15,12 @@ repositories { gradlePluginPortal() } +java { + toolchain { + languageVersion = JavaLanguageVersion.of(8) + } +} + dependencies { implementation("org.jetbrains.kotlin:kotlin-gradle-plugin") } diff --git a/src/test/resources/org/danilopianini/gradle/test/multiproject/buildSrc/settings.gradle.kts b/src/test/resources/org/danilopianini/gradle/test/multiproject/buildSrc/settings.gradle.kts new file mode 100644 index 00000000..1b72b152 --- /dev/null +++ b/src/test/resources/org/danilopianini/gradle/test/multiproject/buildSrc/settings.gradle.kts @@ -0,0 +1,3 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0" +} diff --git a/src/test/resources/org/danilopianini/gradle/test/multiproject/list/build.gradle.kts b/src/test/resources/org/danilopianini/gradle/test/multiproject/list/build.gradle.kts index ac93f8c1..b87972e0 100644 --- a/src/test/resources/org/danilopianini/gradle/test/multiproject/list/build.gradle.kts +++ b/src/test/resources/org/danilopianini/gradle/test/multiproject/list/build.gradle.kts @@ -6,4 +6,5 @@ plugins { id("multiproject.kotlin-library-conventions") + id("org.danilopianini.multi-jvm-test-plugin") } diff --git a/src/test/resources/org/danilopianini/gradle/test/multiproject/settings.gradle.kts b/src/test/resources/org/danilopianini/gradle/test/multiproject/settings.gradle.kts index 722268c5..9ba57a6f 100644 --- a/src/test/resources/org/danilopianini/gradle/test/multiproject/settings.gradle.kts +++ b/src/test/resources/org/danilopianini/gradle/test/multiproject/settings.gradle.kts @@ -7,8 +7,5 @@ * in the user manual at https://docs.gradle.org/7.4.2/userguide/multi_project_builds.html * This project uses @Incubating APIs which are subject to change. */ -plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0" -} rootProject.name = "multiproject" include("app", "list", "utilities") diff --git a/src/test/resources/org/danilopianini/gradle/test/multiproject/utilities/build.gradle.kts b/src/test/resources/org/danilopianini/gradle/test/multiproject/utilities/build.gradle.kts index d0d5c1a3..2cced699 100644 --- a/src/test/resources/org/danilopianini/gradle/test/multiproject/utilities/build.gradle.kts +++ b/src/test/resources/org/danilopianini/gradle/test/multiproject/utilities/build.gradle.kts @@ -6,6 +6,7 @@ plugins { id("multiproject.kotlin-library-conventions") + id("org.danilopianini.multi-jvm-test-plugin") } dependencies { diff --git a/src/test/resources/org/danilopianini/gradle/test/test0/build.gradle.kts b/src/test/resources/org/danilopianini/gradle/test/test0/build.gradle.kts index 7055e9cb..dc2de951 100644 --- a/src/test/resources/org/danilopianini/gradle/test/test0/build.gradle.kts +++ b/src/test/resources/org/danilopianini/gradle/test/test0/build.gradle.kts @@ -16,3 +16,4 @@ publishOnCentral { password.set("pwd") } } +