From 52b5fbc4a5053d1fa8469926e544dac2f7363986 Mon Sep 17 00:00:00 2001
From: Nathaniel Wesley Filardo <nwfilardo@gmail.com>
Date: Mon, 28 Feb 2022 19:58:12 +0000
Subject: [PATCH] The usual Android updates

---
 build.gradle                                  |  6 +++---
 lib/build.gradle                              |  4 ++--
 mobile/build.gradle                           | 20 +++++++++----------
 mobile/src/main/AndroidManifest.xml           |  8 ++++++--
 .../main/res/xml/data_extraction_rules.xml    |  9 +++++++++
 5 files changed, 30 insertions(+), 17 deletions(-)
 create mode 100644 mobile/src/main/res/xml/data_extraction_rules.xml

diff --git a/build.gradle b/build.gradle
index 7d34715..cb9d796 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,11 +2,11 @@
 
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:7.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,7 +15,7 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
 }
diff --git a/lib/build.gradle b/lib/build.gradle
index 49df001..2f509fc 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -1,7 +1,7 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    api fileTree(dir: 'libs', include: ['*.jar'])
 }
 
 sourceCompatibility = "1.7"
diff --git a/mobile/build.gradle b/mobile/build.gradle
index 3b59c40..1da5bcf 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -11,11 +11,11 @@ def makeGitDescription = {
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
     defaultConfig {
         applicationId "com.acmetensortoys.ctfwstimer"
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 31
         versionCode 16
         versionName "1.4.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -59,28 +59,28 @@ repositories {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.4.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
 
     api project(":lib")
 
-    api 'androidx.appcompat:appcompat:1.1.0'
+    api 'androidx.appcompat:appcompat:1.4.1'
     api 'androidx.legacy:legacy-support-v4:1.0.0'
-    api 'androidx.preference:preference:1.1.1'
-    implementation 'androidx.annotation:annotation:1.1.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    api 'androidx.preference:preference:1.2.0'
+    implementation 'androidx.annotation:annotation:1.3.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
 
     // Nah.
     // wearApp project(':wear')
     //// Needed for wear data synchronization; blech
     // playApi 'com.google.android.gms:play-services-wearable:16.0.1'
 
-    api 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.2'
+    api 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
     api('org.eclipse.paho:org.eclipse.paho.android.service:1.1.1') {
         exclude module: 'support-v4'
     }
 
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
 }
diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index a05bf7a..b2e9efc 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.acmetensortoys.ctfwstimer">
 
     <!-- Required for Paho MQTT client -->
@@ -14,14 +15,17 @@
 
     <application
         android:allowBackup="true"
+        android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:networkSecurityConfig="@xml/network_security_config"
         android:icon="@mipmap/ic_shield_1"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:ignore="UnusedAttribute">
 
-        <activity android:name=".activity.main.Activity">
+        <activity android:name=".activity.main.Activity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/mobile/src/main/res/xml/data_extraction_rules.xml b/mobile/src/main/res/xml/data_extraction_rules.xml
new file mode 100644
index 0000000..68c5432
--- /dev/null
+++ b/mobile/src/main/res/xml/data_extraction_rules.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data-extraction-rules>
+    <cloud-backup>
+        <include domain="sharedpref" path="."/>
+    </cloud-backup>
+    <device-transfer>
+        <include domain="sharedpref" path="."/>
+    </device-transfer>
+</data-extraction-rules>
\ No newline at end of file
-- 
2.50.1