From f0cf4911fb5d8c02e2cd6fe94823982e9dae8f7e Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Wed, 9 Mar 2016 14:06:07 -0700 Subject: [PATCH] Add `lintOptions abortOnError false` to satisfy F-Droid. --- app/app.iml | 90 +++++++++++++++++++++++++----------------------- app/build.gradle | 11 +++++- 2 files changed, 57 insertions(+), 44 deletions(-) diff --git a/app/app.iml b/app/app.iml index 1bb84f7d..a3768653 100644 --- a/app/app.iml +++ b/app/app.iml @@ -8,62 +8,62 @@ - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -97,6 +97,8 @@ + + @@ -116,8 +118,10 @@ + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2b6bb828..7d29b94e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,7 @@ /** * Copyright 2016 Soren Stoutner . * - * This file is part of Privacy Browser. + * This file is part of Privacy Browser . * * Privacy Browser is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,6 +22,7 @@ apply plugin: 'com.android.application' android { signingConfigs { } + compileSdkVersion 23 buildToolsVersion "23.0.2" defaultConfig { @@ -31,12 +32,14 @@ android { versionCode 1 versionName "1.0" } + buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + productFlavors { standard { applicationId "com.stoutner.privacybrowser.standard" @@ -48,6 +51,11 @@ android { versionName "1.0-free" } } + + // `lintOptions abortOnError false` is required for F-Droid to build correctly. + lintOptions { + abortOnError false + } } dependencies { @@ -55,5 +63,6 @@ dependencies { compile 'com.android.support:appcompat-v7:23.2.0' compile 'com.android.support:design:23.2.0' compile 'com.android.support:support-v4:23.2.0' + // Only compile com.google.android.gms:play-services-ads for the free version so that the standard version can build of F-Droid. freeCompile 'com.google.android.gms:play-services-ads:8.4.0' } -- 2.45.2