From 51c88715ad64455ba37184c1239a25e15354e53c Mon Sep 17 00:00:00 2001 From: Wagyourtail Date: Wed, 5 Jun 2024 22:43:04 -0500 Subject: [PATCH] actually fix it --- ExpectPlatform.iml | 6 ++++++ expect-platform-test/build.gradle | 2 +- .../src/a/java/xyz/wagyourtail/ept/a/MainImpl.java | 4 ++++ .../src/b/java/xyz/wagyourtail/ept/b/MainImpl.java | 3 +++ .../src/c/java/xyz/wagyourtail/ept/c/MainImpl.java | 9 +++++++++ .../src/main/java/xyz/wagyourtail/ept/Main.java | 7 +++++++ gradle.properties | 2 +- .../xyz/wagyourtail/unimined/expect/TransformPlatform.kt | 2 +- 8 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 ExpectPlatform.iml create mode 100644 expect-platform-test/src/c/java/xyz/wagyourtail/ept/c/MainImpl.java diff --git a/ExpectPlatform.iml b/ExpectPlatform.iml new file mode 100644 index 0000000..9e3449c --- /dev/null +++ b/ExpectPlatform.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/expect-platform-test/build.gradle b/expect-platform-test/build.gradle index 920f109..f16d789 100644 --- a/expect-platform-test/build.gradle +++ b/expect-platform-test/build.gradle @@ -9,7 +9,7 @@ buildscript { } } dependencies { - classpath "xyz.wagyourtail.unimined.expect-platform:expect-platform:1.0.0" + classpath "xyz.wagyourtail.unimined.expect-platform:expect-platform:1.0.2" classpath "org.ow2.asm:asm-tree:9.7" } } diff --git a/expect-platform-test/src/a/java/xyz/wagyourtail/ept/a/MainImpl.java b/expect-platform-test/src/a/java/xyz/wagyourtail/ept/a/MainImpl.java index b53ad3a..2ac7176 100644 --- a/expect-platform-test/src/a/java/xyz/wagyourtail/ept/a/MainImpl.java +++ b/expect-platform-test/src/a/java/xyz/wagyourtail/ept/a/MainImpl.java @@ -7,4 +7,8 @@ public static String platformTest(String name) { return "Hello a! " + name; } + public static String platformTest2(String name) { + return "Goodbye a! " + name; + } + } diff --git a/expect-platform-test/src/b/java/xyz/wagyourtail/ept/b/MainImpl.java b/expect-platform-test/src/b/java/xyz/wagyourtail/ept/b/MainImpl.java index ad96887..f1662e0 100644 --- a/expect-platform-test/src/b/java/xyz/wagyourtail/ept/b/MainImpl.java +++ b/expect-platform-test/src/b/java/xyz/wagyourtail/ept/b/MainImpl.java @@ -6,4 +6,7 @@ public static String platformTest(String name) { return "Hello b! " + name; } + public static String platformTest2(String name) { + return "Goodbye b! " + name; + } } diff --git a/expect-platform-test/src/c/java/xyz/wagyourtail/ept/c/MainImpl.java b/expect-platform-test/src/c/java/xyz/wagyourtail/ept/c/MainImpl.java new file mode 100644 index 0000000..95af075 --- /dev/null +++ b/expect-platform-test/src/c/java/xyz/wagyourtail/ept/c/MainImpl.java @@ -0,0 +1,9 @@ +package xyz.wagyourtail.ept.c; + +public class MainImpl { + + public static String platformTest2(String name) { + return "Goodbye c! " + name; + } + +} diff --git a/expect-platform-test/src/main/java/xyz/wagyourtail/ept/Main.java b/expect-platform-test/src/main/java/xyz/wagyourtail/ept/Main.java index a41bdac..c8900a0 100644 --- a/expect-platform-test/src/main/java/xyz/wagyourtail/ept/Main.java +++ b/expect-platform-test/src/main/java/xyz/wagyourtail/ept/Main.java @@ -13,6 +13,7 @@ public static void main(String[] args) { Target.getCurrentTarget(); System.out.println(platformTest("test")); + System.out.println(platformTest2("test")); try { Main.class.getDeclaredMethod("platformOnlyTest"); @@ -32,6 +33,12 @@ public static String platformTest(String name) { throw new AssertionError(); } + + @ExpectPlatform + public static String platformTest2(String name) { + throw new AssertionError(); + } + @PlatformOnly({"a", "b"}) public static void platformOnlyTest() { } diff --git a/gradle.properties b/gradle.properties index 1aff643..e99e2af 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ kotlin.code.style=official -version = 1.0.1 +version = 1.0.2 asmVersion=9.7 \ No newline at end of file diff --git a/src/main/kotlin/xyz/wagyourtail/unimined/expect/TransformPlatform.kt b/src/main/kotlin/xyz/wagyourtail/unimined/expect/TransformPlatform.kt index f7a518f..7830b84 100644 --- a/src/main/kotlin/xyz/wagyourtail/unimined/expect/TransformPlatform.kt +++ b/src/main/kotlin/xyz/wagyourtail/unimined/expect/TransformPlatform.kt @@ -53,7 +53,7 @@ class TransformPlatform(val platformName: String) { } @Suppress("UNCHECKED_CAST") - val platforms = annotation.values[1] as? List + val platforms = annotation.values?.get(1) as? List var platformClass: String? = null