Skip to content

Commit 2181d8d

Browse files
MatkovIvanMatkovIvan
committed
Regenerate desktop & klib API baselines for the ui-skiko extraction
Record the post-extraction public API. ui-graphics/ui-text baselines shrink by the relocation-only removals (the Skia-interop extensions and helpers now published from ui-skiko under identical package + facade names); no other public declarations change. Desktop binary compatibility is preserved through the @file:JvmName facade anchors and the HIDDEN split-facade shims in ui-skiko.
1 parent 1e8028b commit 2181d8d

4 files changed

Lines changed: 37 additions & 148 deletions

File tree

‎compose/ui/ui-graphics/api/desktop/ui-graphics.api‎

Lines changed: 22 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -315,38 +315,6 @@ public final class androidx/compose/ui/graphics/DegreesKt {
315315
public static final fun degrees (F)F
316316
}
317317

318-
public final class androidx/compose/ui/graphics/DesktopColorFilter_desktopKt {
319-
public static final fun asDesktopColorFilter (Landroidx/compose/ui/graphics/ColorFilter;)Lorg/jetbrains/skia/ColorFilter;
320-
public static final fun toComposeColorFilter (Lorg/jetbrains/skia/ColorFilter;)Landroidx/compose/ui/graphics/ColorFilter;
321-
}
322-
323-
public final class androidx/compose/ui/graphics/DesktopImageAsset_desktopKt {
324-
public static final fun asDesktopBitmap (Landroidx/compose/ui/graphics/ImageBitmap;)Lorg/jetbrains/skia/Bitmap;
325-
public static final fun asImageBitmap (Lorg/jetbrains/skia/Bitmap;)Landroidx/compose/ui/graphics/ImageBitmap;
326-
public static final fun asImageBitmap (Lorg/jetbrains/skia/Image;)Landroidx/compose/ui/graphics/ImageBitmap;
327-
}
328-
329-
public final class androidx/compose/ui/graphics/DesktopImageConverters_desktopKt {
330-
public static final fun asAwtImage (Landroidx/compose/ui/graphics/ImageBitmap;)Ljava/awt/image/BufferedImage;
331-
public static final fun asAwtImage-Ug5Nnss (Landroidx/compose/ui/graphics/painter/Painter;Landroidx/compose/ui/unit/Density;Landroidx/compose/ui/unit/LayoutDirection;J)Ljava/awt/Image;
332-
public static synthetic fun asAwtImage-Ug5Nnss$default (Landroidx/compose/ui/graphics/painter/Painter;Landroidx/compose/ui/unit/Density;Landroidx/compose/ui/unit/LayoutDirection;JILjava/lang/Object;)Ljava/awt/Image;
333-
public static final fun asPainter (Ljava/awt/image/BufferedImage;)Landroidx/compose/ui/graphics/painter/Painter;
334-
public static final fun toAwtImage (Landroidx/compose/ui/graphics/ImageBitmap;)Ljava/awt/image/BufferedImage;
335-
public static final fun toAwtImage-Ug5Nnss (Landroidx/compose/ui/graphics/painter/Painter;Landroidx/compose/ui/unit/Density;Landroidx/compose/ui/unit/LayoutDirection;J)Ljava/awt/Image;
336-
public static synthetic fun toAwtImage-Ug5Nnss$default (Landroidx/compose/ui/graphics/painter/Painter;Landroidx/compose/ui/unit/Density;Landroidx/compose/ui/unit/LayoutDirection;JILjava/lang/Object;)Ljava/awt/Image;
337-
public static final fun toComposeBitmap (Ljava/awt/image/BufferedImage;)Landroidx/compose/ui/graphics/ImageBitmap;
338-
public static final fun toComposeImageBitmap (Ljava/awt/image/BufferedImage;)Landroidx/compose/ui/graphics/ImageBitmap;
339-
public static final fun toPainter (Ljava/awt/image/BufferedImage;)Landroidx/compose/ui/graphics/painter/Painter;
340-
}
341-
342-
public final class androidx/compose/ui/graphics/DesktopPathEffect_desktopKt {
343-
public static final fun asDesktopPathEffect (Landroidx/compose/ui/graphics/PathEffect;)Lorg/jetbrains/skia/PathEffect;
344-
}
345-
346-
public final class androidx/compose/ui/graphics/DesktopPath_desktopKt {
347-
public static final fun asDesktopPath (Landroidx/compose/ui/graphics/Path;)Lorg/jetbrains/skia/Path;
348-
}
349-
350318
public abstract interface annotation class androidx/compose/ui/graphics/ExperimentalGraphicsApi : java/lang/annotation/Annotation {
351319
}
352320

