Skip to content

fix: correct incompatibilities with IC-2024.1 (#719) #720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 20, 2024
Merged

fix: correct incompatibilities with IC-2024.1 (#719) #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jetBrainsToken=invalid
jetBrainsChannel=stable
intellijPluginVersion=1.16.1
kotlinJvmPluginVersion=1.8.0
intellijCommonVersion=1.9.3
intellijCommonVersion=1.9.4-SNAPSHOT
telemetryPluginVersion=1.1.0.52
kotlin.stdlib.default.dependency = false
kotlinVersionIdea221=1.6.21
Expand Down
5 changes: 2 additions & 3 deletions src/main/kotlin/com/redhat/devtools/intellij/kubernetes/model/util/ResourceUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
******************************************************************************/
package com.redhat.devtools.intellij.kubernetes.model.util

import com.intellij.openapi.diagnostic.logger
import com.intellij.openapi.diagnostic.Logger
import io.fabric8.kubernetes.api.model.HasMetadata
import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionSpec
import io.fabric8.kubernetes.client.utils.ApiVersionUtil
Expand All @@ -20,7 +20,6 @@ import io.fabric8.kubernetes.model.annotation.Group
import io.fabric8.kubernetes.model.annotation.Version
import io.fabric8.kubernetes.model.util.Helper
import java.util.stream.Collectors
import org.apache.tools.ant.util.ResourceUtils

const val MARKER_WILL_BE_DELETED = "willBeDeleted"
const val API_GROUP_VERSION_DELIMITER = '/'
Expand Down Expand Up @@ -245,7 +244,7 @@ fun getHighestPriorityVersion(spec: CustomResourceDefinitionSpec): String? {
val versions = spec.versions.map { it.name }
val version = KubernetesVersionPriority.highestPriority(versions)
if (version == null) {
logger<ResourceUtils>().warn(
Logger.getInstance("ResourceUtils").warn(
"Could not find version with highest priority in ${spec.group}/${spec.names.kind}."
)
}
Expand Down