Skip to content

Commit 2993bb1

Browse files
moljacmoljac
authored
Merge branch 'main' into dev/moljac/wsu-20250207
2 parents d3d3bdc + 9fe3703 commit 2993bb1

File tree

8 files changed

+759
-528
lines changed

8 files changed

+759
-528
lines changed

‎cgmanifest.json

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8188,7 +8188,7 @@
81888188
"groupId": "org.jetbrains.kotlinx",
81898189
"version": "1.7.3",
81908190
"nuGetId": "Xamarin.KotlinX.Serialization.Core",
8191-
"nuGetVersion": "1.7.3.2"
8191+
"nuGetVersion": "1.7.3.3"
81928192
}
81938193
},
81948194
"license": "The Apache Software License, Version 2.0"
@@ -8201,7 +8201,33 @@
82018201
"groupId": "org.jetbrains.kotlinx",
82028202
"version": "1.7.3",
82038203
"nuGetId": "Xamarin.KotlinX.Serialization.Core.Jvm",
8204-
"nuGetVersion": "1.7.3.2"
8204+
"nuGetVersion": "1.7.3.3"
8205+
}
8206+
},
8207+
"license": "The Apache Software License, Version 2.0"
8208+
},
8209+
{
8210+
"component": {
8211+
"type": "maven",
8212+
"maven": {
8213+
"artifactId": "kotlinx-serialization-json",
8214+
"groupId": "org.jetbrains.kotlinx",
8215+
"version": "1.7.3",
8216+
"nuGetId": "Xamarin.KotlinX.Serialization.Json",
8217+
"nuGetVersion": "1.7.3.3"
8218+
}
8219+
},
8220+
"license": "The Apache Software License, Version 2.0"
8221+
},
8222+
{
8223+
"component": {
8224+
"type": "maven",
8225+
"maven": {
8226+
"artifactId": "kotlinx-serialization-json-jvm",
8227+
"groupId": "org.jetbrains.kotlinx",
8228+
"version": "1.7.3",
8229+
"nuGetId": "Xamarin.KotlinX.Serialization.Json.Jvm",
8230+
"nuGetVersion": "1.7.3.3"
82058231
}
82068232
},
82078233
"license": "The Apache Software License, Version 2.0"
@@ -8214,7 +8240,7 @@
82148240
"groupId": "org.jetbrains.kotlinx",
82158241
"version": "1.7.3",
82168242
"nuGetId": "Xamarin.KotlinX.Serialization.Protobuf",
8217-
"nuGetVersion": "1.7.3.2"
8243+
"nuGetVersion": "1.7.3.3"
82188244
}
82198245
},
82208246
"license": "The Apache Software License, Version 2.0"
@@ -8227,7 +8253,7 @@
82278253
"groupId": "org.jetbrains.kotlinx",
82288254
"version": "1.7.3",
82298255
"nuGetId": "Xamarin.KotlinX.Serialization.Protobuf.Jvm",
8230-
"nuGetVersion": "1.7.3.2"
8256+
"nuGetVersion": "1.7.3.3"
82318257
}
82328258
},
82338259
"license": "The Apache Software License, Version 2.0"

