Merge pull request #61 from kirmanak/tech

Fix proguard-caused crash

.github/workflows/check.yml

@@ -10,25 +10,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Cache SonarCloud packages
-        uses: actions/cache@v1
-        with:
-          path: ~/.sonar/cache
-          key: ${{ runner.os }}-sonar
-          restore-keys: ${{ runner.os }}-sonar
-
-      - name: Cache Gradle packages
-        uses: actions/cache@v1
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: ${{ runner.os }}-gradle
-
       - name: Run tests
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: ./gradlew check coverageReport sonarqube --no-daemon --no-configuration-cache
+        run: ./gradlew check coverageReport sonarqube --no-daemon --no-configuration-cache --no-build-cache
 
       - name: Publish test reports
         uses: mikepenz/action-junit-report@v2

.github/workflows/sign.yml

@@ -13,20 +13,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Cache SonarCloud packages
-        uses: actions/cache@v1
-        with:
-          path: ~/.sonar/cache
-          key: ${{ runner.os }}-sonar
-          restore-keys: ${{ runner.os }}-sonar
-
-      - name: Cache Gradle packages
-        uses: actions/cache@v1
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: ${{ runner.os }}-gradle
-
       - name: Sign APK
         env:
           MEALIENT_KEY_STORE: ${{ secrets.MEALIENT_KEY_STORE }}
@@ -42,7 +28,7 @@ jobs:
           echo "storePassword=$MEALIENT_KEY_STORE_PASSWORD" >> keystore.properties
           echo "keyAlias=$MEALIENT_KEY_ALIAS" >> keystore.properties
           echo "keyPassword=$MEALIENT_KEY_PASSWORD" >> keystore.properties
-          ./gradlew build coverageReport sonarqube uploadToAppSweepRelease --no-daemon --no-configuration-cache
+          ./gradlew build coverageReport sonarqube uploadToAppSweepRelease --no-daemon --no-configuration-cache --no-build-cache
           cp app/build/outputs/apk/release/*.apk mealient-release.apk
 
       - name: Upload signed APK

app/build.gradle

@@ -50,6 +50,7 @@ android {
 
     buildTypes {
         debug {
+            ext.enableCrashlytics = false
             testCoverageEnabled true
         }
         release {

app/proguard-rules.pro

@@ -20,6 +20,10 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
+### Keep Protobuf classes https://github.com/protocolbuffers/protobuf/issues/6463#issuecomment-632884075 ###
+-keep class * extends com.google.protobuf.GeneratedMessageLite { *; }
+### Keep Protobuf classes https://github.com/protocolbuffers/protobuf/issues/6463#issuecomment-632884075 ###
+
 ### Remove logging https://www.guardsquare.com/manual/configuration/examples#logging ###
 -assumenosideeffects class android.util.Log {
     public static int v(...);

app/src/main/AndroidManifest.xml

@@ -16,7 +16,7 @@
 		android:roundIcon="@mipmap/ic_launcher"
 		android:supportsRtl="true"
 		android:theme="@style/AppTheme"
-		tools:targetApi="s">
+		tools:ignore="UnusedAttribute">
 		<activity
 			android:name=".ui.activity.MainActivity"
 			android:exported="true">

app/src/main/res/values/dimens.xml

@@ -3,7 +3,6 @@
 	<dimen name="margin_small">8dp</dimen>
 	<dimen name="height_view_holder_recipe_image">182dp</dimen>
 	<dimen name="fragment_recipe_info_image_height">@dimen/height_view_holder_recipe_image</dimen>
-	<dimen name="bottom_padding_instructions_list_fragment_recipe_info">30dp</dimen>
 	<dimen name="main_activity_toolbar_corner_radius">32dp</dimen>
 	<dimen name="rounded_corner_size_default">15dp</dimen>
 </resources>

gradle.properties

@@ -3,5 +3,5 @@ org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.unsafe.configuration-cache=true
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=false
 kotlin.code.style=official