Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit c88aaba

Browse files
renovate[bot]hoc081098
andauthored
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 <hoc081098@gmail.com>
1 parent 1d6ade7 commit c88aaba

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+511
-518
lines changed

‎.editorconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ trim_trailing_whitespace=true
77
insert_final_newline=true
88
[*.{kt, kts}]
99
ij_kotlin_imports_layout=*
10-
disabled_rules=filename
10+
ktlint_standard_filename=disabled

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ jobs:
154154

155155
- name: Deploy docs 🚀 to website
156156
if: ${{ github.ref == 'refs/heads/master' && github.repository == 'hoc081098/FlowExt' && matrix.os == 'macos-11' }}
157-
uses: JamesIves/github-pages-deploy-action@v4.4.1
157+
uses: JamesIves/github-pages-deploy-action@v4.4.2
158158
with:
159159
branch: gh-pages # The branch the action should deploy to.
160160
folder: build/dokka/html # The folder the action should deploy.

‎.github/workflows/publish-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108

109109
- name: Deploy docs 🚀 to website
110110
if: ${{ matrix.os == 'macos-11' }}
111-
uses: JamesIves/github-pages-deploy-action@v4.4.1
111+
uses: JamesIves/github-pages-deploy-action@v4.4.2
112112
with:
113113
branch: gh-pages # The branch the action should deploy to.
114114
folder: build/dokka/html # The folder the action should deploy.

‎.idea/codeStyles/Project.xml‎

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
## [Unreleased] - TODO
44

5+
- Update dependencies
6+
- `Kotlin` to `1.8.22`.
7+
- `KotlinX Coroutines` to `1.7.2`.
8+
- `Gradle` to `8.2`.
9+
510
## [0.6.1] - May 18, 2023
611

712
### Changed

‎build.gradle.kts‎

Lines changed: 15 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
import com.vanniktech.maven.publish.MavenPublishBaseExtension
22
import com.vanniktech.maven.publish.MavenPublishBasePlugin
33
import com.vanniktech.maven.publish.SonatypeHost
4-
import java.net.URL
54
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
65
import org.gradle.api.tasks.testing.logging.TestLogEvent
76
import org.jetbrains.dokka.gradle.DokkaTask
87
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithTests
98
import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
9+
import java.net.URL
1010

1111
plugins {
12-
kotlin("multiplatform") version "1.8.21"
13-
id("com.diffplug.spotless") version "6.18.0"
12+
kotlin("multiplatform") version "1.8.22"
13+
id("com.diffplug.spotless") version "6.19.0"
1414
id("maven-publish")
15-
id("com.vanniktech.maven.publish") version "0.25.2"
16-
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.13.1"
17-
id("org.jetbrains.dokka") version "1.8.10"
18-
id("org.jetbrains.kotlinx.kover") version "0.7.0"
15+
id("com.vanniktech.maven.publish") version "0.25.3"
16+
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.13.2"
17+
id("org.jetbrains.dokka") version "1.8.20"
18+
id("org.jetbrains.kotlinx.kover") version "0.7.2"
1919
}
2020

21-
val coroutinesVersion = "1.7.1"
22-
val ktlintVersion = "0.46.1"
21+
val coroutinesVersion = "1.7.2"
22+
val ktlintVersion = "0.49.1"
2323

