X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fbuild.gradle;h=aa47ffcbfb40c6ad74af153cf329e4230ac8a176;hp=8e28fdd4e67866c499e26030543d580c25d47755;hb=ecd1f67963852c0523c42ce1326b78cb7a71f053;hpb=fd9ff6a6ce478729b4793e9900d7c745a09ee3d8 diff --git a/app/build.gradle b/app/build.gradle index 8e28fdd4..aa47ffcb 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.2" + compileSdkVersion 25 + buildToolsVersion "25.0.3" defaultConfig { minSdkVersion 19 - targetSdkVersion 24 - versionCode 12 - versionName "1.10" + targetSdkVersion 25 + versionCode 26 + versionName "2.6" } buildTypes { @@ -51,14 +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. - freeCompile 'com.google.android.gms:play-services-ads:9.6.1' + compile fileTree(include: ['*.jar'], dir: 'libs') + compile 'com.android.support:design:25.4.0' + + // Only compile `com.google.firebase:firebase-ads:9.8.0` for the free flavor. + freeCompile 'com.google.firebase:firebase-ads:11.0.4' } + +// 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