diff options
| -rw-r--r-- | app/build.gradle | 6 | ||||
| -rw-r--r-- | app/src/main/res/layout-sw720dp/main.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/layout/main.xml | 5 | ||||
| -rw-r--r-- | build.gradle | 6 | ||||
| -rw-r--r-- | common.gradle | 4 |
5 files changed, 14 insertions, 10 deletions
diff --git a/app/build.gradle b/app/build.gradle index c54699c4b..4b074bed6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,7 @@ plugins { id('com.android.application') id('com.getkeepsafe.dexcount') - id('com.github.triplet.play') version '2.7.5' apply false + id('com.github.triplet.play') version '3.4.0' apply false } apply from: "../common.gradle" apply from: "../playFlavor.gradle" @@ -170,8 +170,8 @@ dependencies { if (project.hasProperty("antennaPodPlayPublisherCredentials")) { apply plugin: 'com.github.triplet.play' play { - track = 'alpha' - serviceAccountCredentials = file(antennaPodPlayPublisherCredentials) + track.set('alpha') + serviceAccountCredentials.set(file(antennaPodPlayPublisherCredentials)) } } diff --git a/app/src/main/res/layout-sw720dp/main.xml b/app/src/main/res/layout-sw720dp/main.xml index 79b7213e0..1ce9b973f 100644 --- a/app/src/main/res/layout-sw720dp/main.xml +++ b/app/src/main/res/layout-sw720dp/main.xml @@ -5,7 +5,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="horizontal" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + tools:viewBindingIgnore="true"> <FrameLayout android:id="@+id/navDrawerFragment" diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml index 48195a176..4be48a271 100644 --- a/app/src/main/res/layout/main.xml +++ b/app/src/main/res/layout/main.xml @@ -6,8 +6,11 @@ android:id="@+id/drawer_layout" android:layout_width="match_parent" android:layout_height="match_parent" - tools:ignore="InconsistentLayout"> + tools:ignore="InconsistentLayout" + tools:viewBindingIgnore="true"> <!-- InconsistentLayout: Tablet layout does not have a drawer --> + <!-- viewBindingIgnore: Configurations for main.xml must + agree on the root element's ID --> <androidx.coordinatorlayout.widget.CoordinatorLayout android:id="@+id/overview_coordinator_layout" diff --git a/build.gradle b/build.gradle index 012b9eba1..e917403a3 100644 --- a/build.gradle +++ b/build.gradle @@ -2,12 +2,12 @@ buildscript { repositories { google() mavenCentral() - maven { url "https://plugins.gradle.org/m2/" } + gradlePluginPortal() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.6.3' - classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:1.0.2' + classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:1.0.4' classpath 'de.timfreiheit.resourceplaceholders:placeholders:0.3' classpath "gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.0" } diff --git a/common.gradle b/common.gradle index 3a7762a05..0300ed534 100644 --- a/common.gradle +++ b/common.gradle @@ -52,8 +52,8 @@ android { checkGeneratedSources = true } - viewBinding { - enabled = true + buildFeatures { + viewBinding true } } |