‎config.json

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4936,7 +4936,7 @@
49364936
"groupId": "org.jetbrains.kotlinx",
49374937
"artifactId": "kotlinx-serialization-core",
49384938
"version": "1.7.3",
4939-
"nugetVersion": "1.7.3.2",
4939+
"nugetVersion": "1.7.3.3",
49404940
"nugetId": "Xamarin.KotlinX.Serialization.Core",
49414941
"type": "androidlibrary",
49424942
"mavenRepositoryType": "MavenCentral"
@@ -4945,16 +4945,34 @@
49454945
"groupId": "org.jetbrains.kotlinx",
49464946
"artifactId": "kotlinx-serialization-core-jvm",
49474947
"version": "1.7.3",
4948-
"nugetVersion": "1.7.3.2",
4948+
"nugetVersion": "1.7.3.3",
49494949
"nugetId": "Xamarin.KotlinX.Serialization.Core.Jvm",
49504950
"type": "androidlibrary",
49514951
"mavenRepositoryType": "MavenCentral"
49524952
},
4953+
{
4954+
"groupId": "org.jetbrains.kotlinx",
4955+
"artifactId": "kotlinx-serialization-json",
4956+
"version": "1.7.3",
4957+
"nugetVersion": "1.7.3.3",
4958+
"nugetId": "Xamarin.KotlinX.Serialization.Json",
4959+
"type": "androidlibrary",
4960+
"mavenRepositoryType": "MavenCentral"
4961+
},
4962+
{
4963+
"groupId": "org.jetbrains.kotlinx",
4964+
"artifactId": "kotlinx-serialization-json-jvm",
4965+
"version": "1.7.3",
4966+
"nugetVersion": "1.7.3.3",
4967+
"nugetId": "Xamarin.KotlinX.Serialization.Json.Jvm",
4968+
"type": "androidlibrary",
4969+
"mavenRepositoryType": "MavenCentral"
4970+
},
49534971
{
49544972
"groupId": "org.jetbrains.kotlinx",
49554973
"artifactId": "kotlinx-serialization-protobuf",
49564974
"version": "1.7.3",
4957-
"nugetVersion": "1.7.3.2",
4975+
"nugetVersion": "1.7.3.3",
49584976
"nugetId": "Xamarin.KotlinX.Serialization.Protobuf",
49594977
"type": "androidlibrary",
49604978
"mavenRepositoryType": "MavenCentral"
@@ -4963,7 +4981,7 @@
49634981
"groupId": "org.jetbrains.kotlinx",
49644982
"artifactId": "kotlinx-serialization-protobuf-jvm",
49654983
"version": "1.7.3",
4966-
"nugetVersion": "1.7.3.2",
4984+
"nugetVersion": "1.7.3.3",
49674985
"nugetId": "Xamarin.KotlinX.Serialization.Protobuf.Jvm",
49684986
"type": "androidlibrary",
49694987
"mavenRepositoryType": "MavenCentral"

‎docs/artifact-list-with-versions.md

Lines changed: 261 additions & 260 deletions
Large diffs are not rendered by default.

‎docs/artifact-list.md

Lines changed: 261 additions & 260 deletions
Large diffs are not rendered by default.

‎published-namespaces.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,6 +1159,8 @@ KotlinX.Serialization
11591159
KotlinX.Serialization.Builtins
11601160
KotlinX.Serialization.Descriptors
11611161
KotlinX.Serialization.Encoding
1162+
KotlinX.Serialization.Json
1163+
KotlinX.Serialization.Json.Internal
11621164
KotlinX.Serialization.Modules
11631165
KotlinX.Serialization.Protobuf
11641166
KotlinX.Serialization.Protobuf.Internal

‎source/org.jetbrains.kotlinx/kotlinx-serialization-json-jvm/Transforms/Metadata.xml

Lines changed: 178 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
<metadata>
2+
<attr
3+
path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonObject']/method[@name='getSize' and count(parameter)=0]"
4+
name="propertyName"></attr>
5+
<attr
6+
path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonObject']/method[@name='getValues' and count(parameter)=0]"
7+
name="propertyName">
8+
</attr>
9+
<attr
10+
path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonObject']/method[@name='getValues' and count(parameter)=0]"
11+
name="return"
12+
>
13+
java.util.Collection
14+
</attr>
15+
<attr
16+
path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonObject']/method[@name='values' and count(parameter)=0]"
17+
name="return"
18+
>
19+
java.util.Collection
20+
</attr>
21+
<attr
22+
path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonObject']/method[@name='entrySet' and count(parameter)=0]"
23+
name="return"
24+
>
25+
java.util.Set
26+
</attr>
27+
<attr
28+
path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonObject']/method[@name='get' and count(parameter)=1 and parameter[1][@type='java.lang.Object']]"
29+
name="managedReturn"
30+
>
31+
Java.Lang.Object
32+
</attr>
33+
<attr
34+
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]"
35+
name="managedType"
36+
>
37+
Java.Lang.Object
38+
</attr>
39+
<attr
40+
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]"
41+
name="managedType"
42+
>
43+
Java.Lang.Object
44+
</attr>
45+
<attr
46+
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']]"
47+
name="managedReturn"
48+
>
49+
Java.Lang.Object
50+
</attr>
51+
<attr
52+
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]"
53+
name="managedType"
54+
>
55+
System.Collections.IDictionary
56+
</attr>
57+
<attr
58+
path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonObject']/method[@name='keySet' and count(parameter)=0]"
59+
name="return"
60+
>
61+
java.util.Set
62+
</attr>
63+
<attr
64+
path="/api/package[@name='kotlinx.serialization.json.internal']/class[@name='StringJsonLexer']/method[@name='getSource' and count(parameter)=0]"
65+
name="return"
66+
>
67+
java.lang.CharSequence
68+
</attr>
69+
70+
71+
<attr
72+
path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonArray']/method[@name='getSize' and count(parameter)=0]"
73+
name="propertyName"></attr>
74+
<attr
75+
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]"
76+
name="managedType"
77+
>
78+
Java.Lang.Object
79+
</attr>
80+
<attr
81+
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]"
82+
name="managedType"
83+
>
84+
Java.Lang.Object
85+
</attr>
86+
<attr
87+
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]"
88+
name="managedType"
89+
>
90+
Java.Lang.Object
91+
</attr>
92+
<attr
93+
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']]"
94+
name="managedReturn"
95+
>
96+
Java.Lang.Object
97+
</attr>
98+
<attr
99+
path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonArray']/method[@name='get' and count(parameter)=1 and parameter[1][@type='int']]"
100+
name="managedReturn"
101+
>
102+
Java.Lang.Object
103+
</attr>
104+
<attr
105+
path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonArray']/method[@name='remove' and count(parameter)=1 and parameter[1][@type='int']]"
106+
name="managedReturn"
107+
>
108+
Java.Lang.Object
109+
</attr>
110+
<attr
111+
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]"
112+
name="managedType"
113+
>
114+
System.Collections.ICollection
115+
</attr>
116+
<attr
117+
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]"
118+
name="managedType"
119+
>
120+
System.Collections.ICollection
121+
</attr>
122+
<attr
123+
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]"
124+
name="managedType"
125+
>
126+
System.Collections.ICollection
127+
</attr>
128+
<attr
129+
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]"
130+
name="managedType"
131+
>
132+
System.Collections.ICollection
133+
</attr>
134+
<attr
135+
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]"
136+
name="managedType"
137+
>
138+
System.Collections.ICollection
139+
</attr>
140+
<attr
141+
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']]"
142+
name="return"
143+
>
144+
java.util.List
145+
</attr>
146+
147+
<remove-node
148+
path="/api/package[@name='kotlinx.serialization.json']/interface[@name='JsonDecoder']/implements"
149+
/>
150+
<remove-node
151+
path="/api/package[@name='kotlinx.serialization.json.internal']/class[@name='ArrayAsSequence']"
152+
/>
153+
<remove-node
154+
path="/api/package[@name='kotlinx.serialization.json.internal']/class[@name='ReaderJsonLexer']"
155+
/>
156+
157+
<attr
158+
path="/api/package[@name='kotlinx.serialization.json.internal']/class[@name='ArrayAsSequence']/method[@name='getLength' and count(parameter)=0]"
159+
name="propertyName"></attr>
160+
161+
<attr
162+
path="/api/package[@name='kotlinx.serialization.json']/class[@name='JsonObject']/method[@name='remove' and count(parameter)=1 and parameter[1][@type='java.lang.Object']]"
163+
name="managedReturn"
164+
>
165+
Java.Lang.Object
166+
</attr>
167+
168+
<remove-node
169+
path="/api/package[@name='kotlinx.serialization.json']/interface[@name='JsonNames']/implements"
170+
/>
171+
<remove-node
172+
path="/api/package[@name='kotlinx.serialization.json']/interface[@name='JsonNames']"
173+
/>
174+
<remove-node
175+
path="/api/package[@name='kotlinx.serialization.json']/interface[@name='JsonClassDiscriminator']"
176+
/>
177+
178+
</metadata>

‎source/org.jetbrains.kotlinx/kotlinx-serialization-json/Transforms/Metadata.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<metadata>
2+
3+
4+
</metadata>

‎utilities.cake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -815,6 +815,7 @@ Task ("spell-check")
815815
"Multiprocess",
816816
"MultiProcess",
817817
"RecaptchaBase",
818+
"Json",
818819
];
819820

820821
var dictionary_custom = WeCantSpell.Hunspell.WordList.CreateFromWords(words);

0 commit comments

Comments
 (0)