Skip to content

Commit 68641a4

Browse files
committed
Bump versions and add missing apple targets
1 parent 79fcbb5 commit 68641a4

File tree

12 files changed

+53
-25
lines changed

12 files changed

+53
-25
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changelog #
22

3+
## v0.8.1 *(2021-09-23)* ##
4+
5+
- Update to Kotlin 1.5.31 and Gradle 7.2
6+
- Update `multiplatform-settings-coroutines` to use coroutines version 1.5.2
7+
- Update `multiplatform-settings-serialization` to use serialization version 1.3.0-RC
8+
- Add missing Apple targets to `multiplatform-settings-coroutines`, `multiplatform-settings-serialization`,
9+
and `multiplatform-settings-no-arg`
10+
311
## v0.8 *(2021-08-27)* ##
412

513
- Update to Kotlin 1.5.30 and Gradle 7.1

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Then, simply add the dependency to your common source-set dependencies
5252
commonMain {
5353
dependencies {
5454
// ...
55-
implementation("com.russhwolf:multiplatform-settings:0.8")
55+
implementation("com.russhwolf:multiplatform-settings:0.8.1")
5656
}
5757
}
5858
```
@@ -144,7 +144,7 @@ val factory: Settings.Factory = AppleSettings.Factory()
144144
To create a `Settings` instance from common without needing to pass platform-specific dependencies, add the `multiplatform-settings-no-arg` gradle dependency. This exports `multiplatform-settings` as an API dependency, so you can use it as a replacement for that default dependency.
145145

146146
```kotlin
147-
implementation("com.russhwolf:multiplatform-settings-no-arg:0.8")
147+
implementation("com.russhwolf:multiplatform-settings-no-arg:0.8.1")
148148
```
149149

150150
Then from common code, you can write
@@ -238,7 +238,7 @@ Note that for the `AppleSettings` implementation, some entries are unremovable a
238238
A testing dependency is available to aid in testing code that interacts with this library.
239239

240240
```kotlin
241-
implementation("com.russhwolf:multiplatform-settings-test:0.8")
241+
implementation("com.russhwolf:multiplatform-settings-test:0.8.1")
242242
```
243243

244244
This includes a `MockSettings` implementation of the `Settings` interface, which is backed by an in-memory `MutableMap` on all platforms.
@@ -309,7 +309,7 @@ On Apple platforms, the `AppleSettings` listeners are designed to work within th
309309
A `kotlinx-serialization` integration exists so it's easier to save non-primitive data
310310

311311
```kotlin
312-
implementation("com.russhwolf:multiplatform-settings-serialization:0.8")
312+
implementation("com.russhwolf:multiplatform-settings-serialization:0.8.1")
313313
```
314314

315315
This essentially uses the `Settings` store as a serialization format. Thus for a serializable class
@@ -346,10 +346,10 @@ Usage requires accepting both the `@ExperimentalSettingsApi` and `@ExperimentalS
346346
A separate `multiplatform-settings-coroutines` dependency includes various coroutine APIs.
347347

348348
```kotlin
349-
implementation("com.russhwolf:multiplatform-settings-coroutines:0.8")
349+
implementation("com.russhwolf:multiplatform-settings-coroutines:0.8.1")
350350

351351
// Or, if you use native-mt coroutines release
352-
implementation("com.russhwolf:multiplatform-settings-coroutines-native-mt:0.8")
352+
implementation("com.russhwolf:multiplatform-settings-coroutines-native-mt:0.8.1")
353353
```
354354

