moved java classes to kotlin to avoid verification errors (#780)

Signed-off-by: Andre Dietisheim <[email protected]>
redhat-developer · Oct 24, 2024 · 714b309 · 714b309
1 parent 1033840
commit 714b309
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 1 deletion.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
     alias(libs.plugins.gradleIntelliJPlugin) // Gradle IntelliJ Plugin
     alias(libs.plugins.kotlinJvm)
     id("idea")
+    id("java")
 }
 
 group = "com.redhat.devtools.intellij"
@@ -110,6 +111,14 @@ intellijPlatform {
 }
 
 tasks {
+    compileJava {
+        options.isIncremental = false
+    }
+
+    compileKotlin {
+        incremental = false
+    }
+
     wrapper {
         gradleVersion = providers.gradleProperty("gradleVersion").get()
     }
@@ -134,6 +143,14 @@ configurations.all {
 }
 
 sourceSets {
+    main {
+        java.srcDir("src/main/kotlin")
+        kotlin.srcDir("src/main/kotlin")
+    }
+    test {
+        java.srcDir("src/test/kotlin")
+        kotlin.srcDir("src/test/kotlin")
+    }
     create("it") {
         description = "integrationTest"
         compileClasspath += sourceSets.main.get().compileClasspath + sourceSets.test.get().compileClasspath

diff --git a/.../io/fabric8/kubernetes/client/Config.java → .../io/fabric8/kubernetes/client/Config.java b/.../io/fabric8/kubernetes/client/Config.java → .../io/fabric8/kubernetes/client/Config.java
diff --git a/...ic8/kubernetes/client/KubeConfigFile.java → ...ic8/kubernetes/client/KubeConfigFile.java b/...ic8/kubernetes/client/KubeConfigFile.java → ...ic8/kubernetes/client/KubeConfigFile.java
diff --git a/...etes/client/internal/KubeConfigUtils.java → ...etes/client/internal/KubeConfigUtils.java b/...etes/client/internal/KubeConfigUtils.java → ...etes/client/internal/KubeConfigUtils.java
diff --git a/...s/client/utils/OpenIDConnectionUtils.java → ...s/client/utils/OpenIDConnectionUtils.java b/...s/client/utils/OpenIDConnectionUtils.java → ...s/client/utils/OpenIDConnectionUtils.java
diff --git a/...abric8/kubernetes/client/utils/Utils.java → ...abric8/kubernetes/client/utils/Utils.java b/...abric8/kubernetes/client/utils/Utils.java → ...abric8/kubernetes/client/utils/Utils.java
diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/mocks/Mocks.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/mocks/Mocks.kt
@@ -10,6 +10,7 @@
  ******************************************************************************/
 package com.redhat.devtools.intellij.kubernetes.model.mocks
 
+import io.fabric8.kubernetes.client.Config
 import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.anyOrNull
 import com.nhaarman.mockitokotlin2.doAnswer
@@ -209,7 +210,7 @@ object Mocks {
     fun clientConfig(
         currentContext: NamedContext?,
         allContexts: List<NamedContext>,
-        configuration: io.fabric8.kubernetes.client.Config = mock()
+        configuration: Config = mock()
     ): ClientConfig {
         val saveFuture: CompletableFuture<Boolean> = mock()
         return mock {