From 922060ed4496543ee8b8af382dc17989826bc365 Mon Sep 17 00:00:00 2001 From: Christian Oertel Date: Fri, 4 Oct 2024 15:39:02 +0200 Subject: [PATCH 1/5] JGiven-10: update dependencies Signed-off-by: Christian Oertel --- build.gradle.kts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index e71e812..bcccd32 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ val jetbrainsPublishToken: String? by project plugins { id("org.jetbrains.intellij") version "1.15.0" - kotlin("jvm") version "1.9.0" + id("org.jetbrains.kotlin.jvm") version "2.1.0-Beta1" } val kotlinVersion = project.getKotlinPluginVersion() @@ -38,10 +38,10 @@ dependencies { implementation(kotlin("stdlib", kotlinVersion)) testImplementation(kotlin("stdlib-jdk7", kotlinVersion)) - testImplementation("com.tngtech.jgiven:jgiven-junit:1.2.5") + testImplementation("com.tngtech.jgiven:jgiven-junit:1.3.0") testImplementation("com.tngtech.junit.dataprovider:junit4-dataprovider:2.10") - testImplementation("org.assertj:assertj-core:3.24.2") - testImplementation("org.mockito:mockito-core:5.1.1") + testImplementation("org.assertj:assertj-core:3.26.3") + testImplementation("org.mockito:mockito-core:5.14.1") } inline operator fun T.invoke(a: T.() -> Unit): T = apply(a) From 1ca5d478e0867b916d0c614f4abc631ca907a854 Mon Sep 17 00:00:00 2001 From: Christian Oertel Date: Fri, 4 Oct 2024 16:26:20 +0200 Subject: [PATCH 2/5] JGiven-10: migrate to new gradle provider Signed-off-by: Christian Oertel --- build.gradle.kts | 25 ++++++++++++++++++++----- src/main/resources/META-INF/plugin.xml | 4 ++-- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index bcccd32..6a9cc43 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,3 +1,4 @@ +import org.jetbrains.intellij.platform.gradle.TestFrameworkType import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion import org.jetbrains.kotlin.gradle.tasks.KotlinCompile @@ -5,7 +6,7 @@ val jetbrainsPublishUsername: String? by project val jetbrainsPublishToken: String? by project plugins { - id("org.jetbrains.intellij") version "1.15.0" + id("org.jetbrains.intellij.platform") version "2.1.0" id("org.jetbrains.kotlin.jvm") version "2.1.0-Beta1" } val kotlinVersion = project.getKotlinPluginVersion() @@ -26,15 +27,27 @@ tasks { repositories { mavenCentral() + + intellijPlatform { + defaultRepositories() + } } -intellij { - version.set("IC-2023.3") - pluginName.set("jgiven-intellij-plugin") - plugins.set(listOf("java")) +intellijPlatform { + pluginConfiguration { + name = "jgiven-intellij-plugin" + } } dependencies { + intellijPlatform { + intellijIdeaCommunity("2024.2") + bundledPlugin("com.intellij.java") + instrumentationTools() + + testFramework(TestFrameworkType.Plugin.Java) + } + implementation(kotlin("stdlib", kotlinVersion)) testImplementation(kotlin("stdlib-jdk7", kotlinVersion)) @@ -42,6 +55,8 @@ dependencies { testImplementation("com.tngtech.junit.dataprovider:junit4-dataprovider:2.10") testImplementation("org.assertj:assertj-core:3.26.3") testImplementation("org.mockito:mockito-core:5.14.1") + + testImplementation("org.opentest4j:opentest4j:1.3.0") } inline operator fun T.invoke(a: T.() -> Unit): T = apply(a) diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index ab605a7..dcb4ae4 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -1,11 +1,11 @@ JGivenPlugin JGiven - 0.0.19 + 0.0.20 Provides support for navigation between JGiven scenario states. - The plugin now supports IntelliJ version 2023.3. + The plugin now supports IntelliJ version 2024.2. TNG Technology Consulting GmbH From b2df23ce3fe33a47441a88bf576de6789c05ac59 Mon Sep 17 00:00:00 2001 From: Christian Oertel Date: Fri, 4 Oct 2024 16:33:14 +0200 Subject: [PATCH 3/5] JGiven-10: increase dependency in example Signed-off-by: Christian Oertel --- example/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/build.gradle b/example/build.gradle index ae80e1c..84ef805 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -5,6 +5,6 @@ repositories { } dependencies { - testImplementation 'com.tngtech.jgiven:jgiven-junit:1.2.0' + testImplementation 'com.tngtech.jgiven:jgiven-junit:1.3.0' testImplementation 'junit:junit:4.13.2' } \ No newline at end of file From 8aa7c50504f345b6ae77f0aa54dd00bdf9a0f73c Mon Sep 17 00:00:00 2001 From: Christian Oertel Date: Fri, 18 Oct 2024 09:06:47 +0200 Subject: [PATCH 4/5] JGiven-10: invoke review comments Signed-off-by: Christian Oertel --- build.gradle.kts | 2 +- example/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6a9cc43..2477694 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ val jetbrainsPublishToken: String? by project plugins { id("org.jetbrains.intellij.platform") version "2.1.0" - id("org.jetbrains.kotlin.jvm") version "2.1.0-Beta1" + id("org.jetbrains.kotlin.jvm") version "2.0.21" } val kotlinVersion = project.getKotlinPluginVersion() diff --git a/example/build.gradle b/example/build.gradle index 84ef805..8b53671 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -7,4 +7,4 @@ repositories { dependencies { testImplementation 'com.tngtech.jgiven:jgiven-junit:1.3.0' testImplementation 'junit:junit:4.13.2' -} \ No newline at end of file +} From 6f2a949bf748b8cdda460690bf6f3e45057641fa Mon Sep 17 00:00:00 2001 From: Christian Oertel Date: Wed, 23 Oct 2024 15:57:58 +0200 Subject: [PATCH 5/5] JGiven-10: update version and adapt plugin name Signed-off-by: Christian Oertel --- build.gradle.kts | 6 ------ src/main/resources/META-INF/plugin.xml | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2477694..c119e65 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -33,12 +33,6 @@ repositories { } } -intellijPlatform { - pluginConfiguration { - name = "jgiven-intellij-plugin" - } -} - dependencies { intellijPlatform { intellijIdeaCommunity("2024.2") diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index dcb4ae4..20620c7 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -1,7 +1,7 @@ JGivenPlugin JGiven - 0.0.20 + 0.0.21 Provides support for navigation between JGiven scenario states.