Fix free flavor builds

.github/workflows/android.yml

@@ -18,9 +18,9 @@ jobs:
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
-      run: ./gradlew assemblePlayDebug assemblePlayDebugAndroidTest assemblePlayDebugUnitTest
+      run: ./gradlew assembleDebug assembleDebugAndroidTest assembleDebugUnitTest
     - name: Run unit tests
-      run: ./gradlew testPlayDebugUnitTest
+      run: ./gradlew testDebugUnitTest
     - name: Grant execute permission for flank_auth.sh
       run: chmod +x flank_auth.sh
     - name: Add auth for flank

app/build.gradle

@@ -3,7 +3,6 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'jacoco'
-apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: "com.osacky.fladle"
 
 def keystoreProperties = new Properties()
@@ -48,7 +47,7 @@ android {
         buildConfigField "boolean", "ENABLE_CUSTOM_CSS", "false"
     }
     signingConfigs {
-        release {
+        playRelease {
             keyAlias keystoreProperties['keyAlias']
             keyPassword keystoreProperties['keyPassword']
             storeFile file(keystoreProperties['storeFile'])
@@ -62,7 +61,6 @@ android {
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.release
             buildConfigField "boolean", "ENABLE_CUSTOM_CSS", "false"
         }
     }
@@ -72,7 +70,9 @@ android {
             applicationIdSuffix ".free"
             versionNameSuffix "-free"
         }
-        play {}
+        play {
+            signingConfig signingConfigs.playRelease
+        }
         samsung {
             applicationId "com.wbrawner.simplemarkdown.samsung"
         }
@@ -134,6 +134,7 @@ android.productFlavors.each { flavor ->
     if (getGradle().getStartParameter().getTaskRequests().toString().toLowerCase().contains(flavor.name)
             && flavor.name == 'play') {
         apply plugin: 'com.google.gms.google-services'
+        apply plugin: 'com.google.firebase.crashlytics'
     }
 }
 repositories {

app/src/free/java/com/wbrawner/simplemarkdown/utility/ErrorHandler.kt

@@ -1,6 +1,6 @@
 package com.wbrawner.simplemarkdown.utility
 
-import android.util.Log
+import timber.log.Timber
 import kotlin.reflect.KProperty
 
 class errorHandlerImpl {

app/src/free/java/com/wbrawner/simplemarkdown/utility/ReviewHelper.kt

@@ -1,11 +1,11 @@
 package com.wbrawner.simplemarkdown.utility
 
 import android.app.Application
-import android.util.Log
+import timber.log.Timber
 
 object ReviewHelper {
     // No review library for F-droid, so this is a no-op
     fun init(application: Application) {
-        Timber.w("ReviewHelper", "ReviewHelper not enabled for free builds")
+        Timber.tag("ReviewHelper").w("ReviewHelper not enabled for free builds")
     }
 }