Revert "fix: allow multiple configs listed in KUBECONFIG (redhat-deve…

…loper#779)" This reverts commit d5972d2. Signed-off-by: Andre Dietisheim <[email protected]>
adietish · Oct 25, 2024 · f4c47b5 · f4c47b5
1 parent adc3742
commit f4c47b5
Show file tree

Hide file tree

Showing 14 changed files with 432 additions and 3,653 deletions.
diff --git a/build.gradle b/build.gradle
@@ -17,17 +17,6 @@ sourceSets {
         compileClasspath += sourceSets.main.output + configurations.runtimeClasspath
         runtimeClasspath += output + compileClasspath
     }
-    main {
-        java.srcDirs("src/main/java")
-        kotlin.srcDirs("src/main/kotlin")
-    }
-    test {
-        java.srcDirs("src/test/java")
-        kotlin.srcDirs("src/test/kotlin")
-        // #779: unit tests need to see kubernetes-client classes in src/main/java
-        compileClasspath += sourceSets.main.output + configurations.runtimeClasspath
-        runtimeClasspath += output + compileClasspath
-    }
 }
 
 task integrationTest(type: Test) {

diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ jetBrainsToken=invalid
 jetBrainsChannel=stable
 intellijPluginVersion=1.16.1
 kotlinJvmPluginVersion=1.8.0
-intellijCommonVersion=1.9.7-SNAPSHOT
+intellijCommonVersion=1.9.6
 telemetryPluginVersion=1.1.0.52
 kotlin.stdlib.default.dependency = false
 kotlinVersion=1.6.21

diff --git a/src/main/java/io/fabric8/kubernetes/client/Config.java b/src/main/java/io/fabric8/kubernetes/client/Config.java
diff --git a/src/main/java/io/fabric8/kubernetes/client/KubeConfigFile.java b/src/main/java/io/fabric8/kubernetes/client/KubeConfigFile.java
diff --git a/src/main/java/io/fabric8/kubernetes/client/internal/KubeConfigUtils.java b/src/main/java/io/fabric8/kubernetes/client/internal/KubeConfigUtils.java