From 6c1e41ba1050c92f4b615f7e857e0d085120a242 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <msfjarvis@gmail.com>
Date: Fri, 16 Oct 2020 20:48:11 +0530
Subject: Revamp build configuration (#1156)

* release: move scripts to scripts directory

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* Move CI secrets to secrets directory

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* gradle: uprev to 6.7

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* gradle: suppress warnings about unsupported options

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* build: update dependencies

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* build: move Gradle plugins to ext

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* build: move configuration tasks to buildSrc

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* CHANGELOG: add entry for #1137

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* Fix lint warnings

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 app/build.gradle.kts                                 | 16 +++++++---------
 app/src/main/res/layout/oreo_autofill_dataset.xml    |  3 ++-
 app/src/main/res/layout/oreo_autofill_filter_row.xml |  4 ++--
 3 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'app')

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a5a3b4c9..150a16ef 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -6,7 +6,9 @@ import com.android.build.gradle.internal.api.BaseVariantOutputImpl
 import java.util.Properties
 
 plugins {
+    id("com.android.application")
     kotlin("android")
+    `aps-plugin`
 }
 
 val keystorePropertiesFile = rootProject.file("keystore.properties")
@@ -26,13 +28,16 @@ android {
 
     adbOptions.installOptions("--user 0")
 
-    buildFeatures.viewBinding = true
-    buildFeatures.buildConfig = true
+    buildFeatures {
+        viewBinding = true
+        buildConfig = true
+    }
 
     defaultConfig {
         applicationId = "dev.msfjarvis.aps"
         versionCode = 11211
         versionName = "1.13.0-SNAPSHOT"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     lintOptions {
@@ -41,13 +46,6 @@ android {
         disable("MissingTranslation", "PluralsCandidate", "ImpliedQuantity")
     }
 
-    packagingOptions {
-        exclude("**/*.version")
-        exclude("**/*.txt")
-        exclude("**/*.kotlin_module")
-        exclude("**/plugin.properties")
-    }
-
     buildTypes {
         named("release") {
             isMinifyEnabled = true
diff --git a/app/src/main/res/layout/oreo_autofill_dataset.xml b/app/src/main/res/layout/oreo_autofill_dataset.xml
index 5b828712..2e9f48b9 100644
--- a/app/src/main/res/layout/oreo_autofill_dataset.xml
+++ b/app/src/main/res/layout/oreo_autofill_dataset.xml
@@ -4,6 +4,7 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -22,7 +23,7 @@
         android:adjustViewBounds="true"
         android:maxWidth="20dp"
         android:maxHeight="20dp"
-        android:tint="@color/secondary_color"
+        app:tint="@color/secondary_color"
         tools:src="@mipmap/ic_launcher" />
 
     <LinearLayout
diff --git a/app/src/main/res/layout/oreo_autofill_filter_row.xml b/app/src/main/res/layout/oreo_autofill_filter_row.xml
index 43c69146..a8592248 100644
--- a/app/src/main/res/layout/oreo_autofill_filter_row.xml
+++ b/app/src/main/res/layout/oreo_autofill_filter_row.xml
@@ -19,12 +19,12 @@
         android:layout_marginStart="8dp"
         android:alpha="0.5"
         android:src="@drawable/ic_person_black_24dp"
-        android:tint="?colorOnPrimary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/title"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?colorOnPrimary" />
 
     <TextView
         android:id="@+id/title"
-- 
cgit v1.2.3