From 0be926ad0ea11b8d995daabaa624de243bf7b74e Mon Sep 17 00:00:00 2001 From: Adam Kobus Date: Thu, 3 Feb 2022 02:53:28 +0100 Subject: [PATCH] Fix to the release build --- .github/workflows/publish-release.yml | 7 ++++--- .github/workflows/publish-snapshot.yml | 2 +- .../compose/navigation/demo/ui/demodialog/DemoDialogVM.kt | 4 ++-- gradle/publishing-root.gradle | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 9e5a48b..666307b 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -13,8 +13,9 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 - - name: Set up JDK 11 - uses: actions/setup-java@v2 + + - name: Configure JDK 11 + uses: actions/setup-java@v1 with: java-version: 1.11 @@ -30,7 +31,7 @@ jobs: - name: Publish to MavenCentral run: ./gradlew publishReleasePublicationToSonatypeRepository --max-workers 1 closeAndReleaseSonatypeStagingRepository env: - MAVEN_SNAPHOT: false + MAVEN_SNAPSHOT: false - name: Clean up secrets if: always() diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index 5571f24..079982a 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -32,7 +32,7 @@ jobs: - name: Publish to MavenCentral run: ./gradlew publishReleasePublicationToSonatypeRepository env: - MAVEN_SNAPHOT: true + MAVEN_SNAPSHOT: true - name: Clean up secrets if: always() diff --git a/demo/src/main/java/com/adamkobus/compose/navigation/demo/ui/demodialog/DemoDialogVM.kt b/demo/src/main/java/com/adamkobus/compose/navigation/demo/ui/demodialog/DemoDialogVM.kt index 5adac4d..b17d9bc 100644 --- a/demo/src/main/java/com/adamkobus/compose/navigation/demo/ui/demodialog/DemoDialogVM.kt +++ b/demo/src/main/java/com/adamkobus/compose/navigation/demo/ui/demodialog/DemoDialogVM.kt @@ -3,7 +3,7 @@ package com.adamkobus.compose.navigation.demo.ui.demodialog import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.adamkobus.compose.navigation.NavActionConsumer -import com.adamkobus.compose.navigation.data.NavAction +import com.adamkobus.compose.navigation.demo.nav.FromDemoDialog import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch import javax.inject.Inject @@ -16,7 +16,7 @@ class DemoDialogVM @Inject constructor( val interactions = DemoDialogInteractions( onCancelClicked = { viewModelScope.launch { - navActionConsumer.offer(NavAction.Back) + navActionConsumer.offer(FromDemoDialog.Dismiss) } } ) diff --git a/gradle/publishing-root.gradle b/gradle/publishing-root.gradle index edd6487..7c7c59c 100644 --- a/gradle/publishing-root.gradle +++ b/gradle/publishing-root.gradle @@ -2,7 +2,7 @@ rootProject.ext["adamkobusSonatypeUsername"] = "" rootProject.ext["adamkobusSonatypePassword"] = "" rootProject.ext["adamkobusSonatypeStagingProfileId"] = "" -rootProject.ext["snapshot"] = System.getenv().getOrDefault("MAVEN_SNAPHOT", "true") +rootProject.ext["snapshot"] = System.getenv().getOrDefault("MAVEN_SNAPSHOT", "true") def VERSION_BASE = "0.1.0" def VERSION_SUFFIX = ""