diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2cc67009..e0023ea1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -130,6 +130,12 @@ jobs: repository: zaneschepke/fdroid event-type: fdroid-update + # Setup TAG_NAME, which is used as a general "name" + - if: github.event_name == 'workflow_dispatch' + run: echo "TAG_NAME=${{ github.event.inputs.tag_name }}" >> $GITHUB_ENV + - if: github.event_name == 'schedule' + run: echo "TAG_NAME=nightly" >> $GITHUB_ENV + - name: Set version release notes if: ${{ inputs.release_type == 'release' }} run: | @@ -148,13 +154,7 @@ jobs: if: ${{ inputs.release_type == 'prerelease' }} run: | echo "RELEASE_NOTES=Testing version of app for specific feature." >> $GITHUB_ENV - gh release delete ${{ github.event.inputs.tag_name }} --yes || true - - # Setup TAG_NAME, which is used as a general "name" - - if: github.event_name == 'workflow_dispatch' - run: echo "TAG_NAME=${{ github.event.inputs.tag_name }}" >> $GITHUB_ENV - - if: github.event_name == 'schedule' - run: echo "TAG_NAME=nightly" >> $GITHUB_ENV + gh release delete ${{ github.event.inputs.tag_name }} --yes || true - name: Get checksum id: checksum diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1e4ebced..0052a7d2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ timber = "5.0.1" tunnel = "1.0.20230706" androidGradlePlugin = "8.5.1" kotlin = "2.0.0" -ksp = "2.0.0-1.0.23" +ksp = "2.0.0-1.0.24" composeBom = "2024.06.00" compose = "1.6.8" zxingAndroidEmbedded = "4.3.0" @@ -103,4 +103,4 @@ kotlinxSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi androidLibrary = { id = "com.android.library", version.ref = "androidGradlePlugin" } compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "gradlePlugins-ktlint" } -grgit = { id = "org.ajoberstar.grgit.service", version.ref = "gradlePlugins-grgit" } \ No newline at end of file +grgit = { id = "org.ajoberstar.grgit.service", version.ref = "gradlePlugins-grgit" }