355355
This adds flow extensions for all types which use the listener APIs internally.
@@ -389,7 +389,7 @@ val blockingSettings: Settings = suspendSettings.toBlockingSettings()
389389
An implementation of `FlowSettings` on the Android exists in the `multiplatform-settings-datastore` dependency, based on [Jetpack DataStore](https://developer.android.com/jetpack/androidx/releases/datastore)
390390

391391
```kotlin
392-
implementation("com.russhwolf:multiplatform-settings-datastore:0.8")
392+
implementation("com.russhwolf:multiplatform-settings-datastore:0.8.1")
393393
```
394394

395395
This provides a `DataStoreSettings` class

buildSrc/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
plugins {
18-
kotlin("jvm") version "1.5.30"
18+
kotlin("jvm") version "1.5.31"
1919
}
2020

2121
repositories {
@@ -26,7 +26,7 @@ repositories {
2626

2727
dependencies {
2828
implementation(kotlin("gradle-plugin"))
29-
implementation("com.android.tools.build:gradle:4.1.2")
29+
implementation("com.android.tools.build:gradle:4.2.2")
3030
implementation("org.jetbrains.dokka:dokka-gradle-plugin:0.10.1")
3131
implementation(kotlin("compiler-embeddable"))
3232
}

buildSrc/src/main/kotlin/Versions.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@
1717
@file:Suppress("KDocMissingDocumentation")
1818

1919
object Versions {
20-
const val multiplatformSettings = "0.8"
20+
const val multiplatformSettings = "0.8.1"
2121

2222
const val minSdk = 15
23-
const val compileSdk = 30
23+
const val compileSdk = 31
2424

2525
const val androidxDatastore = "1.0.0"
2626
const val androidxPreference = "1.1.1"
2727
const val androidxStartup = "1.1.0"
2828
const val androidxTest = "1.4.0"
2929
const val androidxTestExt = "1.1.3"
3030
const val binaryCompatibilityValidator = "0.2.4"
31-
const val coroutines = "1.5.1"
32-
const val coroutinesNativeMt = "1.5.1-native-mt"
31+
const val coroutines = "1.5.2"
32+
const val coroutinesNativeMt = "1.5.2-native-mt"
3333
const val junit = "4.13.2"
3434
const val robolectric = "4.6.1"
35-
const val serializationPlugin = "1.5.30"
36-
const val serializationRuntime = "1.2.2"
37-
const val turbine = "0.6.0"
35+
const val serializationPlugin = "1.5.31"
36+
const val serializationRuntime = "1.3.0-RC"
37+
const val turbine = "0.6.1"
3838
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#
1616

1717
#Sun Jun 09 17:45:17 EDT 2019
18-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip
18+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
1919
distributionBase=GRADLE_USER_HOME
2020
distributionPath=wrapper/dists
2121
zipStorePath=wrapper/dists

multiplatform-settings-coroutines-native-mt/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,21 @@ standardConfiguration(
2828
"android",
2929
"iosArm32",
3030
"iosArm64",
31+
"iosSimulatorArm64",
3132
"iosX64",
3233
"js",
3334
"jvm",
3435
"linuxX64",
36+
"macosArm64",
3537
"macosX64",
3638
"mingwX64",
3739
"tvosArm64",
40+
"tvosSimulatorArm64",
3841
"tvosX64",
3942
"watchosArm32",
4043
"watchosArm64",
44+
"watchosSimulatorArm64",
45+
"watchosX64",
4146
"watchosX86"
4247
)
4348
kotlin {

multiplatform-settings-coroutines/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,21 @@ standardConfiguration(
2828
"android",
2929
"iosArm32",
3030
"iosArm64",
31+
"iosSimulatorArm64",
3132
"iosX64",
3233
"js",
3334
"jvm",
3435
"linuxX64",
36+
"macosArm64",
3537
"macosX64",
3638
"mingwX64",
3739
"tvosArm64",
40+
"tvosSimulatorArm64",
3841
"tvosX64",
3942
"watchosArm32",
4043
"watchosArm64",
44+
"watchosSimulatorArm64",
45+
"watchosX64",
4146
"watchosX86"
4247
)
4348
kotlin {

multiplatform-settings-no-arg/build.gradle.kts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,19 @@ standardConfiguration(
2626
"android",
2727
"iosArm32",
2828
"iosArm64",
29+
"iosSimulatorArm64",
2930
"iosX64",
3031
"js",
3132
"jvm",
33+
"macosArm64",
3234
"macosX64",
3335
"tvosArm64",
36+
"tvosSimulatorArm64",
3437
"tvosX64",
3538
"watchosArm32",
3639
"watchosArm64",
40+
"watchosSimulatorArm64",
41+
"watchosX64",
3742
"watchosX86"
3843
)
3944

@@ -74,7 +79,7 @@ kotlin {
7479
}
7580
}
7681
val jvmTest by getting {
77-
languageSettings.useExperimentalAnnotation("com.russhwolf.settings.ExperimentalSettingsImplementation")
82+
languageSettings.optIn("com.russhwolf.settings.ExperimentalSettingsImplementation")
7883
dependencies {
7984
implementation("junit:junit:${Versions.junit}")
8085
}

multiplatform-settings-serialization/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,24 @@ standardConfiguration(
2727
"android",
2828
"iosArm32",
2929
"iosArm64",
30+
"iosSimulatorArm64",
3031
"iosX64",
3132
"js",
3233
"jvm",
3334
"linuxArm32Hfp",
3435
"linuxArm64",
3536
"linuxX64",
37+
"macosArm64",
3638
"macosX64",
3739
"mingwX64",
3840
"mingwX86",
3941
"tvosArm64",
42+
"tvosSimulatorArm64",
4043
"tvosX64",
4144
"watchosArm32",
4245
"watchosArm64",
46+
"watchosSimulatorArm64",
47+
"watchosX64",
4348
"watchosX86"
4449
)
4550

sample/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
*/
1616

1717
plugins {
18-
kotlin("multiplatform") version "1.5.30" apply false
19-
kotlin("android") version "1.5.30" apply false
20-
id("com.android.library") version "4.1.2" apply false
21-
id("com.android.application") version "4.1.2" apply false
18+
kotlin("multiplatform") version "1.5.31" apply false
19+
kotlin("android") version "1.5.31" apply false
20+
id("com.android.library") version "4.2.2" apply false
21+
id("com.android.application") version "4.2.2" apply false
2222
}
2323

2424
allprojects {
25-
ext["library_version"] = "0.8"
25+
ext["library_version"] = "0.8.1"
2626

2727
repositories {
2828
mavenLocal()

sample/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
1919
distributionPath=wrapper/dists
2020
zipStoreBase=GRADLE_USER_HOME
2121
zipStorePath=wrapper/dists
22-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
22+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip

sample/shared/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ kotlin {
4141
sourceSets {
4242
all {
4343
languageSettings.apply {
44-
useExperimentalAnnotation("kotlin.RequiresOptIn")
44+
optIn("kotlin.RequiresOptIn")
4545
}
4646
}
4747

0 commit comments

Comments
 (0)