2424
repositories {
2525
mavenCentral()
@@ -164,19 +164,19 @@ kotlin {
164164
"watchosSimulatorArm64",
165165
"watchosX64",
166166
"watchosSimulatorArm64",
167-
"watchosDeviceArm64"
167+
"watchosDeviceArm64",
168168
)
169169

170170
val linuxTargets = listOf(
171171
"linuxX64",
172-
"linuxArm64"
172+
"linuxArm64",
173173
)
174174

175175
val androidNativeTargets = listOf(
176176
"androidNativeArm32",
177177
"androidNativeArm64",
178178
"androidNativeX86",
179-
"androidNativeX64"
179+
"androidNativeX64",
180180
)
181181

182182
appleTargets.forEach {
@@ -232,32 +232,12 @@ kotlin {
232232
}
233233

234234
spotless {
235-
val EDITOR_CONFIG_KEYS: Set<String> = hashSetOf(
236-
"ij_kotlin_imports_layout",
237-
"indent_size",
238-
"end_of_line",
239-
"charset",
240-
"continuation_indent_size",
241-
"disabled_rules"
242-
)
243-
244235
kotlin {
245236
target("**/*.kt")
246237

247-
// TODO this should all come from editorconfig https://github.com/diffplug/spotless/issues/142
248-
val data = mapOf(
249-
"indent_size" to "2",
250-
"continuation_indent_size" to "4",
251-
"ij_kotlin_imports_layout" to "*",
252-
"end_of_line" to "lf",
253-
"charset" to "utf-8",
254-
"disabled_rules" to arrayOf("filename").joinToString(separator = ",")
255-
)
256-
257238
ktlint(ktlintVersion)
258239
.setUseExperimental(true)
259-
.userData(data.filterKeys { it !in EDITOR_CONFIG_KEYS })
260-
.editorConfigOverride(data.filterKeys { it in EDITOR_CONFIG_KEYS })
240+
.setEditorConfigPath("$rootDir/.editorconfig")
261241

262242
trimTrailingWhitespace()
263243
indentWithSpaces()
@@ -269,17 +249,9 @@ spotless {
269249
kotlinGradle {
270250
target("**/*.kts")
271251

272-
val data = mapOf(
273-
"indent_size" to "2",
274-
"continuation_indent_size" to "4",
275-
"ij_kotlin_imports_layout" to "*",
276-
"end_of_line" to "lf",
277-
"charset" to "utf-8"
278-
)
279252
ktlint(ktlintVersion)
280253
.setUseExperimental(true)
281-
.userData(data.filterKeys { it !in EDITOR_CONFIG_KEYS })
282-
.editorConfigOverride(data.filterKeys { it in EDITOR_CONFIG_KEYS })
254+
.setEditorConfigPath("$rootDir/.editorconfig")
283255

284256
trimTrailingWhitespace()
285257
indentWithSpaces()
@@ -307,7 +279,7 @@ tasks.withType<AbstractTestTask> {
307279
TestLogEvent.FAILED,
308280
TestLogEvent.SKIPPED,
309281
TestLogEvent.STANDARD_OUT,
310-
TestLogEvent.STANDARD_ERROR
282+
TestLogEvent.STANDARD_ERROR,
311283
)
312284
exceptionFormat = TestExceptionFormat.FULL
313285
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ import kotlinx.coroutines.flow.Flow
4343
level = RequiresOptIn.Level.WARNING,
4444
message = "This declaration is in a preview state and can be changed in a backwards-incompatible manner with a best-effort migration. " +
4545
"Its usage should be marked with '@com.hoc081098.flowext.FlowExtPreview' or '@OptIn(com.hoc081098.flowext.FlowExtPreview::class)' " +
46-
"if you accept the drawback of relying on preview API"
46+
"if you accept the drawback of relying on preview API",
4747
)
4848
@Target(
4949
AnnotationTarget.CLASS,
5050
AnnotationTarget.FUNCTION,
5151
AnnotationTarget.TYPEALIAS,
52-
AnnotationTarget.PROPERTY
52+
AnnotationTarget.PROPERTY,
5353
)
5454
public annotation class FlowExtPreview

‎src/commonMain/kotlin/com/hoc081098/flowext/combine.kt‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ public fun <T1, T2, T3, T4, T5, T6, R> combine(
4040
flow4: Flow<T4>,
4141
flow5: Flow<T5>,
4242
flow6: Flow<T6>,
43-
transform: suspend (T1, T2, T3, T4, T5, T6) -> R
43+
transform: suspend (T1, T2, T3, T4, T5, T6) -> R,
4444
): Flow<R> = coroutinesFlowCombine(flow, flow2, flow3, flow4, flow5, flow6) { args: Array<*> ->
4545
transform(
4646
args[0] as T1,
4747
args[1] as T2,
4848
args[2] as T3,
4949
args[3] as T4,
5050
args[4] as T5,
51-
args[5] as T6
51+
args[5] as T6,
5252
)
5353
}
5454

@@ -64,7 +64,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, R> combine(
6464
flow5: Flow<T5>,
6565
flow6: Flow<T6>,
6666
flow7: Flow<T7>,
67-
transform: suspend (T1, T2, T3, T4, T5, T6, T7) -> R
67+
transform: suspend (T1, T2, T3, T4, T5, T6, T7) -> R,
6868
): Flow<R> =
6969
coroutinesFlowCombine(flow, flow2, flow3, flow4, flow5, flow6, flow7) { args: Array<*> ->
7070
transform(
@@ -74,7 +74,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, R> combine(
7474
args[3] as T4,
7575
args[4] as T5,
7676
args[5] as T6,
77-
args[6] as T7
77+
args[6] as T7,
7878
)
7979
}
8080

@@ -91,7 +91,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, R> combine(
9191
flow6: Flow<T6>,
9292
flow7: Flow<T7>,
9393
flow8: Flow<T8>,
94-
transform: suspend (T1, T2, T3, T4, T5, T6, T7, T8) -> R
94+
transform: suspend (T1, T2, T3, T4, T5, T6, T7, T8) -> R,
9595
): Flow<R> =
9696
coroutinesFlowCombine(flow, flow2, flow3, flow4, flow5, flow6, flow7, flow8) { args: Array<*> ->
9797
transform(
@@ -102,7 +102,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, R> combine(
102102
args[4] as T5,
103103
args[5] as T6,
104104
args[6] as T7,
105-
args[7] as T8
105+
args[7] as T8,
106106
)
107107
}
108108

@@ -120,7 +120,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> combine(
120120
flow7: Flow<T7>,
121121
flow8: Flow<T8>,
122122
flow9: Flow<T9>,
123-
transform: suspend (T1, T2, T3, T4, T5, T6, T7, T8, T9) -> R
123+
transform: suspend (T1, T2, T3, T4, T5, T6, T7, T8, T9) -> R,
124124
): Flow<R> = coroutinesFlowCombine(
125125
flow,
126126
flow2,
@@ -130,7 +130,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> combine(
130130
flow6,
131131
flow7,
132132
flow8,
133-
flow9
133+
flow9,
134134
) { args: Array<*> ->
135135
transform(
136136
args[0] as T1,
@@ -141,7 +141,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> combine(
141141
args[5] as T6,
142142
args[6] as T7,
143143
args[7] as T8,
144-
args[8] as T9
144+
args[8] as T9,
145145
)
146146
}
147147

@@ -160,7 +160,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, R> combine(
160160
flow8: Flow<T8>,
161161
flow9: Flow<T9>,
162162
flow10: Flow<T10>,
163-
transform: suspend (T1, T2, T3, T4, T5, T6, T7, T8, T9, T10) -> R
163+
transform: suspend (T1, T2, T3, T4, T5, T6, T7, T8, T9, T10) -> R,
164164
): Flow<R> = coroutinesFlowCombine(
165165
flow,
166166
flow2,
@@ -171,7 +171,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, R> combine(
171171
flow7,
172172
flow8,
173173
flow9,
174-
flow10
174+
flow10,
175175
) { args: Array<*> ->
176176
transform(
177177
args[0] as T1,
@@ -183,7 +183,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, R> combine(
183183
args[6] as T7,
184184
args[7] as T8,
185185
args[8] as T9,
186-
args[9] as T10
186+
args[9] as T10,
187187
)
188188
}
189189

@@ -203,7 +203,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, R> combine(
203203
flow9: Flow<T9>,
204204
flow10: Flow<T10>,
205205
flow11: Flow<T11>,
206-
transform: suspend (T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11) -> R
206+
transform: suspend (T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11) -> R,
207207
): Flow<R> = coroutinesFlowCombine(
208208
flow,
209209
flow2,
@@ -215,7 +215,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, R> combine(
215215
flow8,
216216
flow9,
217217
flow10,
218-
flow11
218+
flow11,
219219
) { args: Array<*> ->
220220
transform(
221221
args[0] as T1,
@@ -228,7 +228,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, R> combine(
228228
args[7] as T8,
229229
args[8] as T9,
230230
args[9] as T10,
231-
args[10] as T11
231+
args[10] as T11,
232232
)
233233
}
234234

@@ -249,7 +249,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, R> combine(
249249
flow10: Flow<T10>,
250250
flow11: Flow<T11>,
251251
flow12: Flow<T12>,
252-
transform: suspend (T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12) -> R
252+
transform: suspend (T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12) -> R,
253253
): Flow<R> = coroutinesFlowCombine(
254254
flow,
255255
flow2,
@@ -262,7 +262,7 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, R> combine(
262262
flow9,
263263
flow10,
264264
flow11,
265-
flow12
265+
flow12,
266266
) { args: Array<*> ->
267267
transform(
268268
args[0] as T1,
@@ -276,6 +276,6 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, R> combine(
276276
args[8] as T9,
277277
args[9] as T10,
278278
args[10] as T11,
279-
args[11] as T12
279+
args[11] as T12,
280280
)
281281
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /