Merge pull request #183 from martinohanlon/dev

Android v 2.2.1

Author: Martin O'Hanlon

clients/android/.idea/gradle.xml

@@ -1,14 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion '29.0.2'
+    compileSdkVersion 33
     defaultConfig {
         applicationId "com.stuffaboutcode.bluedot"
         minSdkVersion 14
-        targetSdkVersion 29
-        versionCode 8
-        versionName "2.1.0"
+        targetSdkVersion 33
+        versionCode 10
+        versionName "2.2.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -21,11 +20,21 @@ android {
 
     dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.preference:preference:1.1.0-alpha05'
+    implementation 'androidx.preference:preference:1.2.0'
     androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'androidx.appcompat:appcompat:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     testImplementation 'junit:junit:4.12'
 }
+
+configurations {
+
+    all {
+
+        exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel-ktx'
+
+    }
+
+}

clients/android/.idea/misc.xml

@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.stuffaboutcode.bluedot",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 10,
+      "versionName": "2.2.1",
+      "outputFile": "app-release.apk"
+    }
+  ],
+  "elementType": "File"
+}

clients/android/.idea/modules.xml

@@ -2,8 +2,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.stuffaboutcode.bluedot">
 
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"
+        android:maxSdkVersion="30" />/>
+    <uses-permission android:name="android.permission.BLUETOOTH"
+        android:maxSdkVersion="30" />/>
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
 
     <application
         android:allowBackup="true"
@@ -13,6 +17,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
+            android:exported="true"
             android:name=".SettingsActivity"
             android:label="@string/title_activity_settings"
             android:parentActivityName=".Devices">
@@ -21,6 +26,7 @@
                 android:value="com.stuffaboutcode.bluedot.Devices" />
         </activity>
         <activity
+            android:exported="true"
             android:name=".Devices"
             android:configChanges="orientation|screenSize">
             <intent-filter>