From e9bd6fbd538146b3c55ccf67eb959ef544b3785e Mon Sep 17 00:00:00 2001 From: Stephanie Gawroriski Date: Sun, 5 Feb 2023 20:35:48 +0000 Subject: [PATCH] Move some Exported to use API. --- .../plugin/multivm/VMCompactLibraryTaskAction.java | 1 + .../src/main/java/cc/squirreljme/jvm/Assembly.java | 13 +++++------ .../squirreljme/runtime/cldc/lang/ArrayUtils.java | 25 +++++++++++----------- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/buildSrc/src/main/java/cc/squirreljme/plugin/multivm/VMCompactLibraryTaskAction.java b/buildSrc/src/main/java/cc/squirreljme/plugin/multivm/VMCompactLibraryTaskAction.java index f0b8c4afdc..2b8cfab972 100644 --- a/buildSrc/src/main/java/cc/squirreljme/plugin/multivm/VMCompactLibraryTaskAction.java +++ b/buildSrc/src/main/java/cc/squirreljme/plugin/multivm/VMCompactLibraryTaskAction.java @@ -43,6 +43,7 @@ public class VMCompactLibraryTaskAction "}",*/ // Adjust manifest resources + "-adaptresourcefilenames", "**", "-adaptresourcefilecontents", "META-INF/MANIFEST.MF,META-INF/services/**", diff --git a/modules/cldc-compact/src/main/java/cc/squirreljme/jvm/Assembly.java b/modules/cldc-compact/src/main/java/cc/squirreljme/jvm/Assembly.java index 6b909040f4..f56ab7460d 100644 --- a/modules/cldc-compact/src/main/java/cc/squirreljme/jvm/Assembly.java +++ b/modules/cldc-compact/src/main/java/cc/squirreljme/jvm/Assembly.java @@ -10,6 +10,7 @@ package cc.squirreljme.jvm; import cc.squirreljme.jvm.mle.brackets.TypeBracket; +import cc.squirreljme.runtime.cldc.annotation.Api; import cc.squirreljme.runtime.cldc.annotation.Exported; /** @@ -23,7 +24,7 @@ import cc.squirreljme.runtime.cldc.annotation.Exported; * * @since 2019/04/20 */ -@Exported +@Api @SuppressWarnings({"NewMethodNamingConvention", "OverlyComplexClass"}) public final class Assembly { @@ -119,7 +120,7 @@ public final class Assembly * @return The unpacked high value. * @since 2020/02/24 */ - @Exported + @Api public static native int doubleUnpackHigh(double __d); /** @@ -129,7 +130,7 @@ public final class Assembly * @return The unpacked low value. * @since 2020/02/24 */ - @Exported + @Api public static native int doubleUnpackLow(double __d); /** @@ -564,7 +565,7 @@ public final class Assembly * @return The long value. * @since 2019/06/21 */ - @Exported + @Api public static native long longPack(int __lo, int __hi); /** @@ -574,7 +575,7 @@ public final class Assembly * @return The unpacked fragment. * @since 2019/06/21 */ - @Exported + @Api public static native int longUnpackHigh(long __v); /** @@ -584,7 +585,7 @@ public final class Assembly * @return The unpacked fragment. * @since 2019/06/21 */ - @Exported + @Api public static native int longUnpackLow(long __v); /** diff --git a/modules/cldc-compact/src/main/java/cc/squirreljme/runtime/cldc/lang/ArrayUtils.java b/modules/cldc-compact/src/main/java/cc/squirreljme/runtime/cldc/lang/ArrayUtils.java index 48567096fd..e060e49f50 100644 --- a/modules/cldc-compact/src/main/java/cc/squirreljme/runtime/cldc/lang/ArrayUtils.java +++ b/modules/cldc-compact/src/main/java/cc/squirreljme/runtime/cldc/lang/ArrayUtils.java @@ -11,6 +11,7 @@ package cc.squirreljme.runtime.cldc.lang; import cc.squirreljme.jvm.mle.ObjectShelf; import cc.squirreljme.jvm.mle.TypeShelf; +import cc.squirreljme.runtime.cldc.annotation.Api; import cc.squirreljme.runtime.cldc.annotation.Exported; import java.util.Arrays; @@ -20,7 +21,7 @@ import java.util.Arrays; * * @since 2018/11/03 */ -@Exported +@Api public final class ArrayUtils { /** Boolean array. */ @@ -392,7 +393,7 @@ public final class ArrayUtils * @throws NullPointerException On null arguments. * @since 2019/05/04 */ - @Exported + @Api public static Object multiANewArray(Class __type, int __skip, int __a) throws NegativeArraySizeException, NullPointerException @@ -415,7 +416,7 @@ public final class ArrayUtils * @throws NullPointerException On null arguments. * @since 2019/05/04 */ - @Exported + @Api public static Object multiANewArray(Class __type, int __skip, int __a, int __b) throws NegativeArraySizeException, NullPointerException @@ -439,7 +440,7 @@ public final class ArrayUtils * @throws NullPointerException On null arguments. * @since 2019/05/04 */ - @Exported + @Api public static Object multiANewArray(Class __type, int __skip, int __a, int __b, int __c) throws NegativeArraySizeException, NullPointerException @@ -464,7 +465,7 @@ public final class ArrayUtils * @throws NullPointerException On null arguments. * @since 2019/05/04 */ - @Exported + @Api public static Object multiANewArray(Class __type, int __skip, int __a, int __b, int __c, int __d) throws NegativeArraySizeException, NullPointerException @@ -490,7 +491,7 @@ public final class ArrayUtils * @throws NullPointerException On null arguments. * @since 2019/05/04 */ - @Exported + @Api public static Object multiANewArray(Class __type, int __skip, int __a, int __b, int __c, int __d, int __e) throws NegativeArraySizeException, NullPointerException @@ -517,7 +518,7 @@ public final class ArrayUtils * @throws NullPointerException On null arguments. * @since 2019/05/04 */ - @Exported + @Api public static Object multiANewArray(Class __type, int __skip, int __a, int __b, int __c, int __d, int __e, int __f) throws NegativeArraySizeException, NullPointerException @@ -545,7 +546,7 @@ public final class ArrayUtils * @throws NullPointerException On null arguments. * @since 2019/05/04 */ - @Exported + @Api public static Object multiANewArray(Class __type, int __skip, int __a, int __b, int __c, int __d, int __e, int __f, int __g) throws NegativeArraySizeException, NullPointerException @@ -574,7 +575,7 @@ public final class ArrayUtils * @throws NullPointerException On null arguments. * @since 2019/05/04 */ - @Exported + @Api public static Object multiANewArray(Class __type, int __skip, int __a, int __b, int __c, int __d, int __e, int __f, int __g, int __h) @@ -605,7 +606,7 @@ public final class ArrayUtils * @throws NullPointerException On null arguments. * @since 2019/05/04 */ - @Exported + @Api public static Object multiANewArray(Class __type, int __skip, int __a, int __b, int __c, int __d, int __e, int __f, int __g, int __h, int __i) @@ -637,7 +638,7 @@ public final class ArrayUtils * @throws NullPointerException On null arguments. * @since 2019/05/04 */ - @Exported + @Api public static Object multiANewArray(Class __type, int __skip, int __a, int __b, int __c, int __d, int __e, int __f, int __g, int __h, int __i, int __j) @@ -660,7 +661,7 @@ public final class ArrayUtils * @throws NullPointerException On null arguments. * @since 2018/11/03 */ - @Exported + @Api public static Object multiANewArray(Class __type, int __skip, int[] __dims) throws NegativeArraySizeException, NullPointerException -- 2.11.4.GIT