diff --git a/app/build.gradle b/app/build.gradle
index 4a56e18af..0a766a57c 100644
--- 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
index d4cbc2637..2a1317bd0 100644
--- 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
index c1f5519a7..def694962 100644
--- 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
new file mode 100644
index 000000000..ffbfa8a2b
--- /dev/null
+++ b/common/lint-baseline.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
diff --git a/common/lint.xml b/common/lint.xml
new file mode 100644
index 000000000..c4b210183
--- /dev/null
+++ b/common/lint.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/hrdevice/build.gradle b/hrdevice/build.gradle
index 70f9a0f3d..02746d553 100644
--- 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
diff --git a/hrdevice/lint-baseline.xml b/hrdevice/lint-baseline.xml
new file mode 100644
index 000000000..73f790af7
--- /dev/null
+++ b/hrdevice/lint-baseline.xml
@@ -0,0 +1,389 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+