From 51286d2a962a77c6ae844c4266b40a2e8860814f Mon Sep 17 00:00:00 2001 From: Sk Niyaj Ali Date: Fri, 6 Sep 2024 23:35:34 +0530 Subject: [PATCH] Fixed Build Error --- .github/workflows/master_dev_ci.yml | 8 ++++---- .github/workflows/onPush.yml | 4 ++-- androidApp/release-badging.txt | 2 +- build.gradle.kts | 5 +++-- settings.gradle.kts | 4 ++-- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/master_dev_ci.yml b/.github/workflows/master_dev_ci.yml index 96cd8db3f..8c12edf29 100644 --- a/.github/workflows/master_dev_ci.yml +++ b/.github/workflows/master_dev_ci.yml @@ -180,22 +180,22 @@ jobs: continue-on-error: true run: ./gradlew :androidApp:checkReleaseBadging - - name: Prevent updating Dependency Guard baselines if this is a fork + - name: Prevent updating release badging if this is a fork id: checkfork_badging if: steps.badging_verify.outcome == 'failure' && github.event.pull_request.head.repo.full_name != github.repository run: | - echo "::error::Dependency Guard failed, please update badging with: ./gradlew updateReleaseBadging" && exit 1 + echo "::error::Release Badging failed, please update badging with: ./gradlew updateReleaseBadging" && exit 1 # Runs if previous job failed - - name: Generate new Dependency Guard baselines if verification failed and it's a PR + - name: Generate new release badging if verification failed and it's a PR id: generate_badging if: steps.checkfork_badging.outcome == 'failure' && github.event_name == 'pull_request' run: | ./gradlew updateReleaseBadging - - name: Push new Dependency Guard baselines if available + - name: Push new release badging if available uses: stefanzweifel/git-auto-commit-action@v5 if: steps.generate_badging.outcome == 'success' with: diff --git a/.github/workflows/onPush.yml b/.github/workflows/onPush.yml index f8481dfb5..b11ebecb8 100644 --- a/.github/workflows/onPush.yml +++ b/.github/workflows/onPush.yml @@ -16,7 +16,7 @@ env: jobs: app_build: - name: Github, Firebase, and Sentry Release + name: Github Release runs-on: ubuntu-latest permissions: contents: write @@ -145,7 +145,7 @@ jobs: run: | ./gradlew :androidApp:bundleRelease - - name: Deploy to Playstore Internal + - name: Deploy to Play Store Internal run: bundle exec fastlane deploy_internal - name: Promote Internal to Beta diff --git a/androidApp/release-badging.txt b/androidApp/release-badging.txt index c00bc3cfb..e62dff556 100644 --- a/androidApp/release-badging.txt +++ b/androidApp/release-badging.txt @@ -1,4 +1,4 @@ -package: name='org.mifos.mobile' versionCode='1' versionName='0.0.1-beta.0.1442+20240906T133838Z' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14' +package: name='org.mifos.mobile' versionCode='1' versionName='0.0.1-beta.0.1445+20240906T175646Z' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14' sdkVersion:'26' targetSdkVersion:'34' uses-permission: name='android.permission.INTERNET' diff --git a/build.gradle.kts b/build.gradle.kts index 35edb9a67..a622eae73 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -33,9 +33,10 @@ plugins { alias(libs.plugins.jetbrainsCompose) apply false } -tasks.register("versionFile").configure { +tasks.register("versionFile") { group = "publishing" doLast { - File(projectDir, "version.txt").writeText(project.version.toString()) + println(project.version) + project.rootProject.file("version.txt").writeText(project.version.toString()) } } \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 734af5f5f..bc7089c8e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -24,9 +24,9 @@ plugins { extensions.configure { setDefaultInferredScope("patch") - stages("beta", "rc", "final") + stages("beta", "final") setScopeCalc { java.util.Optional.of(org.ajoberstar.reckon.core.Scope.PATCH) } - setScopeCalc(calcScopeFromProp().or(calcScopeFromCommitMessages())) +// setScopeCalc(calcScopeFromProp().or(calcScopeFromCommitMessages())) setStageCalc(calcStageFromProp()) setTagWriter { it.toString() } }