From e66ae408cd53c45af50ca6788a6c672a1f877e44 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sun, 31 Jan 2021 20:55:01 +0300 Subject: [PATCH] Fix return type for ActiveDataTree.kt --- .github/workflows/publish.yml | 40 +++++++++++++++++++ .../hep/dataforge/data/ActiveDataTree.kt | 4 +- 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/publish.yml diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 00000000..0d472b1b --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,40 @@ +name: Bintray Publish + +on: + release: + types: + - created + +jobs: + build-on-windows: + runs-on: windows-latest + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v1 + with: + java-version: 11 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Gradle clean + run: ./gradlew clean + - name: Gradle build + run: ./gradlew build + - name: Run release task + run: ./gradlew release -PbintrayUser=${{ secrets.BINTRAY_USER }} -PbintrayApiKey=${{ secrets.BINTRAY_KEY }} + build-on-macos: + runs-on: macos-latest + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v1 + with: + java-version: 11 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Gradle clean + run: ./gradlew clean + - name: Gradle build + run: ./gradlew build + - name: Run release task + run: ./gradlew release -PbintrayUser=${{ secrets.BINTRAY_USER }} -PbintrayApiKey=${{ secrets.BINTRAY_KEY }} diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/ActiveDataTree.kt b/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/ActiveDataTree.kt index b8200fa5..eb6e5582 100644 --- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/ActiveDataTree.kt +++ b/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/ActiveDataTree.kt @@ -94,7 +94,7 @@ public class ActiveDataTree( public suspend fun ActiveDataTree( type: KClass, block: suspend ActiveDataTree.() -> Unit, -): DataTree { +): ActiveDataTree { val tree = ActiveDataTree(type) tree.block() return tree @@ -103,7 +103,7 @@ public suspend fun ActiveDataTree( @Suppress("FunctionName") public suspend inline fun ActiveDataTree( crossinline block: suspend ActiveDataTree.() -> Unit, -): DataTree = ActiveDataTree(T::class).apply { block() } +): ActiveDataTree = ActiveDataTree(T::class).apply { block() } public suspend inline fun ActiveDataTree.emit(