Skip to content

Commit c76b6f6

Browse files
authored
Merge pull request #440 from keta1/other/deprecated
Code cleanup: remove deprecated code and unnecessary suppressions
2 parents da538a0 + 3a6bbce commit c76b6f6

File tree

9 files changed

+15
-31
lines changed

9 files changed

+15
-31
lines changed

multiplatform-markdown-renderer-code/src/commonMain/kotlin/com/mikepenz/markdown/compose/elements/MarkdownHighlightedCode.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ fun MarkdownHighlightedCode(
107107
language = language,
108108
code = code
109109
) {
110-
@Suppress("DEPRECATION")
111110
MarkdownBasicText(
112111
text = codeHighlights,
113112
style = style,

multiplatform-markdown-renderer-coil2/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ dependencies {
1414
commonMainCompileOnly(compose.runtime)
1515
commonMainCompileOnly(compose.ui)
1616

17-
"androidMainApi"(libs.coil2.core)
18-
}
17+
androidMainApi(libs.coil2.core)
18+
}

multiplatform-markdown-renderer-coil3/build.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,8 @@ android {
1212
dependencies {
1313
commonMainApi(projects.multiplatformMarkdownRenderer)
1414

15-
// TODO reverse once coil3 was released based on compose 1.8.0
1615
commonMainApi(libs.coil.core) {
1716
exclude(group = "org.jetbrains.compose.runtime")
1817
}
1918
commonMainCompileOnly(compose.runtime)
20-
commonMainCompileOnly(compose.runtimeSaveable)
21-
commonMainCompileOnly("org.jetbrains.compose.ui:ui-backhandler:1.8.2")
22-
}
19+
}

multiplatform-markdown-renderer/api/android/multiplatform-markdown-renderer.api

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -638,15 +638,13 @@ public final class com/mikepenz/markdown/model/NoOpImageTransformerImpl : com/mi
638638

639639
public final class com/mikepenz/markdown/model/PlaceholderConfig {
640640
public static final field $stable I
641-
public synthetic fun <init> (JIZILkotlin/jvm/internal/DefaultConstructorMarker;)V
642-
public synthetic fun <init> (JIZLkotlin/jvm/internal/DefaultConstructorMarker;)V
641+
public synthetic fun <init> (JIILkotlin/jvm/internal/DefaultConstructorMarker;)V
642+
public synthetic fun <init> (JILkotlin/jvm/internal/DefaultConstructorMarker;)V
643643
public final fun component1-NH-jbRc ()J
644644
public final fun component2-J6kI3mc ()I
645-
public final fun component3 ()Z
646-
public final fun copy-SodKFfM (JIZ)Lcom/mikepenz/markdown/model/PlaceholderConfig;
647-
public static synthetic fun copy-SodKFfM$default (Lcom/mikepenz/markdown/model/PlaceholderConfig;JIZILjava/lang/Object;)Lcom/mikepenz/markdown/model/PlaceholderConfig;
645+
public final fun copy-ZzTKgq8 (JI)Lcom/mikepenz/markdown/model/PlaceholderConfig;
646+
public static synthetic fun copy-ZzTKgq8$default (Lcom/mikepenz/markdown/model/PlaceholderConfig;JIILjava/lang/Object;)Lcom/mikepenz/markdown/model/PlaceholderConfig;
648647
public fun equals (Ljava/lang/Object;)Z
649-
public final fun getAnimate ()Z
650648
public final fun getSize-NH-jbRc ()J
651649
public final fun getVerticalAlign-J6kI3mc ()I
652650
public fun hashCode ()I

multiplatform-markdown-renderer/api/jvm/multiplatform-markdown-renderer.api

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -638,15 +638,13 @@ public final class com/mikepenz/markdown/model/NoOpImageTransformerImpl : com/mi
638638

639639
public final class com/mikepenz/markdown/model/PlaceholderConfig {
640640
public static final field $stable I
641-
public synthetic fun <init> (JIZILkotlin/jvm/internal/DefaultConstructorMarker;)V
642-
public synthetic fun <init> (JIZLkotlin/jvm/internal/DefaultConstructorMarker;)V
641+
public synthetic fun <init> (JIILkotlin/jvm/internal/DefaultConstructorMarker;)V
642+
public synthetic fun <init> (JILkotlin/jvm/internal/DefaultConstructorMarker;)V
643643
public final fun component1-NH-jbRc ()J
644644
public final fun component2-J6kI3mc ()I
645-
public final fun component3 ()Z
646-
public final fun copy-SodKFfM (JIZ)Lcom/mikepenz/markdown/model/PlaceholderConfig;
647-
public static synthetic fun copy-SodKFfM$default (Lcom/mikepenz/markdown/model/PlaceholderConfig;JIZILjava/lang/Object;)Lcom/mikepenz/markdown/model/PlaceholderConfig;
645+
public final fun copy-ZzTKgq8 (JI)Lcom/mikepenz/markdown/model/PlaceholderConfig;
646+
public static synthetic fun copy-ZzTKgq8$default (Lcom/mikepenz/markdown/model/PlaceholderConfig;JIILjava/lang/Object;)Lcom/mikepenz/markdown/model/PlaceholderConfig;
648647
public fun equals (Ljava/lang/Object;)Z
649-
public final fun getAnimate ()Z
650648
public final fun getSize-NH-jbRc ()J
651649
public final fun getVerticalAlign-J6kI3mc ()I
652650
public fun hashCode ()I

multiplatform-markdown-renderer/api/multiplatform-markdown-renderer.klib.api

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -587,19 +587,16 @@ final class com.mikepenz.markdown.model/NoOpImageTransformerImpl : com.mikepenz.
587587
}
588588

589589
final class com.mikepenz.markdown.model/PlaceholderConfig { // com.mikepenz.markdown.model/PlaceholderConfig|null[0]
590-
constructor <init>(androidx.compose.ui.geometry/Size, androidx.compose.ui.text/PlaceholderVerticalAlign = ..., kotlin/Boolean = ...) // com.mikepenz.markdown.model/PlaceholderConfig.<init>|<init>(androidx.compose.ui.geometry.Size;androidx.compose.ui.text.PlaceholderVerticalAlign;kotlin.Boolean){}[0]
590+
constructor <init>(androidx.compose.ui.geometry/Size, androidx.compose.ui.text/PlaceholderVerticalAlign = ...) // com.mikepenz.markdown.model/PlaceholderConfig.<init>|<init>(androidx.compose.ui.geometry.Size;androidx.compose.ui.text.PlaceholderVerticalAlign){}[0]
591591

592-
final val animate // com.mikepenz.markdown.model/PlaceholderConfig.animate|{}animate[0]
593-
final fun <get-animate>(): kotlin/Boolean // com.mikepenz.markdown.model/PlaceholderConfig.animate.<get-animate>|<get-animate>(){}[0]
594592
final val size // com.mikepenz.markdown.model/PlaceholderConfig.size|{}size[0]
595593
final fun <get-size>(): androidx.compose.ui.geometry/Size // com.mikepenz.markdown.model/PlaceholderConfig.size.<get-size>|<get-size>(){}[0]
596594
final val verticalAlign // com.mikepenz.markdown.model/PlaceholderConfig.verticalAlign|{}verticalAlign[0]
597595
final fun <get-verticalAlign>(): androidx.compose.ui.text/PlaceholderVerticalAlign // com.mikepenz.markdown.model/PlaceholderConfig.verticalAlign.<get-verticalAlign>|<get-verticalAlign>(){}[0]
598596

599597
final fun component1(): androidx.compose.ui.geometry/Size // com.mikepenz.markdown.model/PlaceholderConfig.component1|component1(){}[0]
600598
final fun component2(): androidx.compose.ui.text/PlaceholderVerticalAlign // com.mikepenz.markdown.model/PlaceholderConfig.component2|component2(){}[0]
601-
final fun component3(): kotlin/Boolean // com.mikepenz.markdown.model/PlaceholderConfig.component3|component3(){}[0]
602-
final fun copy(androidx.compose.ui.geometry/Size = ..., androidx.compose.ui.text/PlaceholderVerticalAlign = ..., kotlin/Boolean = ...): com.mikepenz.markdown.model/PlaceholderConfig // com.mikepenz.markdown.model/PlaceholderConfig.copy|copy(androidx.compose.ui.geometry.Size;androidx.compose.ui.text.PlaceholderVerticalAlign;kotlin.Boolean){}[0]
599+
final fun copy(androidx.compose.ui.geometry/Size = ..., androidx.compose.ui.text/PlaceholderVerticalAlign = ...): com.mikepenz.markdown.model/PlaceholderConfig // com.mikepenz.markdown.model/PlaceholderConfig.copy|copy(androidx.compose.ui.geometry.Size;androidx.compose.ui.text.PlaceholderVerticalAlign){}[0]
603600
final fun equals(kotlin/Any?): kotlin/Boolean // com.mikepenz.markdown.model/PlaceholderConfig.equals|equals(kotlin.Any?){}[0]
604601
final fun hashCode(): kotlin/Int // com.mikepenz.markdown.model/PlaceholderConfig.hashCode|hashCode(){}[0]
605602
final fun toString(): kotlin/String // com.mikepenz.markdown.model/PlaceholderConfig.toString|toString(){}[0]

multiplatform-markdown-renderer/src/commonMain/kotlin/com/mikepenz/markdown/compose/elements/MarkdownTable.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ fun MarkdownTableBasicText(
162162
overflow: TextOverflow = TextOverflow.Ellipsis,
163163
annotatorSettings: AnnotatorSettings = annotatorSettings(),
164164
) {
165-
@Suppress("DEPRECATION")
166165
MarkdownBasicText(
167166
text = content.buildMarkdownAnnotatedString(
168167
textNode = cell,

multiplatform-markdown-renderer/src/commonMain/kotlin/com/mikepenz/markdown/compose/elements/MarkdownText.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,7 @@ fun MarkdownText(
138138
}
139139
}
140140
.let {
141-
// for backwards compatibility still check the `animate` property
142-
@Suppress("DEPRECATION")
143-
if (placeholderState.animate) animations.animateTextSize(it) else it
141+
animations.animateTextSize(it)
144142
},
145143
style = style,
146144
inlineContent = remember(inlineContent.inlineContent, placeholderState, transformer, imageState) {

multiplatform-markdown-renderer/src/commonMain/kotlin/com/mikepenz/markdown/model/ImageTransformer.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ interface ImageTransformer {
5555
data class PlaceholderConfig(
5656
val size: Size,
5757
val verticalAlign: PlaceholderVerticalAlign = PlaceholderVerticalAlign.Bottom,
58-
@Deprecated("This parameter is not used anymore and will be removed in the future.")
59-
val animate: Boolean = true,
6058
)
6159

6260
@Immutable
@@ -68,4 +66,4 @@ data class ImageData(
6866
val contentScale: ContentScale = ContentScale.Fit,
6967
val alpha: Float = DefaultAlpha,
7068
val colorFilter: ColorFilter? = null,
71-
)
69+
)

0 commit comments

Comments
 (0)