Merge remote-tracking branch 'origin/master' into dev

sandwwraith · sandwwraith · commit 2b653de7791e · 2025-03-31T16:16:01.000+02:00
diff --git a/README.md b/README.md
@@ -77,7 +77,6 @@ You can find auto-generated documentation website on [kotlinlang.org](https://ko
 
 [New versions](https://plugins.gradle.org/plugin/org.jetbrains.kotlin.plugin.serialization) of the serialization plugin are released in tandem with each new Kotlin compiler version.
 
-Using Kotlin Serialization requires Kotlin compiler `1.4.0` or higher.
 Make sure you have the corresponding Kotlin plugin installed in the IDE, no additional plugins for IDE are required.
 
 ### Gradle
diff --git a/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts b/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
@@ -152,7 +152,7 @@ fun MavenPom.configureMavenCentralMetadata() {
 
     licenses {
         license {
-            name = "The Apache Software License, Version 2.0"
+            name = "Apache-2.0"
             url = "https://www.apache.org/licenses/LICENSE-2.0.txt"
             distribution = "repo"
         }
diff --git a/docs/compatibility.md b/docs/compatibility.md
@@ -88,5 +88,10 @@ This would be indicated by a compiler error specific to a particular feature.
 * New core library versions may or may not require Kotlin compiler plugin update,
 depending on a particular release.
 We'll try to avoid these situations; however, in case of some unexpected issues, it may be necessary.
-So it is possible to have a situation where upgrading serialization runtime from `1.x` to `1.y` requires an update of Kotlin version from `1.4.0` to `1.4.x`.
+So it is possible to have a situation where upgrading serialization runtime from `1.a.0` to `1.b.0` requires an update of Kotlin version from `1.x.0` to `1.y.0` (`y` > `x`).
 The compiler can detect such problems and will inform you if its version is incompatible with a current version of core library.
+
+Note that according to [general rules for Kotlin binaries](https://kotlinlang.org/docs/kotlin-evolution-principles.html#compatibility-options),
+library is mostly forwards compatible with the next language release, but not later ones. 
+It means that if kotlinx.serialization `1.x` was compiled with Kotlin `2.Y`, it is compatible with Kotlin `2.(Y + 1)`, but not
+`2.(Y + 2)`.
diff --git a/formats/README.md b/formats/README.md
@@ -35,6 +35,7 @@ For convenience, they have same `groupId`, versioning and release cycle as core
 | Fixed Length Format      | [hfhbd/kotlinx-serialization-csv](https://github.com/hfhbd/kotlinx-serialization-csv) <br> `app.softwork:kotlinx-serialization-flf`                      | all supported platforms | Allows serialization and deserialization of [Fixed Length Format files](https://www.ibm.com/docs/en/psfa/7.2.1?topic=format-fixed-length-files). Each property must be annotated with `@FixedLength` and there are still some limitations due to missing delimiters.                                                                                                                                                                                       |
 | JSON5                    | [xn32/json5k](https://github.com/xn32/json5k) <br> `io.github.xn32:json5k`                                                                               | JVM, Native             | Library for the serialization to and deserialization from [JSON5](https://json5.org) text.                                                                                                                                                                                                                                                                                                                                                                 |
 | DynamoDB                 | [DynaMap](https://github.com/codanbaru/dynamap) <br> `com.codanbaru.kotlin:dynamap`                                                                      | JVM                     | Allows serialization and deserialization of objects to and from [AttributeValue](https://sdk.amazonaws.com/kotlin/api/latest/dynamodb/aws.sdk.kotlin.services.dynamodb.model/-attribute-value/index.html) of Amazon [DynamoDB](https://aws.amazon.com/dynamodb/)                                                                                                                                                                                           |
-| Bencoding                | [iseki0/kotlinx-serialization-bencoding](https://github.com/iseki0/kotlinx-serialization-bencoding) <br> `space.iseki.bencoding:kotlinx-serialization-bencoding`| JVM, JavaScript  | Allows serialization and deserialization of objects to and from [Bencoding](https://www.bittorrent.org/beps/bep_0003.html#bencoding) of BitTorrent.                                                                                                                                                                                                                                                                                                        |
+| Bencoding                | [iseki0/kotlinx-serialization-bencoding](https://github.com/iseki0/kotlinx-serialization-bencoding) <br> `space.iseki.bencoding:kotlinx-serialization-bencoding`| all supported platforms | Allows serialization and deserialization of objects to and from [Bencoding](https://www.bittorrent.org/beps/bep_0003.html#bencoding) of BitTorrent.                                                                                                                                                                                                                                                                                                        |
 | Smile                    | [vooft/kotlinx-serialization-smile](https://github.com/vooft/kotlinx-serialization-smile) <br> `io.github.vooft:kotlinx-serialization-smile-core`        | all supported platforms | Allows serialization and deserialization of objects to and from [Smile](https://en.wikipedia.org/wiki/Smile_(data_interchange_format)).                                                                                                                                                                                                                                                                                                                    |
+| PHP                      | [jsoizo/kotlinx-serialization-php](https://github.com/jsoizo/kotlinx-serialization-php) <br> `com.jsoizo:kotlinx-serialization-php`        | all supported platforms | Allows serialization and deserialization of objects to and from [PHP Serialization](https://www.php.net/manual/en/function.serialize.php).                                                                                                                                                                                                                                                                                                                    |
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ fun MavenPom.configureMavenCentralMetadata() {`
`152`	`152`
`153`	`153`	`licenses {`
`154`	`154`	`license {`
`155`		`- name = "The Apache Software License, Version 2.0"`
	`155`	`+ name = "Apache-2.0"`
`156`	`156`	`url = "https://www.apache.org/licenses/LICENSE-2.0.txt"`
`157`	`157`	`distribution = "repo"`
`158`	`158`	`}`