Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/hoc081098/FlowExt into re…
Browse files Browse the repository at this point in the history
…novate/com.diffplug.spotless-6.x
  • Loading branch information
hoc081098 committed Jun 28, 2022
2 parents d1dc943 + 8cf68f7 commit e0c1e9e
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,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].3
uses: JamesIves/[email protected].4
with:
branch: gh-pages # The branch the action should deploy to.
folder: build/dokka/html # The folder the action should deploy.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:

- name: Deploy docs 🚀 to website
if: ${{ matrix.os == 'macos-11' }}
uses: JamesIves/[email protected].3
uses: JamesIves/[email protected].4
with:
branch: gh-pages # The branch the action should deploy to.
folder: build/dokka/html # The folder the action should deploy.
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## 0.4.0

- Update
- `Kotlin` to `1.7.0`.
- `KotlinX Coroutines` to `1.6.3`.

- Add
- `defer`.
- `flowFromSuspend`.
Expand Down
8 changes: 4 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithTests
import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType

plugins {
kotlin("multiplatform") version "1.6.21"
kotlin("multiplatform") version "1.7.0"
id("com.diffplug.spotless") version "6.7.2"
id("maven-publish")
id("com.vanniktech.maven.publish") version "0.20.0"
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.10.0"
id("org.jetbrains.dokka") version "1.6.21"
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.10.1"
id("org.jetbrains.dokka") version "1.7.0"
id("org.jetbrains.kotlinx.kover") version "0.5.1"
}

val coroutinesVersion = "1.6.1"
val coroutinesVersion = "1.6.3"
val ktlintVersion = "0.45.2"

repositories {
Expand Down

0 comments on commit e0c1e9e

Please sign in to comment.