Remove build flavors for simpler builds for now

LiveTL · Mar 7, 2021 · 8285f46 · 8285f46
1 parent 7cb4fee
commit 8285f46
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -46,7 +46,7 @@ jobs:
       - name: Build and test app
         uses: eskatos/gradle-command-action@v1
         with:
-          arguments: assembleGithubRelease
+          arguments: assembleRelease
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true
@@ -64,7 +64,7 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/') && github.repository == 'LiveTL/android'
         uses: r0adkll/sign-android-release@v1
         with:
-          releaseDirectory: app/build/outputs/apk/standard/release
+          releaseDirectory: app/build/outputs/apk/release
           signingKeyBase64: ${{ secrets.KEY_B64 }}
           alias: ${{ secrets.ALIAS }}
           keyStorePassword: ${{ secrets.PASSWORD }}

diff --git a/app/build.gradle b/app/build.gradle
@@ -17,7 +17,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 30
         versionCode 1
-        versionName "1.0"
+        versionName "0.0.1"
     }
 
     sourceSets {
@@ -34,18 +34,6 @@ android {
         }
     }
 
-    flavorDimensions 'variant'
-
-    productFlavors {
-        playstore {
-            dimension 'variant'
-        }
-        github {
-            dimension 'variant'
-            applicationIdSuffix '.github'
-        }
-    }
-
     buildFeatures {
         compose true
         viewBinding true