Merge branch 'main' into dev/moljac/wsu-20250207

dotnet · Feb 15, 2025 · 2993bb1 · 2993bb1
2 parents d3d3bdc + 9fe3703
commit 2993bb1
Show file tree

Hide file tree

Showing 8 changed files with 759 additions and 528 deletions.
diff --git a/cgmanifest.json b/cgmanifest.json
@@ -8188,7 +8188,7 @@
           "groupId": "org.jetbrains.kotlinx",
           "version": "1.7.3",
           "nuGetId": "Xamarin.KotlinX.Serialization.Core",
-          "nuGetVersion": "1.7.3.2"
+          "nuGetVersion": "1.7.3.3"
         }
       },
       "license": "The Apache Software License, Version 2.0"
@@ -8201,7 +8201,33 @@
           "groupId": "org.jetbrains.kotlinx",
           "version": "1.7.3",
           "nuGetId": "Xamarin.KotlinX.Serialization.Core.Jvm",
-          "nuGetVersion": "1.7.3.2"
+          "nuGetVersion": "1.7.3.3"
+        }
+      },
+      "license": "The Apache Software License, Version 2.0"
+    },
+    {
+      "component": {
+        "type": "maven",
+        "maven": {
+          "artifactId": "kotlinx-serialization-json",
+          "groupId": "org.jetbrains.kotlinx",
+          "version": "1.7.3",
+          "nuGetId": "Xamarin.KotlinX.Serialization.Json",
+          "nuGetVersion": "1.7.3.3"
+        }
+      },
+      "license": "The Apache Software License, Version 2.0"
+    },
+    {
+      "component": {
+        "type": "maven",
+        "maven": {
+          "artifactId": "kotlinx-serialization-json-jvm",
+          "groupId": "org.jetbrains.kotlinx",
+          "version": "1.7.3",
+          "nuGetId": "Xamarin.KotlinX.Serialization.Json.Jvm",
+          "nuGetVersion": "1.7.3.3"
         }
       },
       "license": "The Apache Software License, Version 2.0"
@@ -8214,7 +8240,7 @@
           "groupId": "org.jetbrains.kotlinx",
           "version": "1.7.3",
           "nuGetId": "Xamarin.KotlinX.Serialization.Protobuf",
-          "nuGetVersion": "1.7.3.2"
+          "nuGetVersion": "1.7.3.3"
         }
       },
       "license": "The Apache Software License, Version 2.0"
@@ -8227,7 +8253,7 @@
           "groupId": "org.jetbrains.kotlinx",
           "version": "1.7.3",
           "nuGetId": "Xamarin.KotlinX.Serialization.Protobuf.Jvm",
-          "nuGetVersion": "1.7.3.2"
+          "nuGetVersion": "1.7.3.3"
         }
       },
       "license": "The Apache Software License, Version 2.0"

diff --git a/config.json b/config.json
@@ -4936,7 +4936,7 @@
         "groupId": "org.jetbrains.kotlinx",
         "artifactId": "kotlinx-serialization-core",
         "version": "1.7.3",
-        "nugetVersion": "1.7.3.2",
+        "nugetVersion": "1.7.3.3",
         "nugetId": "Xamarin.KotlinX.Serialization.Core",
         "type": "androidlibrary",
         "mavenRepositoryType": "MavenCentral"
@@ -4945,16 +4945,34 @@
         "groupId": "org.jetbrains.kotlinx",
         "artifactId": "kotlinx-serialization-core-jvm",
         "version": "1.7.3",
-        "nugetVersion": "1.7.3.2",
+        "nugetVersion": "1.7.3.3",
         "nugetId": "Xamarin.KotlinX.Serialization.Core.Jvm",
         "type": "androidlibrary",
         "mavenRepositoryType": "MavenCentral"
       },
