F-Droid: update minimum version to Android5/sdk21 (#1134)

* Add lint suppress to common/hrdevice * F-Droid: update minimum version to Android5/sdk21 Add multidexing by default in free without complicated config. Appbundles used in Play, not needed there. * Update to 2.5.0.5 --------- Co-authored-by: Gerhard Olsson <[email protected]>
jonasoreland · Feb 16, 2023 · 60d385f · 60d385f
1 parent ed393a2
commit 60d385f
Show file tree

Hide file tree

Showing 7 changed files with 432 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -39,7 +39,13 @@ android {
     productFlavors {
         latest {
             dimension "all"
-            minSdkVersion 15
+            if (rootProject.ext.allowNonFree) {
+                // Not required with app bundles(?)
+                minSdkVersion 15
+            } else {
+                // multidexing support
+                minSdkVersion 21
+            }
             compileSdkVersion rootProject.ext.compileSdkVersion
             targetSdkVersion rootProject.ext.targetSdkVersion
             versionName rootProject.ext.versionName
@@ -87,7 +93,7 @@ android {
 
             minifyEnabled rootProject.ext.allowNonFree
             shrinkResources rootProject.ext.allowNonFree
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.txt'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard.txt'
             signingConfig signingConfigs.release
         }
     }

diff --git a/build.gradle b/build.gradle
@@ -30,8 +30,8 @@ project.ext {
     mockitoVersion = '3.11.2'
 
     //The Git tag for the release must be identical for F-Droid
-    versionName = '2.5.0.4'
-    versionCode = 322
+    versionName = '2.5.0.5'
+    versionCode = 323
     latestBaseVersionCode = 15000000
 
     // F-Droid builds only allow free software (wear dir deleted at builds)

diff --git a/common/build.gradle b/common/build.gradle
@@ -35,6 +35,12 @@ android {
     lint {
         showAll true
         warning 'MissingTranslation'
+        baseline file('lint-baseline.xml')
+        lintConfig file('lint.xml')
+        checkReleaseBuilds true
+        lintConfig file('lint.xml')
+        //textOutput 'stdout'
+        textReport true
     }
     namespace 'org.runnerup.common'
 }

diff --git a/common/lint-baseline.xml b/common/lint-baseline.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 7.4.1" type="baseline" client="gradle" dependencies="false" name="AGP (7.4.1)" variant="all" version="7.4.1">
+
+    <issue
+        id="IconMissingDensityFolder"
+        message="Missing density variation folders in `src\main\res`: drawable-hdpi, drawable-xhdpi, drawable-xxhdpi">
+        <location
+            file="src/main/res"/>
+    </issue>
+
+</issues>
diff --git a/common/lint.xml b/common/lint.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <!-- All translations will not be complete -->
+    <issue id="MissingTranslation" severity="ignore" />
+    <!-- Ignore not cleaned up strings -->
+    <issue id="ExtraTranslation" severity="ignore" />
+    <issue id="PluralsCandidate,UnusedResources,TypographyEllipsis" severity="ignore" />
+</lint>
diff --git a/hrdevice/build.gradle b/hrdevice/build.gradle
@@ -23,6 +23,14 @@ android {
             assets.srcDirs = ['assets']
         }
     }
+    lint {
+        baseline file('lint-baseline.xml')
+        checkReleaseBuilds true
+        //lintConfig file('lint.xml')
+        showAll true
+        //textOutput 'stdout'
+        textReport true
+    }
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion rootProject.ext.targetSdkVersion