1.5.0 dependency updates

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog #
 
+## v0.7.7 *(2021-05-20)* ##
+
+- Fix missing Kotlin 1.5.0 updates
+- Update `multiplatform-settings-coroutines` to use coroutines version 1.5.0
+- Update `multiplatform-settings-datastore` to use DataStore version 1.0.0-beta01
+- Update `multiplatform-settings-serealization` to use serialization version 1.2.1
+
 ## v0.7.6 *(2021-04-27)* ##
 
 - Update to Kotlin 1.5.0

README.md

@@ -52,7 +52,7 @@ Then, simply add the dependency to your common source-set dependencies
 commonMain {
     dependencies {
         // ...
-        implementation("com.russhwolf:multiplatform-settings:0.7.6")
+        implementation("com.russhwolf:multiplatform-settings:0.7.7")
     }
 }
 ``` 
@@ -144,7 +144,7 @@ val factory: Settings.Factory = AppleSettings.Factory()
 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.
 
 ```kotlin
-implementation("com.russhwolf:multiplatform-settings-no-arg:0.7.6")
+implementation("com.russhwolf:multiplatform-settings-no-arg:0.7.7")
 ```
 
 Then from common code, you can write
@@ -238,7 +238,7 @@ Note that for the `AppleSettings` implementation, some entries are unremovable a
 A testing dependency is available to aid in testing code that interacts with this library.
 
 ```kotlin
-implementation("com.russhwolf:multiplatform-settings-test:0.7.6")
+implementation("com.russhwolf:multiplatform-settings-test:0.7.7")
 ```    
 
 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
 A `kotlinx-serialization` integration exists so it's easier to save non-primitive data
 
 ```kotlin
-implementation("com.russhwolf:multiplatform-settings-serialization:0.7.6")
+implementation("com.russhwolf:multiplatform-settings-serialization:0.7.7")
 ```
 
 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
 A separate `multiplatform-settings-coroutines` dependency includes various coroutine APIs.
 
 ```kotlin
-implementation("com.russhwolf:multiplatform-settings-coroutines:0.7.6")
+implementation("com.russhwolf:multiplatform-settings-coroutines:0.7.7")
 
 // Or, if you use native-mt coroutines release
-implementation("com.russhwolf:multiplatform-settings-coroutines-native-mt:0.7.6")
+implementation("com.russhwolf:multiplatform-settings-coroutines-native-mt:0.7.7")
 ```
 
 This adds flow extensions for all types which use the listener APIs internally.
@@ -389,7 +389,7 @@ val blockingSettings: Settings = suspendSettings.toBlockingSettings()
 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)
 
 ```kotlin
