X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fbuild.gradle;h=55df3775d7ebb5e8ec12dce20bbd2dfaf0e544c6;hp=d7cc4b8850d7b581307c23bb205465b0991bd4b9;hb=1ec4db87420eb1b562b1869dca167277d5c02b42;hpb=743982f883eab347e4029f8a3be760f780b14da1 diff --git a/app/build.gradle b/app/build.gradle index d7cc4b88..55df3775 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,5 @@ -/** - * Copyright 2016 Soren Stoutner . +/* + * Copyright © 2016-2018 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -20,13 +20,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 19 - targetSdkVersion 25 - versionCode 15 - versionName "1.13" + targetSdkVersion 27 + versionCode 31 + versionName "2.8.1" } buildTypes { @@ -42,28 +42,34 @@ android { } } + // Gradle requires a `flavorDimension`, but it isn't used for anything in Privacy Browser. + flavorDimensions "basic" + productFlavors { standard { applicationId "com.stoutner.privacybrowser.standard" + dimension "basic" } free { applicationId "com.stoutner.privacybrowser.free" + dimension "basic" } } - // `return void` removes the lint error: `Not all execution paths return a value`. - return void + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:design:25.1.0' - - // Only compile `com.google.firebase:firebase-ads:9.8.0` for the free flavor. - freeCompile 'com.google.firebase:firebase-ads:9.8.0' + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'com.android.support:design:27.0.2' + // Only compile `com.google.firebase:firebase-ads` for the free flavor. + freeImplementation 'com.google.firebase:firebase-ads:11.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 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. https://firebase.google.com/docs/admob/android/quick-start +// 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