X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fbuild.gradle;h=c88c78d48eefb351c90e2275f57be4061f33cbb7;hp=90c6f4bb037b165b89eb6304dbcbb1ac40dc6ce1;hb=c59144b04912acea0dd664cb677b4fc19effe9c2;hpb=298ddb5aeffe0e18e84c7551c55ff8164b238080 diff --git a/app/build.gradle b/app/build.gradle index 90c6f4bb..c88c78d4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2017 Soren Stoutner . + * Copyright © 2016-2019 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -20,13 +20,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 - buildToolsVersion '26.0.3' + compileSdkVersion 28 + buildToolsVersion '28.0.3' + defaultConfig { minSdkVersion 19 - targetSdkVersion 26 - versionCode 29 - versionName "2.7.2" + targetSdkVersion 28 + versionCode 44 + versionName "3.0.1" } buildTypes { @@ -61,15 +62,29 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + + // Allow the releases to be built even though the versions of the support and consent libraries don't match (Privacy Browser doesn't use the consent library form, so it doesn't matter). + lintOptions { + abortOnError false + } } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.android.support:design:26.1.0' - // Only compile `com.google.firebase:firebase-ads:9.8.0` for the free flavor. - freeImplementation 'com.google.firebase:firebase-ads:11.6.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. . -// apply plugin: 'com.google.gms.google-services' \ No newline at end of file + // Include the following AndroidX libraries. + implementation 'androidx.arch.core:core-common:2.0.1' + implementation 'androidx.arch.core:core-runtime:2.0.1' + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.coordinatorlayout:coordinatorlayout:1.0.0' + implementation 'androidx.drawerlayout:drawerlayout:1.0.0' + implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0' + implementation 'androidx.viewpager:viewpager:1.0.0' + + // Include the Google material library. + implementation 'com.google.android.material:material:1.0.0' + + // Only compile Firebase ads for the free flavor. + freeImplementation 'com.google.firebase:firebase-ads:17.2.1' +} \ No newline at end of file