X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fbuild.gradle;h=7d29b94e53bb8792c1696d47601a244649daf3d2;hb=f0cf4911fb5d8c02e2cd6fe94823982e9dae8f7e;hp=b0169cd584aff207911f8e2498c8d7bf517ed9dd;hpb=4e087dd6a40ef24878a308c0c9d3102d8b1acdd7;p=PrivacyBrowserAndroid.git diff --git a/app/build.gradle b/app/build.gradle index b0169cd5..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' - compile 'com.google.android.gms:play-services-ads:8.4.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' }