Skip to content

Commit d7d3bd7

Browse files
committed
Update CI and tooling config
1 parent b735d84 commit d7d3bd7

File tree

8 files changed

+24
-27
lines changed

8 files changed

+24
-27
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ jobs:
1717
run: chmod +x gradlew
1818
- name: Build with Gradle
1919
run: |
20-
./gradlew clean build buildPlugin runPluginVerifier jacocoTestReport \
21-
-x :bpmn-intellij-plugin-commons:runPluginVerifier \
22-
-x :bpmn-intellij-plugin-core:runPluginVerifier
20+
./gradlew clean build \
21+
:flowable-intellij-plugin:buildPlugin :flowable-intellij-plugin:verifyPlugin \
22+
:camunda-intellij-plugin:buildPlugin :camunda-intellij-plugin:verifyPlugin \
23+
:activiti-intellij-plugin:buildPlugin :activiti-intellij-plugin:verifyPlugin
2324
- name: Upload coverage to Codecov
2425
uses: codecov/codecov-action@v1
2526
with:

activiti-intellij-plugin/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ dependencies {
3535
testImplementation "org.junit.jupiter:junit-jupiter-engine:$junitJupiter"
3636
testImplementation "org.junit.platform:junit-platform-runner:$junitPlatformRunner"
3737
testImplementation "org.amshove.kluent:kluent:$kluent"
38-
testImplementation "org.mockito:mockito-inline:$mockitoInline"
38+
testImplementation "org.mockito:mockito-core:$mockitoCore"
3939
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:$mockitoKotlin"
4040
}
4141

bpmn-intellij-plugin-common-tests/build.gradle

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,17 @@ sourceCompatibility = 17
1010

1111
repositories {
1212
mavenCentral()
13+
14+
intellijPlatform {
15+
defaultRepositories()
16+
}
1317
}
1418

1519
dependencies {
20+
intellijPlatform {
21+
intellijIdeaUltimate(intellijPlatformVersion)
22+
}
23+
1624
implementation project(":xml-parser-api")
1725
implementation project(":bpmn-intellij-plugin-core")
1826

@@ -22,14 +30,10 @@ dependencies {
2230

2331
implementation "org.junit.jupiter:junit-jupiter-api:$junitJupiter"
2432
implementation "org.amshove.kluent:kluent:$kluent"
25-
implementation "org.mockito:mockito-inline:$mockitoInline"
33+
implementation "org.mockito:mockito-core:$mockitoCore"
2634
implementation "com.nhaarman.mockitokotlin2:mockito-kotlin:$mockitoKotlin"
2735
}
2836

29-
intellijPlatform {
30-
version = intellijPlatform
31-
}
32-
3337
sourceSets {
3438
main.kotlin.srcDirs += 'src/main/kotlin'
3539
}

bpmn-intellij-plugin-commons/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ repositories {
1818

1919

2020
dependencies {
21-
implementation project(":xml-parser-api")
22-
implementation project(":bpmn-intellij-plugin-core")
23-
2421
intellijPlatform {
2522
intellijIdeaUltimate(intellijPlatformVersion)
2623
bundledPlugins(intellijPlatformPlugins)
2724
}
2825

26+
implementation project(":xml-parser-api")
27+
implementation project(":bpmn-intellij-plugin-core")
28+
2929
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
3030
implementation "com.fasterxml.jackson.module:jackson-module-kotlin:$jackson"
3131

@@ -35,7 +35,7 @@ dependencies {
3535
testImplementation "org.junit.jupiter:junit-jupiter-engine:$junitJupiter"
3636
testImplementation "org.junit.platform:junit-platform-runner:$junitPlatformRunner"
3737
testImplementation "org.amshove.kluent:kluent:$kluent"
38-
testImplementation "org.mockito:mockito-inline:$mockitoInline"
38+
testImplementation "org.mockito:mockito-core:$mockitoCore"
3939
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:$mockitoKotlin"
4040
}
4141

bpmn-intellij-plugin-core/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ repositories {
1717
}
1818

1919
dependencies {
20-
implementation project(":xml-parser-api")
21-
2220
intellijPlatform {
2321
intellijIdeaUltimate(intellijPlatformVersion)
2422
bundledPlugins(intellijPlatformPlugins)
2523
}
2624

25+
implementation project(":xml-parser-api")
26+
2727
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
2828
implementation("org.apache.xmlgraphics:batik-transcoder:1.16") { // JB has removed batik from IC 2023.2
2929
exclude group: 'xml-apis', module: 'xml-apis'
@@ -42,7 +42,7 @@ dependencies {
4242
testImplementation "org.junit.platform:junit-platform-runner:$junitPlatformRunner"
4343
testImplementation "org.junit.jupiter:junit-jupiter-params:$junitJupiter"
4444
testImplementation "org.amshove.kluent:kluent:$kluent"
45-
testImplementation "org.mockito:mockito-inline:$mockitoInline"
45+
testImplementation "org.mockito:mockito-core:$mockitoCore"
4646
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:$mockitoKotlin"
4747
}
4848

build.gradle

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ext {
2222
jsonPath = '2.8.0'
2323
junitPlatformRunner = '1.6.2'
2424
kluent = '1.68'
25-
mockitoInline = '5.2.0'
25+
mockitoCore = '5.16.1'
2626
mockitoKotlin = '2.2.0'
2727
}
2828

@@ -38,14 +38,6 @@ repositories {
3838
}
3939
}
4040

41-
intellijPlatform {
42-
version = intellijPlatform
43-
}
44-
45-
patchPluginXml.enabled = false
46-
verifyPlugin.enabled = false
47-
publishPlugin.enabled = false
48-
4941
dependencies {
5042
intellijPlatform {
5143
intellijIdeaUltimate(intellijPlatformVersion)

camunda-intellij-plugin/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ dependencies {
3535
testImplementation "org.junit.jupiter:junit-jupiter-engine:$junitJupiter"
3636
testImplementation "org.junit.platform:junit-platform-runner:$junitPlatformRunner"
3737
testImplementation "org.amshove.kluent:kluent:$kluent"
38-
testImplementation "org.mockito:mockito-inline:$mockitoInline"
38+
testImplementation "org.mockito:mockito-core:$mockitoCore"
3939
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:$mockitoKotlin"
4040
}
4141

flowable-intellij-plugin/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ dependencies {
3535
testImplementation "org.junit.jupiter:junit-jupiter-engine:$junitJupiter"
3636
testImplementation "org.junit.platform:junit-platform-runner:$junitPlatformRunner"
3737
testImplementation "org.amshove.kluent:kluent:$kluent"
38-
testImplementation "org.mockito:mockito-inline:$mockitoInline"
38+
testImplementation "org.mockito:mockito-core:$mockitoCore"
3939
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:$mockitoKotlin"
4040
}
4141

0 commit comments

Comments
 (0)