Fix define clash between editor and runtime versions

spoiledcat · Aug 25, 2023 · 3d012cd · 3d012cd
1 parent 77915fb
commit 3d012cd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/com.spoiledcat.utilities.runtime/Runtime/TheVersion.cs b/src/com.spoiledcat.utilities.runtime/Runtime/TheVersion.cs
@@ -14,7 +14,7 @@
 
 using System;
 using System.Text.RegularExpressions;
-#if SPOILEDCAT_HAS_JSON
+#if SPOILEDCAT_HAS_JSON_RUNTIME
 using NotSerialized=SpoiledCat.Json.NotSerializedAttribute;
 using NotSerializedProperty=SpoiledCat.Json.NotSerializedAttribute;
 #else

diff --git a/src/com.spoiledcat.utilities.runtime/Runtime/com.spoiledcat.utilities.runtime.asmdef b/src/com.spoiledcat.utilities.runtime/Runtime/com.spoiledcat.utilities.runtime.asmdef
@@ -11,9 +11,9 @@
     "defineConstraints": [],
     "versionDefines": [
         {
-            "name": "com.spoiledcat.simplejson",
+            "name": "com.spoiledcat.simplejson.runtime",
             "expression": "0.0.0-placeholder",
-            "define": "SPOILEDCAT_HAS_JSON"
+            "define": "SPOILEDCAT_HAS_JSON_RUNTIME"
         },
         {
             "name": "com.unity.addressables",