+      {
+        "groupId": "org.jetbrains.kotlinx",
+        "artifactId": "kotlinx-serialization-json",
+        "version": "1.7.3",
+        "nugetVersion": "1.7.3.3",
+        "nugetId": "Xamarin.KotlinX.Serialization.Json",
+        "type": "androidlibrary",
+        "mavenRepositoryType": "MavenCentral"
+      },
+      {
+        "groupId": "org.jetbrains.kotlinx",
+        "artifactId": "kotlinx-serialization-json-jvm",
+        "version": "1.7.3",
+        "nugetVersion": "1.7.3.3",
+        "nugetId": "Xamarin.KotlinX.Serialization.Json.Jvm",
+        "type": "androidlibrary",
+        "mavenRepositoryType": "MavenCentral"
+      },
       {
         "groupId": "org.jetbrains.kotlinx",
         "artifactId": "kotlinx-serialization-protobuf",
         "version": "1.7.3",
-        "nugetVersion": "1.7.3.2",        
+        "nugetVersion": "1.7.3.3",
         "nugetId": "Xamarin.KotlinX.Serialization.Protobuf",
         "type": "androidlibrary",
         "mavenRepositoryType": "MavenCentral"
@@ -4963,7 +4981,7 @@
         "groupId": "org.jetbrains.kotlinx",
         "artifactId": "kotlinx-serialization-protobuf-jvm",
         "version": "1.7.3",
-        "nugetVersion": "1.7.3.2",
+        "nugetVersion": "1.7.3.3",
         "nugetId": "Xamarin.KotlinX.Serialization.Protobuf.Jvm",
         "type": "androidlibrary",
         "mavenRepositoryType": "MavenCentral"

diff --git a/docs/artifact-list-with-versions.md b/docs/artifact-list-with-versions.md
diff --git a/docs/artifact-list.md b/docs/artifact-list.md
diff --git a/published-namespaces.txt b/published-namespaces.txt
@@ -1159,6 +1159,8 @@ KotlinX.Serialization
 KotlinX.Serialization.Builtins
 KotlinX.Serialization.Descriptors
 KotlinX.Serialization.Encoding
+KotlinX.Serialization.Json
+KotlinX.Serialization.Json.Internal
 KotlinX.Serialization.Modules
 KotlinX.Serialization.Protobuf
 KotlinX.Serialization.Protobuf.Internal

diff --git a/source/org.jetbrains.kotlinx/kotlinx-serialization-json-jvm/Transforms/Metadata.xml b/source/org.jetbrains.kotlinx/kotlinx-serialization-json-jvm/Transforms/Metadata.xml
@@ -0,0 +1,178 @@
+<metadata>
+    <attr
+        path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonObject']/method[@name='getSize' and count(parameter)=0]"
+        name="propertyName"></attr>
+    <attr
+        path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonObject']/method[@name='getValues' and count(parameter)=0]"
+        name="propertyName">
+    </attr>
+    <attr
+        path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonObject']/method[@name='getValues' and count(parameter)=0]"
+        name="return"
+        >
+        java.util.Collection
+    </attr>
+    <attr
+        path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonObject']/method[@name='values' and count(parameter)=0]"
+        name="return"
+        >
+        java.util.Collection
+    </attr>
+    <attr
+        path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonObject']/method[@name='entrySet' and count(parameter)=0]"
+        name="return"
+        >
+        java.util.Set
+    </attr>
+    <attr
+        path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonObject']/method[@name='get' and count(parameter)=1 and parameter[1][@type='java.lang.Object']]"
+        name="managedReturn"
+        >
+        Java.Lang.Object
+    </attr>
+    <attr
+        path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonObject']/method[@name='put' and count(parameter)=2 and parameter[1][@type='java.lang.String'] and parameter[2][@type='kotlinx.serialization.json.JsonElement']]/parameter[1]"
+        name="managedType"
+        >
+        Java.Lang.Object
+    </attr>
+    <attr
+        path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonObject']/method[@name='put' and count(parameter)=2 and parameter[1][@type='java.lang.String'] and parameter[2][@type='kotlinx.serialization.json.JsonElement']]/parameter[2]"
+        name="managedType"
+        >
+        Java.Lang.Object
+    </attr>
+    <attr
+        path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonObject']/method[@name='put' and count(parameter)=2 and parameter[1][@type='java.lang.String'] and parameter[2][@type='kotlinx.serialization.json.JsonElement']]"
+        name="managedReturn"
+        >
+        Java.Lang.Object
+    </attr>
+    <attr
+        path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonObject']/method[@name='putAll' and count(parameter)=1 and parameter[1][@type='java.util.Map&lt;? extends java.lang.String, ? extends kotlinx.serialization.json.JsonElement&gt;']]/parameter[1]"
+        name="managedType"
+        >
+        System.Collections.IDictionary
+    </attr>
+    <attr
+        path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonObject']/method[@name='keySet' and count(parameter)=0]"
+        name="return"
+        >
+        java.util.Set
+    </attr>
+    <attr
+        path="/api/package[@name='kotlinx.serialization.json.internal']/class[@name='StringJsonLexer']/method[@name='getSource' and count(parameter)=0]"
+        name="return"
+        >
+        java.lang.CharSequence
+    </attr>
+
+
+    <attr
+        path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonArray']/method[@name='getSize' and count(parameter)=0]"
+        name="propertyName"></attr>
+    <attr
+        path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonArray']/method[@name='add' and count(parameter)=1 and parameter[1][@type='kotlinx.serialization.json.JsonElement']]/parameter[1]"
+        name="managedType"
+        >
+        Java.Lang.Object
+    </attr>
+    <attr
+        path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonArray']/method[@name='add' and count(parameter)=2 and parameter[1][@type='int'] and parameter[2][@type='kotlinx.serialization.json.JsonElement']]/parameter[2]"
+        name="managedType"
+        >
+        Java.Lang.Object
+    </attr>
+    <attr
+        path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonArray']/method[@name='set' and count(parameter)=2 and parameter[1][@type='int'] and parameter[2][@type='kotlinx.serialization.json.JsonElement']]/parameter[2]"
+        name="managedType"
+        >
+        Java.Lang.Object
+    </attr>
+    <attr
+        path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonArray']/method[@name='set' and count(parameter)=2 and parameter[1][@type='int'] and parameter[2][@type='kotlinx.serialization.json.JsonElement']]"
+        name="managedReturn"
+        >
+        Java.Lang.Object
+    </attr>
+    <attr
+        path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonArray']/method[@name='get' and count(parameter)=1 and parameter[1][@type='int']]"
+        name="managedReturn"
+        >
+        Java.Lang.Object
+    </attr>
+    <attr
+        path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonArray']/method[@name='remove' and count(parameter)=1 and parameter[1][@type='int']]"
+        name="managedReturn"
+        >
+        Java.Lang.Object
+    </attr>
+    <attr
+        path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonArray']/method[@name='addAll' and count(parameter)=2 and parameter[1][@type='int'] and parameter[2][@type='java.util.Collection&lt;? extends kotlinx.serialization.json.JsonElement&gt;']]/parameter[2]"
+        name="managedType"
+        >
+        System.Collections.ICollection
+    </attr>
+    <attr
+        path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonArray']/method[@name='addAll' and count(parameter)=1 and parameter[1][@type='java.util.Collection&lt;? extends kotlinx.serialization.json.JsonElement&gt;']]/parameter[1]"
+        name="managedType"
+        >
+        System.Collections.ICollection
+    </attr>
+    <attr
+        path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonArray']/method[@name='removeAll' and count(parameter)=1 and parameter[1][@type='java.util.Collection&lt;? extends java.lang.Object&gt;']]/parameter[1]"
+        name="managedType"
+        >
+        System.Collections.ICollection
+    </attr>
+    <attr
+        path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonArray']/method[@name='retainAll' and count(parameter)=1 and parameter[1][@type='java.util.Collection&lt;? extends java.lang.Object&gt;']]/parameter[1]"
+        name="managedType"
+        >
+        System.Collections.ICollection
+    </attr>
+    <attr
+        path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonArray']/method[@name='containsAll' and count(parameter)=1 and parameter[1][@type='java.util.Collection&lt;? extends java.lang.Object&gt;']]/parameter[1]"
+        name="managedType"
+        >
+        System.Collections.ICollection
+    </attr>
+    <attr
+        path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonArray']/method[@name='subList' and count(parameter)=2 and parameter[1][@type='int'] and parameter[2][@type='int']]"
+        name="return"
+        >
+        java.util.List
+    </attr>
+
+    <remove-node
+        path="/api/package[@name='kotlinx.serialization.json']/interface[@name='JsonDecoder']/implements"
+        />
+    <remove-node
+        path="/api/package[@name='kotlinx.serialization.json.internal']/class[@name='ArrayAsSequence']"
+        />
+    <remove-node
+        path="/api/package[@name='kotlinx.serialization.json.internal']/class[@name='ReaderJsonLexer']"
+        />
+
+    <attr
+        path="/api/package[@name='kotlinx.serialization.json.internal']/class[@name='ArrayAsSequence']/method[@name='getLength' and count(parameter)=0]"
+        name="propertyName"></attr>
+
+    <attr
+        path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonObject']/method[@name='remove' and count(parameter)=1 and parameter[1][@type='java.lang.Object']]"
+        name="managedReturn"
+        >
+        Java.Lang.Object
+    </attr>
+
+    <remove-node
+        path="/api/package[@name='kotlinx.serialization.json']/interface[@name='JsonNames']/implements"
+        />
+    <remove-node
+        path="/api/package[@name='kotlinx.serialization.json']/interface[@name='JsonNames']"
+        />
+    <remove-node
+        path="/api/package[@name='kotlinx.serialization.json']/interface[@name='JsonClassDiscriminator']"
+        />
+
+</metadata>
diff --git a/source/org.jetbrains.kotlinx/kotlinx-serialization-json/Transforms/Metadata.xml b/source/org.jetbrains.kotlinx/kotlinx-serialization-json/Transforms/Metadata.xml
@@ -0,0 +1,4 @@
+<metadata>
+
+
+</metadata>
diff --git a/utilities.cake b/utilities.cake
@@ -815,6 +815,7 @@ Task ("spell-check")
                 "Multiprocess",
                 "MultiProcess",
                 "RecaptchaBase",
+                "Json",
            ];
 
             var dictionary_custom = WeCantSpell.Hunspell.WordList.CreateFromWords(words);