X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fbuild.gradle;h=f52a93cfdb4b6b06ba80637549eada58598ac3f4;hb=7a1c39f9bb5a68ca31591d01b10a6f1c47145005;hp=9ea14bb3bf68ee4f9b17de5bf1cafd9fc0dc4941;hpb=151e4550065da8e740e8e3bd414ec30ae2a18c33;p=PrivacyBrowserAndroid.git diff --git a/app/build.gradle b/app/build.gradle index 9ea14bb3..f52a93cf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,22 +20,24 @@ apply plugin: 'com.android.application' android { - signingConfigs { - } - - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 24 + buildToolsVersion "24.0.3" defaultConfig { - applicationId "com.stoutner.privacybrowser" - minSdkVersion 15 - targetSdkVersion 23 - versionCode 7 - versionName "1.6" + minSdkVersion 19 + targetSdkVersion 24 + versionCode 14 + versionName "1.12" } buildTypes { + debug { + minifyEnabled false + shrinkResources false + } + release { minifyEnabled true + shrinkResources true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } @@ -49,11 +51,22 @@ 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:23.4.0' - // Only compile com.google.android.gms:play-services-ads for the free version. - freeCompile 'com.google.android.gms:play-services-ads:8.4.0' + compile fileTree(include: ['*.jar'], dir: 'libs') + compile 'com.android.support:design:24.2.1' + + // 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