From a7a689841f150daff88a4c6f7ec63baf1d700bc4 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Tue, 28 Mar 2023 14:08:30 +0200 Subject: [PATCH] [Gradle] Convert KotlinTargetHierarchy.ModuleName to regular class (instead of data) ^KT-56654 Verification Pending --- .../api/kotlin-gradle-plugin-api.api | 3 --- .../kotlin/gradle/plugin/KotlinTargetHierarchy.kt | 11 ++++++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api b/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api index fc0b19d2b71..207a34d53f8 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api +++ b/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api @@ -1060,9 +1060,6 @@ public abstract interface class org/jetbrains/kotlin/gradle/plugin/KotlinTargetH public final class org/jetbrains/kotlin/gradle/plugin/KotlinTargetHierarchy$ModuleName { public static final field Companion Lorg/jetbrains/kotlin/gradle/plugin/KotlinTargetHierarchy$ModuleName$Companion; public fun (Ljava/lang/String;)V - public final fun component1 ()Ljava/lang/String; - public final fun copy (Ljava/lang/String;)Lorg/jetbrains/kotlin/gradle/plugin/KotlinTargetHierarchy$ModuleName; - public static synthetic fun copy$default (Lorg/jetbrains/kotlin/gradle/plugin/KotlinTargetHierarchy$ModuleName;Ljava/lang/String;ILjava/lang/Object;)Lorg/jetbrains/kotlin/gradle/plugin/KotlinTargetHierarchy$ModuleName; public fun equals (Ljava/lang/Object;)Z public final fun getName ()Ljava/lang/String; public fun hashCode ()I diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetHierarchy.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetHierarchy.kt index 6e70bb592fd..1bc77c4562b 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetHierarchy.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetHierarchy.kt @@ -7,9 +7,18 @@ package org.jetbrains.kotlin.gradle.plugin interface KotlinTargetHierarchy { - data class ModuleName(val name: String) { + class ModuleName(val name: String) { override fun toString(): String = name + override fun equals(other: Any?): Boolean { + if (other !is ModuleName) return false + return this.name == other.name + } + + override fun hashCode(): Int { + return name.hashCode() + } + companion object { val main = ModuleName("main") val test = ModuleName("test")