chore(deps): update all dependencies (hoc081098#175)

* chore(deps): update all dependencies

| datasource     | package                                                                                                                 | from   | to     |
| -------------- | ----------------------------------------------------------------------------------------------------------------------- | ------ | ------ |
| github-tags    | JamesIves/github-pages-deploy-action                                                                                    | v4.4.1 | v4.4.2 |
| gradle-version | gradle                                                                                                                  | 8.1.1  | 8.2    |
| maven          | org.jetbrains.kotlinx:kotlinx-coroutines-test                                                                           | 1.7.1  | 1.7.2  |
| maven          | org.jetbrains.kotlinx:kotlinx-coroutines-core                                                                           | 1.7.1  | 1.7.2  |
| maven          | org.jetbrains.kotlinx.kover:org.jetbrains.kotlinx.kover.gradle.plugin                                                   | 0.7.0  | 0.7.2  |
| maven          | org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin                                                                   | 1.8.10 | 1.8.20 |
| maven          | org.jetbrains.kotlinx.binary-compatibility-validator:org.jetbrains.kotlinx.binary-compatibility-validator.gradle.plugin | 0.13.1 | 0.13.2 |
| maven          | com.vanniktech.maven.publish:com.vanniktech.maven.publish.gradle.plugin                                                 | 0.25.2 | 0.25.3 |
| maven          | com.diffplug.spotless:com.diffplug.spotless.gradle.plugin                                                               | 6.18.0 | 6.19.0 |
| maven          | org.jetbrains.kotlin.multiplatform:org.jetbrains.kotlin.multiplatform.gradle.plugin                                     | 1.8.21 | 1.8.22 |

* fix spotless

* CHANGELOG.md

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Petrus Nguyễn Thái Học <[email protected]>

Author: renovate[bot]

.editorconfig

@@ -7,4 +7,4 @@ trim_trailing_whitespace=true
 insert_final_newline=true
 [*.{kt, kts}]
 ij_kotlin_imports_layout=*
-disabled_rules=filename
+ktlint_standard_filename=disabled

.github/workflows/build.yml

@@ -154,7 +154,7 @@ jobs:
 
       - name: Deploy docs 🚀 to website
         if: ${{ github.ref == 'refs/heads/master' && github.repository == 'hoc081098/FlowExt' && matrix.os == 'macos-11' }}
-        uses: JamesIves/[email protected].1
+        uses: JamesIves/[email protected].2
         with:
           branch: gh-pages # The branch the action should deploy to.
           folder: build/dokka/html # The folder the action should deploy.

.github/workflows/publish-release.yml

@@ -108,7 +108,7 @@ jobs:
 
       - name: Deploy docs 🚀 to website
         if: ${{ matrix.os == 'macos-11' }}
-        uses: JamesIves/[email protected].1
+        uses: JamesIves/[email protected].2
         with:
           branch: gh-pages # The branch the action should deploy to.
           folder: build/dokka/html # The folder the action should deploy.

.idea/codeStyles/Project.xml

@@ -2,6 +2,11 @@
 
 ## [Unreleased] - TODO
 
+- Update dependencies
+  - `Kotlin` to `1.8.22`.
+  - `KotlinX Coroutines` to `1.7.2`.
+  - `Gradle` to `8.2`.
+
 ## [0.6.1] - May 18, 2023
 
 ### Changed

CHANGELOG.md

@@ -1,25 +1,25 @@
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 import com.vanniktech.maven.publish.MavenPublishBasePlugin
 import com.vanniktech.maven.publish.SonatypeHost
-import java.net.URL
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithTests
 import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
+import java.net.URL
 
 plugins {
-  kotlin("multiplatform") version "1.8.21"
-  id("com.diffplug.spotless") version "6.18.0"
+  kotlin("multiplatform") version "1.8.22"
+  id("com.diffplug.spotless") version "6.19.0"
   id("maven-publish")
-  id("com.vanniktech.maven.publish") version "0.25.2"
-  id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.13.1"
-  id("org.jetbrains.dokka") version "1.8.10"
-  id("org.jetbrains.kotlinx.kover") version "0.7.0"
+  id("com.vanniktech.maven.publish") version "0.25.3"
+  id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.13.2"
+  id("org.jetbrains.dokka") version "1.8.20"
+  id("org.jetbrains.kotlinx.kover") version "0.7.2"
 }
 
-val coroutinesVersion = "1.7.1"
-val ktlintVersion = "0.46.1"
+val coroutinesVersion = "1.7.2"
+val ktlintVersion = "0.49.1"
 
 repositories {
   mavenCentral()
@@ -164,19 +164,19 @@ kotlin {
       "watchosSimulatorArm64",
       "watchosX64",
       "watchosSimulatorArm64",
-      "watchosDeviceArm64"
+      "watchosDeviceArm64",
     )
 
     val linuxTargets = listOf(
       "linuxX64",
-      "linuxArm64"
+      "linuxArm64",
     )
 
     val androidNativeTargets = listOf(
       "androidNativeArm32",
       "androidNativeArm64",
       "androidNativeX86",
-      "androidNativeX64"
+      "androidNativeX64",
     )
 
     appleTargets.forEach {
@@ -232,32 +232,12 @@ kotlin {
 }
 
 spotless {
-  val EDITOR_CONFIG_KEYS: Set<String> = hashSetOf(
-    "ij_kotlin_imports_layout",
-    "indent_size",
-    "end_of_line",
-    "charset",
-    "continuation_indent_size",
-    "disabled_rules"
-  )
-
   kotlin {
     target("**/*.kt")
 
-    // TODO this should all come from editorconfig https://github.com/diffplug/spotless/issues/142
-    val data = mapOf(
-      "indent_size" to "2",
-      "continuation_indent_size" to "4",
-      "ij_kotlin_imports_layout" to "*",
-      "end_of_line" to "lf",
-      "charset" to "utf-8",
-      "disabled_rules" to arrayOf("filename").joinToString(separator = ",")
-    )
-
     ktlint(ktlintVersion)
       .setUseExperimental(true)
-      .userData(data.filterKeys { it !in EDITOR_CONFIG_KEYS })
-      .editorConfigOverride(data.filterKeys { it in EDITOR_CONFIG_KEYS })
+      .setEditorConfigPath("$rootDir/.editorconfig")
 
     trimTrailingWhitespace()
     indentWithSpaces()
@@ -269,17 +249,9 @@ spotless {
   kotlinGradle {
     target("**/*.kts")
 
-    val data = mapOf(
-      "indent_size" to "2",
-      "continuation_indent_size" to "4",
-      "ij_kotlin_imports_layout" to "*",
-      "end_of_line" to "lf",
-      "charset" to "utf-8"
-    )
     ktlint(ktlintVersion)
       .setUseExperimental(true)
-      .userData(data.filterKeys { it !in EDITOR_CONFIG_KEYS })
-      .editorConfigOverride(data.filterKeys { it in EDITOR_CONFIG_KEYS })
+      .setEditorConfigPath("$rootDir/.editorconfig")
 
     trimTrailingWhitespace()
     indentWithSpaces()
@@ -307,7 +279,7 @@ tasks.withType<AbstractTestTask> {
       TestLogEvent.FAILED,
       TestLogEvent.SKIPPED,
       TestLogEvent.STANDARD_OUT,
-      TestLogEvent.STANDARD_ERROR
+      TestLogEvent.STANDARD_ERROR,
     )
     exceptionFormat = TestExceptionFormat.FULL
   }

build.gradle.kts

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -43,12 +43,12 @@ import kotlinx.coroutines.flow.Flow
   level = RequiresOptIn.Level.WARNING,
   message = "This declaration is in a preview state and can be changed in a backwards-incompatible manner with a best-effort migration. " +
     "Its usage should be marked with '@com.hoc081098.flowext.FlowExtPreview' or '@OptIn(com.hoc081098.flowext.FlowExtPreview::class)' " +
-    "if you accept the drawback of relying on preview API"
+    "if you accept the drawback of relying on preview API",
 )
 @Target(
   AnnotationTarget.CLASS,
   AnnotationTarget.FUNCTION,
   AnnotationTarget.TYPEALIAS,
-  AnnotationTarget.PROPERTY
+  AnnotationTarget.PROPERTY,
 )
 public annotation class FlowExtPreview

src/commonMain/kotlin/com/hoc081098/flowext/FlowExtPreview.kt

@@ -40,15 +40,15 @@ public fun <T1, T2, T3, T4, T5, T6, R> combine(
   flow4: Flow<T4>,
   flow5: Flow<T5>,
   flow6: Flow<T6>,
-  transform: suspend (T1, T2, T3, T4, T5, T6) -> R
+  transform: suspend (T1, T2, T3, T4, T5, T6) -> R,
 ): Flow<R> = coroutinesFlowCombine(flow, flow2, flow3, flow4, flow5, flow6) { args: Array<*> ->
   transform(
     args[0] as T1,
     args[1] as T2,
     args[2] as T3,
     args[3] as T4,
     args[4] as T5,
-    args[5] as T6
+    args[5] as T6,
   )
 }
 
@@ -64,7 +64,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, R> combine(
   flow5: Flow<T5>,
   flow6: Flow<T6>,
   flow7: Flow<T7>,
-  transform: suspend (T1, T2, T3, T4, T5, T6, T7) -> R
+  transform: suspend (T1, T2, T3, T4, T5, T6, T7) -> R,
 ): Flow<R> =
   coroutinesFlowCombine(flow, flow2, flow3, flow4, flow5, flow6, flow7) { args: Array<*> ->
     transform(
@@ -74,7 +74,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, R> combine(
       args[3] as T4,
       args[4] as T5,
       args[5] as T6,
-      args[6] as T7
+      args[6] as T7,
     )
   }
 
@@ -91,7 +91,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, R> combine(
   flow6: Flow<T6>,
   flow7: Flow<T7>,
   flow8: Flow<T8>,
-  transform: suspend (T1, T2, T3, T4, T5, T6, T7, T8) -> R
+  transform: suspend (T1, T2, T3, T4, T5, T6, T7, T8) -> R,
 ): Flow<R> =
   coroutinesFlowCombine(flow, flow2, flow3, flow4, flow5, flow6, flow7, flow8) { args: Array<*> ->
     transform(
@@ -102,7 +102,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, R> combine(
       args[4] as T5,
       args[5] as T6,
       args[6] as T7,
-      args[7] as T8
+      args[7] as T8,
     )
   }
 
@@ -120,7 +120,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> combine(
   flow7: Flow<T7>,
   flow8: Flow<T8>,
   flow9: Flow<T9>,
-  transform: suspend (T1, T2, T3, T4, T5, T6, T7, T8, T9) -> R
+  transform: suspend (T1, T2, T3, T4, T5, T6, T7, T8, T9) -> R,
 ): Flow<R> = coroutinesFlowCombine(
   flow,
   flow2,
@@ -130,7 +130,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> combine(
   flow6,
   flow7,
   flow8,
-  flow9
+  flow9,
 ) { args: Array<*> ->
   transform(
     args[0] as T1,
@@ -141,7 +141,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> combine(
     args[5] as T6,
     args[6] as T7,
     args[7] as T8,
-    args[8] as T9
+    args[8] as T9,
   )
 }
 
@@ -160,7 +160,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, R> combine(
   flow8: Flow<T8>,
   flow9: Flow<T9>,
   flow10: Flow<T10>,
-  transform: suspend (T1, T2, T3, T4, T5, T6, T7, T8, T9, T10) -> R
+  transform: suspend (T1, T2, T3, T4, T5, T6, T7, T8, T9, T10) -> R,
 ): Flow<R> = coroutinesFlowCombine(
   flow,
   flow2,
@@ -171,7 +171,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, R> combine(
   flow7,
   flow8,
   flow9,
-  flow10
+  flow10,
 ) { args: Array<*> ->
   transform(
     args[0] as T1,
@@ -183,7 +183,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, R> combine(
     args[6] as T7,
     args[7] as T8,
     args[8] as T9,
-    args[9] as T10
+    args[9] as T10,
   )
 }
 
@@ -203,7 +203,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, R> combine(
   flow9: Flow<T9>,
   flow10: Flow<T10>,
   flow11: Flow<T11>,
-  transform: suspend (T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11) -> R
+  transform: suspend (T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11) -> R,
 ): Flow<R> = coroutinesFlowCombine(
   flow,
   flow2,
@@ -215,7 +215,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, R> combine(
   flow8,
   flow9,
   flow10,
-  flow11
+  flow11,
 ) { args: Array<*> ->
   transform(
     args[0] as T1,
@@ -228,7 +228,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, R> combine(
     args[7] as T8,
     args[8] as T9,
     args[9] as T10,
-    args[10] as T11
+    args[10] as T11,
   )
 }
 
@@ -249,7 +249,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, R> combine(
   flow10: Flow<T10>,
   flow11: Flow<T11>,
   flow12: Flow<T12>,
-  transform: suspend (T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12) -> R
+  transform: suspend (T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12) -> R,
 ): Flow<R> = coroutinesFlowCombine(
   flow,
   flow2,
@@ -262,7 +262,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, R> combine(
   flow9,
   flow10,
   flow11,
-  flow12
+  flow12,
 ) { args: Array<*> ->
   transform(
     args[0] as T1,
@@ -276,6 +276,6 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, R> combine(
     args[8] as T9,
     args[9] as T10,
     args[10] as T11,
-    args[11] as T12
+    args[11] as T12,
   )
 }