Skip to content

Commit 4a9fad5

Browse files
committed
Version 1.0.0-RC
1 parent 317cbf9 commit 4a9fad5

File tree

5 files changed

+15
-43
lines changed

5 files changed

+15
-43
lines changed

README.md

Lines changed: 8 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -186,47 +186,18 @@ You may also want to keep all custom serializers you've defined.
186186

187187
### Multiplatform (common, JS, Native)
188188

189-
Typically, you need the following dependencies in your multiplatform project (don't forget to rename [source sets](https://kotlinlang.org/docs/reference/building-mpp-with-gradle.html#configuring-source-sets) according to your setup):
190-
189+
Most of the modules are also available for Kotlin/JS and Kotlin/Native.
190+
You can add dependency to the required module right to the common source set:
191191
```gradle
192-
sourceSets {
193-
commonMain {
194-
dependencies {
195-
implementation kotlin('stdlib-common')
196-
implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$serialization_version"
197-
}
198-
}
199-
commonTest {
200-
dependencies {
201-
implementation kotlin('test-common')
202-
implementation kotlin('test-annotations-common')
203-
}
204-
}
205-
jvmMain {
206-
dependencies {
207-
implementation kotlin('stdlib-jdk8')
208-
}
209-
}
210-
jvmTest {
211-
dependencies {
212-
implementation kotlin('test')
213-
implementation kotlin('test-junit')
214-
}
215-
}
216-
jsMain {
217-
dependencies {
218-
implementation kotlin('stdlib-js')
219-
}
220-
}
221-
jsTest {
222-
dependencies {
223-
implementation kotlin('test-js')
224-
}
192+
commonMain {
193+
dependencies {
194+
implementation "org.jetbrains.kotlinx:kotlinx-serialization-core:$serialization_version"
195+
implementation "org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$serialization_version"
225196
}
226-
nativeMain {}
227-
nativeTest {}
228197
}
229198
```
199+
Additionally, artifacts with `-js` and `-native` suffixes are available to directly depend
200+
on platform specific artifact.
230201

231202
### Maven/JVM
232203

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
#
44

55
group=org.jetbrains.kotlinx
6-
version=1.0-M2-SNAPSHOT
6+
version=1.0.0-RC
77

8-
kotlin.version=1.4.0-rc
8+
kotlin.version=1.4.0
99

1010
# This version take precedence if 'bootstrap' property passed to project
1111
kotlin.version.snapshot=1.4.255-SNAPSHOT

gradle/bintray.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ publishing {
88
def user = 'kotlin'
99
def repo = 'kotlinx'
1010
def name = 'kotlinx.serialization.runtime'
11-
url = "https://api.bintray.com/maven/$user/$repo/$name/;publish=0"
11+
url = "https://api.bintray.com/maven/$user/$repo/$name/;publish=0;override=1"
1212

1313
credentials {
1414
username = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
1515
password = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
1616
}
1717
}
1818
}
19-
}
19+
}

gradle/publishing.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ afterEvaluate {
4848
artifactId variantName
4949
publication.from components.java
5050
publication.artifact mainSourcesJar
51+
artifact stubJavadoc
5152
publication.pom.withXml(configureMavenCentralMetadata)
5253
}
5354
}

integration-test/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# Copyright 2017-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
33
#
44

5-
mainKotlinVersion=1.4.0-rc
6-
mainLibVersion=1.0-M2-SNAPSHOT
5+
mainKotlinVersion=1.4.0
6+
mainLibVersion=1.0.0-RC
77

88
kotlin.code.style=official
99

0 commit comments

Comments
 (0)