-implementation("com.russhwolf:multiplatform-settings-datastore:0.7.6")
+implementation("com.russhwolf:multiplatform-settings-datastore:0.7.7")
 ```
 
 This provides a `DataStoreSettings` class

azure-pipelines.yml

@@ -68,7 +68,7 @@ jobs:
           jdkArchitectureOption: 'x64'
           publishJUnitResults: true
           testResultsFiles: '**/TEST-*.xml'
-          tasks: 'clean macosX64Test iosX64Test watchosX86Test tvosX64Test publishKotlinMultiplatformPublicationToMavenLocal publishMetadataPublicationToMavenLocal publishIosArm32PublicationToMavenLocal publishIosArm64PublicationToMavenLocal publishIosX64PublicationToMavenLocal publishMacosX64PublicationToMavenLocal publishWatchosArm32PublicationToMavenLocal publishWatchosArm64PublicationToMavenLocal publishWatchosX86PublicationToMavenLocal publishTvosArm64PublicationToMavenLocal publishTvosX64PublicationToMavenLocal'
+          tasks: 'clean macosX64Test iosX64Test watchosX86Test tvosX64Test publishKotlinMultiplatformPublicationToMavenLocal publishIosArm32PublicationToMavenLocal publishIosArm64PublicationToMavenLocal publishIosX64PublicationToMavenLocal publishMacosX64PublicationToMavenLocal publishWatchosArm32PublicationToMavenLocal publishWatchosArm64PublicationToMavenLocal publishWatchosX86PublicationToMavenLocal publishTvosArm64PublicationToMavenLocal publishTvosX64PublicationToMavenLocal'
 
       - task: Gradle@2
         inputs:
@@ -114,7 +114,7 @@ jobs:
           jdkArchitectureOption: 'x64'
           publishJUnitResults: true
           testResultsFiles: '**/TEST-*.xml'
-          tasks: 'clean mingwX64Test publishKotlinMultiplatformPublicationToMavenLocal publishMetadataPublicationToMavenLocal publishMingwX64PublicationToMavenLocal publishMingwX86PublicationToMavenLocal'
+          tasks: 'clean mingwX64Test publishKotlinMultiplatformPublicationToMavenLocal publishMingwX64PublicationToMavenLocal publishMingwX86PublicationToMavenLocal'
 
     pool:
       vmImage: 'windows-latest'

buildSrc/build.gradle.kts

@@ -15,7 +15,7 @@
  */
 
 plugins {
-    kotlin("jvm") version "1.4.32"
+    kotlin("jvm") version "1.5.0"
 }
 
 repositories {

buildSrc/src/main/kotlin/BuildHelpers.kt

@@ -88,8 +88,7 @@ private fun KotlinMultiplatformExtension.buildAllTargets(targetPresets: NamedDom
     }
     targets.configureEach {
         it.compilations.configureEach {
-            // TODO having trouble suppressing warning about confliction coroutines versions
-//            it.kotlinOptions.allWarningsAsErrors = true
+            it.kotlinOptions.allWarningsAsErrors = true
         }
     }
 

buildSrc/src/main/kotlin/Versions.kt

@@ -17,7 +17,7 @@
 @file:Suppress("KDocMissingDocumentation")
 
 object Versions {
-    const val multiplatformSettings = "0.7.6"
+    const val multiplatformSettings = "0.7.7"
 
     const val minSdk = 15
     const val compileSdk = 30
@@ -28,11 +28,11 @@ object Versions {
     const val androidxTest = "1.3.0"
     const val androidxTestExt = "1.1.2"
     const val binaryCompatibilityValidator = "0.2.4"
-    const val coroutines = "1.4.3"
-    const val coroutinesNativeMt = "1.4.3-native-mt"
+    const val coroutines = "1.5.0"
+    const val coroutinesNativeMt = "1.5.0-native-mt"
     const val junit = "4.13.2"
     const val robolectric = "4.5.1"
     const val serializationPlugin = "1.5.0"
-    const val serializationRuntime = "1.1.0"
-    const val turbine = "0.4.1"
+    const val serializationRuntime = "1.2.1"
+    const val turbine = "0.5.0"
 }

multiplatform-settings-coroutines-internal/src/commonMain/kotlin/com/russhwolf/settings/coroutines/CoroutineExtensions.kt

@@ -31,9 +31,9 @@ private inline fun <T> ObservableSettings.createFlow(
     defaultValue: T,
     crossinline getter: Settings.(String, T) -> T
 ): Flow<T> = callbackFlow {
-    offer(getter(key, defaultValue))
+    send(getter(key, defaultValue))
     val listener = addListener(key) {
-        offer(getter(key, defaultValue))
+        trySend(getter(key, defaultValue))
     }
     awaitClose {
         listener.deactivate()

multiplatform-settings-coroutines-internal/src/jsTest/kotlin/com/russhwolf/settings/coroutines/suspendTest.kt

@@ -1,7 +1,9 @@
 package com.russhwolf.settings.coroutines
 
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.promise
 
 
+@OptIn(DelicateCoroutinesApi::class)
 actual fun suspendTest(block: suspend () -> Unit): dynamic = GlobalScope.promise { block() }

multiplatform-settings-serialization/src/commonMain/kotlin/SettingsSerialization.kt

@@ -278,7 +278,7 @@ private class SettingsEncoder(
 
     public override fun encodeBoolean(value: Boolean) = settings.putBoolean(getKey(), value)
     public override fun encodeByte(value: Byte) = settings.putInt(getKey(), value.toInt())
-    public override fun encodeChar(value: Char) = settings.putInt(getKey(), value.toInt())
+    public override fun encodeChar(value: Char) = settings.putInt(getKey(), value.code)
     public override fun encodeDouble(value: Double) = settings.putDouble(getKey(), value)
     public override fun encodeEnum(enumDescriptor: SerialDescriptor, index: Int) = settings.putInt(getKey(), index)
     public override fun encodeFloat(value: Float) = settings.putFloat(getKey(), value)

multiplatform-settings-serialization/src/commonTest/kotlin/SettingsSerializationTest.kt

@@ -243,7 +243,7 @@ class SettingsSerializationTest {
         assertFalse("testClass.boolean?" in settings)
         assertEquals(1, settings.getInt("testClass.byte"))
         assertFalse("testClass.byte?" in settings)
-        assertEquals('2'.toInt(), settings.getInt("testClass.char"))
+        assertEquals('2'.code, settings.getInt("testClass.char"))
         assertFalse("testClass.char?" in settings)
         assertEquals(3.0, settings.getDouble("testClass.double"))
         assertFalse("testClass.double?" in settings)
@@ -356,7 +356,7 @@ class SettingsSerializationTest {
         assertEquals(true, settings.getBooleanOrNull("testClass.boolean?"))
         assertEquals(1, settings.getInt("testClass.byte"))
         assertEquals(true, settings.getBooleanOrNull("testClass.byte?"))
-        assertEquals('2'.toInt(), settings.getInt("testClass.char"))
+        assertEquals('2'.code, settings.getInt("testClass.char"))
         assertEquals(true, settings.getBooleanOrNull("testClass.char?"))
         assertEquals(3.0, settings.getDouble("testClass.double"))
         assertEquals(true, settings.getBooleanOrNull("testClass.double?"))
@@ -425,8 +425,6 @@ class SettingsSerializationTest {
 
     @Test
     fun docsExample() {
-        @Serializable
-        data class User(val nickname: String?)
 
         val defaultUser = User("Asdf")
 
@@ -506,6 +504,9 @@ class SettingsSerializationTest {
     }
 }
 
+@Serializable
+data class User(val nickname: String?)
+
 @Serializable
 data class Foo(val bar: String, val baz: Int = 42)
 

multiplatform-settings-test/api/multiplatform-settings-test.api

@@ -40,6 +40,7 @@ public final class com/russhwolf/settings/MockSettings$Factory : com/russhwolf/s
 }
 
 public final class com/russhwolf/settings/MockSettings$Listener : com/russhwolf/settings/SettingsListener {
+	public fun <init> (Ljava/util/List;Lkotlin/jvm/functions/Function0;)V
 	public fun deactivate ()V
 }
 

multiplatform-settings/api/multiplatform-settings.api

@@ -74,6 +74,7 @@ public final class com/russhwolf/settings/JvmPreferencesSettings$Factory : com/r
 }
 
 public final class com/russhwolf/settings/JvmPreferencesSettings$Listener : com/russhwolf/settings/SettingsListener {
+	public fun <init> (Ljava/util/prefs/Preferences;Ljava/util/prefs/PreferenceChangeListener;)V
 	public fun deactivate ()V
 }
 
@@ -105,6 +106,9 @@ public final class com/russhwolf/settings/JvmPropertiesSettings : com/russhwolf/
 	public fun remove (Ljava/lang/String;)V
 }
 
+public final class com/russhwolf/settings/JvmSettingsKt {
+}
+
 public final class com/russhwolf/settings/ListenerExtensionsKt {
 	public static final fun addBooleanListener (Lcom/russhwolf/settings/ObservableSettings;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Lcom/russhwolf/settings/SettingsListener;
 	public static synthetic fun addBooleanListener$default (Lcom/russhwolf/settings/ObservableSettings;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/russhwolf/settings/SettingsListener;
@@ -137,6 +141,7 @@ public final class com/russhwolf/settings/ObservableSettings$DefaultImpls {
 
 public final class com/russhwolf/settings/OperatorsKt {
 	public static final fun contains (Lcom/russhwolf/settings/Settings;Ljava/lang/String;)Z
+	public static final synthetic fun get (Lcom/russhwolf/settings/Settings;Ljava/lang/String;)Ljava/lang/Object;
 	public static final fun get (Lcom/russhwolf/settings/Settings;Ljava/lang/String;D)D
 	public static final fun get (Lcom/russhwolf/settings/Settings;Ljava/lang/String;F)F
 	public static final fun get (Lcom/russhwolf/settings/Settings;Ljava/lang/String;I)I
@@ -148,6 +153,7 @@ public final class com/russhwolf/settings/OperatorsKt {
 	public static final fun set (Lcom/russhwolf/settings/Settings;Ljava/lang/String;F)V
 	public static final fun set (Lcom/russhwolf/settings/Settings;Ljava/lang/String;I)V
 	public static final fun set (Lcom/russhwolf/settings/Settings;Ljava/lang/String;J)V
+	public static final synthetic fun set (Lcom/russhwolf/settings/Settings;Ljava/lang/String;Ljava/lang/Object;)V
 	public static final fun set (Lcom/russhwolf/settings/Settings;Ljava/lang/String;Ljava/lang/String;)V
 	public static final fun set (Lcom/russhwolf/settings/Settings;Ljava/lang/String;Ljava/lang/Void;)V
 	public static final fun set (Lcom/russhwolf/settings/Settings;Ljava/lang/String;Z)V
@@ -200,6 +206,9 @@ public final class com/russhwolf/settings/Settings$Factory$DefaultImpls {
 	public static synthetic fun create$default (Lcom/russhwolf/settings/Settings$Factory;Ljava/lang/String;ILjava/lang/Object;)Lcom/russhwolf/settings/Settings;
 }
 
+public final class com/russhwolf/settings/SettingsKt {
+}
+
 public abstract interface class com/russhwolf/settings/SettingsListener {
 	public abstract fun deactivate ()V
 }

sample/app-android/build.gradle.kts

@@ -45,6 +45,11 @@ android {
     packagingOptions {
         exclude("META-INF/*.kotlin_module")
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {

sample/build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
 }
 
 allprojects {
-    ext["library_version"] = "0.7.6"
+    ext["library_version"] = "0.7.7"
 
     repositories {
         mavenLocal()

sample/shared/build.gradle.kts

@@ -15,6 +15,7 @@
  */
 
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     id("com.android.library")
@@ -114,8 +115,18 @@ android {
     defaultConfig {
         minSdkVersion(15)
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
 }
 
+tasks.withType<KotlinCompile>().all {
+    kotlinOptions.jvmTarget = "1.8"
+}
+
+
 task("copyFramework") {
     val buildType = project.findProperty("kotlin.build.type") as? String ?: "DEBUG"
     val framework = (kotlin.targets["ios"] as KotlinNativeTarget).compilations["main"].target.binaries.findFramework("Shared", buildType)!!