Skip to content

Commit 788b534

Browse files
committed
moved java classes to kotlin to avoid verification errors (#780)
Signed-off-by: Andre Dietisheim <[email protected]>
1 parent 1033840 commit 788b534

File tree

7 files changed

+20
-2
lines changed

7 files changed

+20
-2
lines changed

build.gradle.kts

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ plugins {
66
alias(libs.plugins.gradleIntelliJPlugin) // Gradle IntelliJ Plugin
77
alias(libs.plugins.kotlinJvm)
88
id("idea")
9+
id("java")
910
}
1011

1112
group = "com.redhat.devtools.intellij"
@@ -84,7 +85,7 @@ dependencies {
8485
}
8586

8687
intellijPlatform {
87-
buildSearchableOptions = false
88+
//buildSearchableOptions = false
8889

8990
pluginConfiguration {
9091
ideaVersion {
@@ -110,6 +111,14 @@ intellijPlatform {
110111
}
111112

112113
tasks {
114+
compileJava {
115+
options.isIncremental = false
116+
}
117+
118+
compileKotlin {
119+
incremental = false
120+
}
121+
113122
wrapper {
114123
gradleVersion = providers.gradleProperty("gradleVersion").get()
115124
}
@@ -134,6 +143,14 @@ configurations.all {
134143
}
135144

136145
sourceSets {
146+
main {
147+
java.srcDir("src/main/kotlin")
148+
kotlin.srcDir("src/main/kotlin")
149+
}
150+
test {
151+
java.srcDir("src/test/kotlin")
152+
kotlin.srcDir("src/test/kotlin")
153+
}
137154
create("it") {
138155
description = "integrationTest"
139156
compileClasspath += sourceSets.main.get().compileClasspath + sourceSets.test.get().compileClasspath

src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/mocks/Mocks.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
******************************************************************************/
1111
package com.redhat.devtools.intellij.kubernetes.model.mocks
1212

13+
import io.fabric8.kubernetes.client.Config
1314
import com.nhaarman.mockitokotlin2.any
1415
import com.nhaarman.mockitokotlin2.anyOrNull
1516
import com.nhaarman.mockitokotlin2.doAnswer
@@ -209,7 +210,7 @@ object Mocks {
209210
fun clientConfig(
210211
currentContext: NamedContext?,
211212
allContexts: List<NamedContext>,
212-
configuration: io.fabric8.kubernetes.client.Config = mock()
213+
configuration: Config = mock()
213214
): ClientConfig {
214215
val saveFuture: CompletableFuture<Boolean> = mock()
215216
return mock {

0 commit comments

Comments
 (0)