From 3d012cd5077ea99078b409b41236936b51abb3c2 Mon Sep 17 00:00:00 2001
From: Andreia Gaita <shana@spoiledcat.net>
Date: Fri, 25 Aug 2023 22:03:07 +0200
Subject: [PATCH] Fix define clash between editor and runtime versions

---
 src/com.spoiledcat.utilities.runtime/Runtime/TheVersion.cs    | 2 +-
 .../Runtime/com.spoiledcat.utilities.runtime.asmdef           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com.spoiledcat.utilities.runtime/Runtime/TheVersion.cs b/src/com.spoiledcat.utilities.runtime/Runtime/TheVersion.cs
index 20a0f4c3..854ec14b 100644
--- 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
index 955d6d87..db80cfe8 100644
--- 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",