diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2801eb4a..7faca89d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,8 +12,6 @@ jobs:
strategy:
fail-fast: false
matrix:
- IDEA_VERSION: [ 2023.2, 2024.1, LATEST-EAP-SNAPSHOT ]
- WITH_IDEA_PLUGINS: [ true, false ]
include:
- IDEA_VERSION: 2023.2
SCALA_PLUGIN_VERSION: 2023.2.23
@@ -24,9 +22,9 @@ jobs:
- IDEA_VERSION: 2024.1
SCALA_PLUGIN_VERSION: 2024.1.1
WITH_IDEA_PLUGINS: true
- - IDEA_VERSION: 2024.1
- SCALA_PLUGIN_VERSION: 2024.1.1
- WITH_IDEA_PLUGINS: false
+ - IDEA_VERSION: 2024.2.1
+ SCALA_PLUGIN_VERSION: 2024.2.1
+ WITH_IDEA_PLUGINS: true
- IDEA_VERSION: LATEST-EAP-SNAPSHOT
SCALA_PLUGIN_VERSION: 2024.2.1
WITH_IDEA_PLUGINS: true
diff --git a/build.gradle b/build.gradle
index 9879194a..727f11ab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ println "***********************************************************************
println " Running build for ideaVersion: $ideaVersion and scalaPluginVersion: $scalaPluginVersion with Groovy plugin ${groovyOn} and Scala plugin ${scalaOn}"
println "*****************************************************************************************************************************************************************"
def isRunInCI=Boolean.valueOf(System.getenv('CI'))
-def testedProjects = subprojects + rootProject
+
repositories {
mavenCentral()
intellijPlatform {
@@ -85,6 +85,7 @@ allprojects {
includeNoLocationClasses = true
excludes = ["jdk.internal.*"]
}
+ useJUnitPlatform()
}
}
@@ -130,37 +131,44 @@ dependencies {
// "TemplateWordInPluginId,ForbiddenPluginIdPrefix"
// )
// }
- testFramework(TestFrameworkType.Platform.INSTANCE)
+// testFramework(TestFrameworkType.Platform.INSTANCE)
+ testFramework(TestFrameworkType.JUnit5.INSTANCE)
testFramework(TestFrameworkType.Plugin.Java.INSTANCE)
+ pluginModule(implementation(project(':testme-intellij-common')))
+ pluginModule(implementation(project(':testme-intellij-groovy')))
+ pluginModule(implementation(project(':testme-intellij-scala')))
}
- testImplementation 'junit:junit:4.13.2'
- implementation(project(':testme-intellij-common')) {
- exclude group: 'com.jetbrains', module: 'ideaIC'
- exclude group: 'org.jetbrains.plugins', module: 'junit'
- exclude group: 'org.jetbrains.plugins', module: 'properties'
- exclude group: 'org.jetbrains.plugins', module: 'Groovy'
- }
- implementation(project(':testme-intellij-groovy')) {
- exclude group: 'com.jetbrains', module: 'ideaIC'
- exclude group: 'org.jetbrains.plugins', module: 'junit'
- exclude group: 'org.jetbrains.plugins', module: 'properties'
- exclude group: 'org.jetbrains.plugins', module: 'Groovy'
- }
- implementation(project(':testme-intellij-scala')) {
- exclude group: 'com.jetbrains', module: 'ideaIC'
- exclude group: 'org.jetbrains.plugins', module: 'junit'
- exclude group: 'org.jetbrains.plugins', module: 'properties'
- exclude group: 'org.jetbrains.plugins', module: 'Groovy'
- exclude group: 'org.jetbrains.plugins', module: 'Scala'
- }
-
+// implementation(project(':testme-intellij-common')) {
+// exclude group: 'com.jetbrains', module: 'ideaIC'
+// exclude group: 'org.jetbrains.plugins', module: 'junit'
+// exclude group: 'org.jetbrains.plugins', module: 'properties'
+// exclude group: 'org.jetbrains.plugins', module: 'Groovy'
+// }
+// implementation(project(':testme-intellij-groovy')) {
+// exclude group: 'com.jetbrains', module: 'ideaIC'
+// exclude group: 'org.jetbrains.plugins', module: 'junit'
+// exclude group: 'org.jetbrains.plugins', module: 'properties'
+// exclude group: 'org.jetbrains.plugins', module: 'Groovy'
+// }
+// implementation(project(':testme-intellij-scala')) {
+// exclude group: 'com.jetbrains', module: 'ideaIC'
+// exclude group: 'org.jetbrains.plugins', module: 'junit'
+// exclude group: 'org.jetbrains.plugins', module: 'properties'
+// exclude group: 'org.jetbrains.plugins', module: 'Groovy'
+// exclude group: 'org.jetbrains.plugins', module: 'Scala'
+// }
+//
compileOnly 'org.projectlombok:lombok:1.18.20'
annotationProcessor 'org.projectlombok:lombok:1.18.20'
+ testCompileOnly group: 'org.scala-lang', name: 'scala-library', version: '2.11.12'
testImplementation 'org.mockito:mockito-core:4.3.1'
testImplementation("org.spockframework:spock-core:2.3-groovy-3.0")
- testCompileOnly group: 'org.scala-lang', name: 'scala-library', version: '2.11.12'
+
+ testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1'
+ testImplementation 'junit:junit:4.13.2'
+ testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
}
def javadocHeader = ""
diff --git a/settings.gradle b/settings.gradle
index ae568fb2..1ce1a8cd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,5 +6,5 @@ pluginManagement {
}
}
rootProject.name = 'testme-intellij'
-include 'testme-intellij-common', 'testme-intellij-groovy', 'testme-intellij-scala'
+include ':testme-intellij-common', ':testme-intellij-groovy', ':testme-intellij-scala'
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 59b3cc37..5a8115c4 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -29,8 +29,8 @@
com.intellij.modules.java
JUnit
- org.intellij.groovy
- org.intellij.scala
+ org.intellij.groovy
+ org.intellij.scala
diff --git a/testme-intellij-groovy/build.gradle b/testme-intellij-groovy/build.gradle
index e136cc11..4c0fbf1a 100644
--- a/testme-intellij-groovy/build.gradle
+++ b/testme-intellij-groovy/build.gradle
@@ -9,11 +9,11 @@ repositories {
}
}
-intellijPlatform {
- pluginConfiguration {
- name = 'TestMe-groovy'
- }
-}
+//intellijPlatform {
+// pluginConfiguration {
+// name = 'TestMe-groovy'
+// }
+//}
def enabledPlugins = ['com.intellij.java','org.intellij.groovy']
dependencies {
diff --git a/testme-intellij-scala/build.gradle b/testme-intellij-scala/build.gradle
index c21ac58f..b783ef97 100644
--- a/testme-intellij-scala/build.gradle
+++ b/testme-intellij-scala/build.gradle
@@ -9,11 +9,11 @@ repositories {
}
}
-intellijPlatform {
- pluginConfiguration {
- name = 'TestMe-scala'
- }
-}
+//intellijPlatform {
+// pluginConfiguration {
+// name = 'TestMe-scala'
+// }
+//}
dependencies {
intellijPlatform {