Merge pull request #815 from gerhardol/feature/fdroid-apk

F-Droid: Only produce the universal apk
jonasoreland · Jul 18, 2019 · 206d3ef · 206d3ef
2 parents a6df352 + 0cc312e
commit 206d3ef
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/app/assets/changes.html b/app/assets/changes.html
@@ -5,6 +5,11 @@
 </head>
 <body>
 <h1>What's new</h1>
+<h2>v2.0.1.1</h2>
+<p>
+<ul>
+    <li>Build fix for F-Droid</li>
+</ul>
 <h2>v2.0.1.0</h2>
 <p>
 <ul>

diff --git a/app/build.gradle b/app/build.gradle
@@ -53,7 +53,7 @@ android {
 
     splits {
         abi {
-            enable gradle.startParameter.taskNames.contains("assembleLatestRelease")
+            enable rootProject.ext.allowNonFree && gradle.startParameter.taskNames.contains("assembleLatestRelease")
             // relevant archs only - these are the only available anyway for newer NDK
             include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
             universalApk true

diff --git a/build.gradle b/build.gradle
@@ -29,7 +29,7 @@ project.ext {
     junitVersion = '4.12'
     mockitoVersion = '2.3.7'
 
-    versionName = '2.0.1.0'
+    versionName = '2.0.1.1'
     versionCode = 203
 
     travisBuild = System.getenv("TRAVIS") == "true"