X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fbuild.gradle;h=f52a93cfdb4b6b06ba80637549eada58598ac3f4;hb=7a1c39f9bb5a68ca31591d01b10a6f1c47145005;hp=8920a8fa07c1258e9ad9d5268a44af7374dac958;hpb=eb9975b0163b51b68557af26b73b28a7d87a1b87;p=PrivacyBrowserAndroid.git diff --git a/app/build.gradle b/app/build.gradle index 8920a8fa..f52a93cf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,13 +21,12 @@ apply plugin: 'com.android.application' android { compileSdkVersion 24 - buildToolsVersion "24.0.2" + buildToolsVersion "24.0.3" defaultConfig { - applicationId "com.stoutner.privacybrowser" minSdkVersion 19 targetSdkVersion 24 - versionCode 12 - versionName "1.10" + versionCode 14 + versionName "1.12" } buildTypes { @@ -52,13 +51,22 @@ android { applicationId "com.stoutner.privacybrowser.free" } } - // `return true` removes the lint error: `Not all execution paths return a value`. - return true + + // `return void` removes the lint error: `Not all execution paths return a value`. + return void } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + compile fileTree(include: ['*.jar'], dir: 'libs') 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.4.0' + + // GMS (Google Mobile Services) is necessary to update OpenSSL on API 19, but must be removed to build on F-Droid. + compile 'com.google.android.gms:play-services-safetynet:9.8.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 +// apply plugin: 'com.google.gms.google-services' \ No newline at end of file