X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fbuild.gradle;h=746a8502438bcfa09c6a7c5e3d2480decc973aee;hp=04c77a8a304a18e4da54f867ed9b0d50b6693995;hb=1aec01e7c168c3fcc272530607e16f5ffa6d6c74;hpb=3f2c7129a56e84d34cb07c151baf87bdea94dd12 diff --git a/app/build.gradle b/app/build.gradle index 04c77a8a..746a8502 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,5 @@ -/** - * Copyright 2016 Soren Stoutner . +/* + * Copyright 2016-2017 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -20,13 +20,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 - buildToolsVersion "24.0.3" + compileSdkVersion 25 + buildToolsVersion "25.0.2" defaultConfig { minSdkVersion 19 - targetSdkVersion 24 - versionCode 14 - versionName "1.12" + targetSdkVersion 25 + versionCode 20 + versionName "2.0.1" } buildTypes { @@ -51,18 +51,16 @@ android { applicationId "com.stoutner.privacybrowser.free" } } - - // `return void` removes the lint error: `Not all execution paths return a value`. - return void } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:design:24.2.1' - // Only compile `com.google.android.gms:play-services-ads` for the free flavor. + compile fileTree(include: ['*.jar'], dir: 'libs') + compile 'com.android.support:design:25.3.0' + + // Only compile `com.google.firebase:firebase-ads:9.8.0` for the free flavor. freeCompile 'com.google.firebase:firebase-ads:9.8.0' } -// Google's documentation says the following line is required for `firebase-ads` but things work correctly without it. I have no interest in including Google Mobile Services if I don't have to. -// https://firebase.google.com/docs/admob/android/quick-start +// Google's documentation says the following line is required for `firebase-ads` but things work correctly without it. I have no interest in applying the Google Mobile Services plugin in the standard flavor if I don't have to. +// I suspect that in the free flavor `firebase-ads` applies it even when not specified. . // apply plugin: 'com.google.gms.google-services' \ No newline at end of file