diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index bfbbcc7..6adc3cf 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -2,15 +2,6 @@ name: Build and Release on: workflow_dispatch: - inputs: - build_type: - description: Build type - default: 'release' - type: choice - options: - - release - - beta - - alpha push: tags: - "v*" @@ -18,8 +9,6 @@ on: jobs: build: runs-on: ubuntu-latest - env: - BUILD_TYPE: ${{ inputs.build_type }} steps: - uses: actions/checkout@v4 @@ -35,12 +24,12 @@ jobs: run: chmod +x gradlew - name: Build APK - run: ./gradlew :composeApp:assemble${{ env.BUILD_TYPE }} + run: ./gradlew :composeApp:assembleRelease - name: Gitea Release uses: akkuman/gitea-release-action@v1 with: - files: "composeApp/build/outputs/apk/${{ env.BUILD_TYPE }}/*.apk" + files: "composeApp/build/outputs/apk/release/*.apk" server_url: "https://git.reya.su/" repository: "reya/coop-mobile" token: ${{ secrets.GITEA_TOKEN }} \ No newline at end of file diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts index 3371bb4..561c616 100644 --- a/composeApp/build.gradle.kts +++ b/composeApp/build.gradle.kts @@ -59,6 +59,8 @@ android { namespace = "su.reya.coop" compileSdk = libs.versions.android.compileSdk.get().toInt() + base.archivesName.set("coop") + signingConfigs { create("release") { storeFile = localProperties.getProperty("keystore.path")?.let { file(it) } @@ -88,20 +90,6 @@ android { ) signingConfig = signingConfigs.getByName("release") } - create("beta") { - initWith(getByName("release")) - applicationIdSuffix = ".beta" - versionNameSuffix = "-beta" - manifestPlaceholders["appName"] = "Coop Beta" - signingConfig = signingConfigs.getByName("release") - } - create("alpha") { - initWith(getByName("release")) - applicationIdSuffix = ".alpha" - versionNameSuffix = "-alpha" - manifestPlaceholders["appName"] = "Coop Alpha" - signingConfig = signingConfigs.getByName("release") - } } compileOptions { sourceCompatibility = JavaVersion.VERSION_11