@@ -645,6 +613,11 @@ public final class androidx/compose/ui/graphics/PaintKt {
645613
public static final field DefaultAlpha F
646614
}
647615

616+
public final class androidx/compose/ui/graphics/Paint_nonAndroidKt {
617+
public static final fun Paint ()Landroidx/compose/ui/graphics/Paint;
618+
public static final fun isSupported-s9anfk8 (I)Z
619+
}
620+
648621
public final class androidx/compose/ui/graphics/PaintingStyle {
649622
public static final field Companion Landroidx/compose/ui/graphics/PaintingStyle$Companion;
650623
public static final synthetic fun box-impl (I)Landroidx/compose/ui/graphics/PaintingStyle;
@@ -814,6 +787,11 @@ public final class androidx/compose/ui/graphics/PathIterator$ConicEvaluation : j
814787
public static fun values ()[Landroidx/compose/ui/graphics/PathIterator$ConicEvaluation;
815788
}
816789

790+
public final class androidx/compose/ui/graphics/PathIterator_nonAndroidKt {
791+
public static final fun PathIterator (Landroidx/compose/ui/graphics/Path;Landroidx/compose/ui/graphics/PathIterator$ConicEvaluation;F)Landroidx/compose/ui/graphics/PathIterator;
792+
public static synthetic fun PathIterator$default (Landroidx/compose/ui/graphics/Path;Landroidx/compose/ui/graphics/PathIterator$ConicEvaluation;FILjava/lang/Object;)Landroidx/compose/ui/graphics/PathIterator;
793+
}
794+
817795
public final class androidx/compose/ui/graphics/PathKt {
818796
public static final fun copy (Landroidx/compose/ui/graphics/Path;)Landroidx/compose/ui/graphics/Path;
819797
}
@@ -831,6 +809,10 @@ public final class androidx/compose/ui/graphics/PathMeasure$DefaultImpls {
831809
public static synthetic fun getSegment$default (Landroidx/compose/ui/graphics/PathMeasure;FFLandroidx/compose/ui/graphics/Path;ZILjava/lang/Object;)Z
832810
}
833811

812+
public final class androidx/compose/ui/graphics/PathMeasure_nonAndroidKt {
813+
public static final fun PathMeasure ()Landroidx/compose/ui/graphics/PathMeasure;
814+
}
815+
834816
public final class androidx/compose/ui/graphics/PathOperation {
835817
public static final field Companion Landroidx/compose/ui/graphics/PathOperation$Companion;
836818
public static final synthetic fun box-impl (I)Landroidx/compose/ui/graphics/PathOperation;
@@ -894,6 +876,10 @@ public final class androidx/compose/ui/graphics/PathSvgKt {
894876
public static synthetic fun toSvg$default (Landroidx/compose/ui/graphics/Path;ZILjava/lang/Object;)Ljava/lang/String;
895877
}
896878

879+
public final class androidx/compose/ui/graphics/Path_nonAndroidKt {
880+
public static final fun Path ()Landroidx/compose/ui/graphics/Path;
881+
}
882+
897883
public final class androidx/compose/ui/graphics/PixelMap {
898884
public static final field $stable I
899885
public fun <init> ([IIIII)V
@@ -939,16 +925,9 @@ public final class androidx/compose/ui/graphics/RectangleShapeKt {
939925
public static final fun getRectangleShape ()Landroidx/compose/ui/graphics/Shape;
940926
}
941927

942-
public final class androidx/compose/ui/graphics/Rects_skikoKt {
943-
public static final fun toComposeRect (Lorg/jetbrains/skia/Rect;)Landroidx/compose/ui/geometry/Rect;
944-
public static final fun toSkiaRRect (Landroidx/compose/ui/geometry/RoundRect;)Lorg/jetbrains/skia/RRect;
945-
public static final fun toSkiaRect (Landroidx/compose/ui/geometry/Rect;)Lorg/jetbrains/skia/Rect;
946-
}
947-
948928
public abstract class androidx/compose/ui/graphics/RenderEffect {
949929
public static final field $stable I
950930
public final fun asSkiaImageFilter ()Lorg/jetbrains/skia/ImageFilter;
951-
protected abstract fun createImageFilter ()Lorg/jetbrains/skia/ImageFilter;
952931
public fun isSupported ()Z
953932
}
954933

@@ -1014,66 +993,6 @@ public abstract interface class androidx/compose/ui/graphics/Shape {
1014993
public abstract fun createOutline-Pq9zytI (JLandroidx/compose/ui/unit/LayoutDirection;Landroidx/compose/ui/unit/Density;)Landroidx/compose/ui/graphics/Outline;
1015994
}
1016995

1017-
public final class androidx/compose/ui/graphics/SkiaBackedCanvas_skikoKt {
1018-
public static final fun asComposeCanvas (Lorg/jetbrains/skia/Canvas;)Landroidx/compose/ui/graphics/Canvas;
1019-
public static final fun getNativeCanvas (Landroidx/compose/ui/graphics/Canvas;)Lorg/jetbrains/skia/Canvas;
1020-
public static final fun getSkiaCanvas (Landroidx/compose/ui/graphics/Canvas;)Lorg/jetbrains/skia/Canvas;
1021-
}
1022-
1023-
public final class androidx/compose/ui/graphics/SkiaBackedPaint_skikoKt {
1024-
public static final fun Paint ()Landroidx/compose/ui/graphics/Paint;
1025-
public static final fun asComposePaint (Lorg/jetbrains/skia/Paint;)Landroidx/compose/ui/graphics/Paint;
1026-
public static final fun getSkiaPaint (Landroidx/compose/ui/graphics/Paint;)Lorg/jetbrains/skia/Paint;
1027-
public static final fun isSupported-s9anfk8 (I)Z
1028-
}
1029-
1030-
public final class androidx/compose/ui/graphics/SkiaBackedPathEffect_skikoKt {
1031-
public static final fun asComposePathEffect (Lorg/jetbrains/skia/PathEffect;)Landroidx/compose/ui/graphics/PathEffect;
1032-
public static final fun asSkiaPathEffect (Landroidx/compose/ui/graphics/PathEffect;)Lorg/jetbrains/skia/PathEffect;
1033-
}
1034-
1035-
public final class androidx/compose/ui/graphics/SkiaBackedPathMeasure_skikoKt {
1036-
public static final fun PathMeasure ()Landroidx/compose/ui/graphics/PathMeasure;
1037-
public static final fun asComposePathEffect (Lorg/jetbrains/skia/PathMeasure;)Landroidx/compose/ui/graphics/PathMeasure;
1038-
public static final fun asSkiaPathMeasure (Landroidx/compose/ui/graphics/PathMeasure;)Lorg/jetbrains/skia/PathMeasure;
1039-
}
1040-
1041-
public final class androidx/compose/ui/graphics/SkiaBackedPath_skikoKt {
1042-
public static final fun Path ()Landroidx/compose/ui/graphics/Path;
1043-
public static final fun asComposePath (Lorg/jetbrains/skia/Path;)Landroidx/compose/ui/graphics/Path;
1044-
public static final fun asSkiaPath (Landroidx/compose/ui/graphics/Path;)Lorg/jetbrains/skia/Path;
1045-
}
1046-
1047-
public final class androidx/compose/ui/graphics/SkiaBackedRenderEffect_skikoKt {
1048-
public static final fun asComposeRenderEffect (Lorg/jetbrains/skia/ImageFilter;)Landroidx/compose/ui/graphics/RenderEffect;
1049-
public static final fun getSkiaImageFilter (Landroidx/compose/ui/graphics/RenderEffect;)Lorg/jetbrains/skia/ImageFilter;
1050-
}
1051-
1052-
public final class androidx/compose/ui/graphics/SkiaColorFilter_skikoKt {
1053-
public static final fun asComposeColorFilter (Lorg/jetbrains/skia/ColorFilter;)Landroidx/compose/ui/graphics/ColorFilter;
1054-
public static final fun asSkiaColorFilter (Landroidx/compose/ui/graphics/ColorFilter;)Lorg/jetbrains/skia/ColorFilter;
1055-
}
1056-
1057-
public final class androidx/compose/ui/graphics/SkiaImageAsset_skikoKt {
1058-
public static final fun asComposeImageBitmap (Lorg/jetbrains/skia/Bitmap;)Landroidx/compose/ui/graphics/ImageBitmap;
1059-
public static final fun asSkiaBitmap (Landroidx/compose/ui/graphics/ImageBitmap;)Lorg/jetbrains/skia/Bitmap;
1060-
public static final fun toComposeImageBitmap (Lorg/jetbrains/skia/Image;)Landroidx/compose/ui/graphics/ImageBitmap;
1061-
}
1062-
1063-
public final class androidx/compose/ui/graphics/SkiaPathIterator_skikoKt {
1064-
public static final fun PathIterator (Landroidx/compose/ui/graphics/Path;Landroidx/compose/ui/graphics/PathIterator$ConicEvaluation;F)Landroidx/compose/ui/graphics/PathIterator;
1065-
public static synthetic fun PathIterator$default (Landroidx/compose/ui/graphics/Path;Landroidx/compose/ui/graphics/PathIterator$ConicEvaluation;FILjava/lang/Object;)Landroidx/compose/ui/graphics/PathIterator;
1066-
}
1067-
1068-
public final class androidx/compose/ui/graphics/SkiaShader_skikoKt {
1069-
public static final fun asComposeShader (Lorg/jetbrains/skia/Shader;)Landroidx/compose/ui/graphics/Shader;
1070-
public static final fun getSkiaShader (Landroidx/compose/ui/graphics/Shader;)Lorg/jetbrains/skia/Shader;
1071-
}
1072-
1073-
public final class androidx/compose/ui/graphics/SkiaTileMode_skikoKt {
1074-
public static final fun isSupported-0vamqd0 (I)Z
1075-
}
1076-
1077996
public final class androidx/compose/ui/graphics/SolidColor : androidx/compose/ui/graphics/Brush, androidx/compose/ui/graphics/Interpolatable {
1078997
public static final field $stable I
1079998
public synthetic fun <init> (JLkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -1172,6 +1091,10 @@ public final class androidx/compose/ui/graphics/TileMode$Companion {
11721091
public final fun getRepeated-3opZhB0 ()I
11731092
}
11741093

1094+
public final class androidx/compose/ui/graphics/TileMode_nonAndroidKt {
1095+
public static final fun isSupported-0vamqd0 (I)Z
1096+
}
1097+
11751098
public final class androidx/compose/ui/graphics/VertexMode {
11761099
public static final field Companion Landroidx/compose/ui/graphics/VertexMode$Companion;
11771100
public static final synthetic fun box-impl (I)Landroidx/compose/ui/graphics/VertexMode;

0 commit comments

Comments
 (0)