From a9b922e4b32e2c426453e7776c71bf28143c89f4 Mon Sep 17 00:00:00 2001
From: Nathaniel Wesley Filardo <nwfilardo@gmail.com>
Date: Sat, 27 Oct 2018 04:46:10 +0100
Subject: [PATCH] Bump Android tools versions, disable wear apk

---
 build.gradle                        |  4 +++-
 mobile/build.gradle                 | 29 +++++++++++++++--------------
 mobile/src/main/AndroidManifest.xml |  1 +
 wear/build.gradle                   | 16 +++++++++-------
 4 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/build.gradle b/build.gradle
index c33a638..ae9fbaf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,6 +16,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 
diff --git a/mobile/build.gradle b/mobile/build.gradle
index 249bcc0..07ac545 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -1,12 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '26.0.2'
+    compileSdkVersion 28
     defaultConfig {
         applicationId "com.acmetensortoys.ctfwstimer"
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion 28
         versionCode 8
         versionName "1.0.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -45,24 +44,26 @@ repositories {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestImplementation ('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    wearApp project(':wear')
 
-    compile project(":lib")
+    api project(":lib")
 
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:support-v4:25.3.1'
+    api 'com.android.support:appcompat-v7:28.0.0'
+    api 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support:support-annotations:28.0.0'
 
-    // Needed for wear data synchronization; blech
-    playCompile 'com.google.android.gms:play-services-wearable:11.0.4'
+    // Nah.
+    // wearApp project(':wear')
+    //// Needed for wear data synchronization; blech
+    // playApi 'com.google.android.gms:play-services-wearable:16.0.1'
 
-    compile 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.0'
-    compile('org.eclipse.paho:org.eclipse.paho.android.service:1.1.1') {
+    api 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.0'
+    api('org.eclipse.paho:org.eclipse.paho.android.service:1.1.1') {
         exclude module: 'support-v4'
     }
 
-    testCompile 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.12'
 }
diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index 19754ef..b0d53bd 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -4,6 +4,7 @@
 
     <!-- Required for Paho MQTT client -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
diff --git a/wear/build.gradle b/wear/build.gradle
index 7634680..685837a 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -1,12 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '26.0.2'
+    compileSdkVersion 28
     defaultConfig {
         applicationId "com.acmetensortoys.ctfwstimer"
         minSdkVersion 21
-        targetSdkVersion 25
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
     }
@@ -19,8 +18,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    provided 'com.google.android.wearable:wearable:2.0.0'
-    compile 'com.google.android.support:wearable:2.0.0'
-    compile 'com.google.android.gms:play-services-wearable:11.0.4'
+    api 'com.android.support.constraint:constraint-layout:1.1.3'
+    api fileTree(dir: 'libs', include: ['*.jar'])
+
+    api project(":lib")
+
+    compileOnly 'com.google.android.wearable:wearable:2.3.0'
+    api 'com.google.android.support:wearable:2.3.0'
 }
-- 
2.50.1