Update to v2.9.0

* Filtering of devices to scan for.
* Conditional mesh support.
* UI enhancements.

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Android-nRF-Mesh-Library"]
+	path = Android-nRF-Mesh-Library
+	url = https://github.com/NordicSemiconductor/Android-nRF-Mesh-Library.git

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.ublox.BLE"
         minSdkVersion 18
         targetSdkVersion 28
-        versionCode 16
-        versionName "2.8.1"
+        versionCode 18
+        versionName "2.9.0"
         vectorDrawables.useSupportLibrary = true
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -30,14 +30,21 @@ android {
     }
     productFlavors {
     }
+    packagingOptions {
+        exclude 'META-INF/proguard/androidx-annotations.pro'
+    }
 }
 
 dependencies {
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation project(':meshprovision')
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile 'com.android.support:support-v13:28.0.0'
     testCompile 'junit:junit:4.12'
     testCompile 'org.hamcrest:hamcrest:2.1'
+    testCompile 'org.mockito:mockito-core:2.28.2'
     androidTestCompile 'com.android.support.test:runner:1.0.2'
     androidTestCompile 'com.android.support.test.espresso:espresso-core:3.0.2'
     androidTestCompile 'com.android.support.test.espresso:espresso-intents:3.0.2'
+    androidTestCompile 'org.mockito:mockito-android:2.6.3'
 }

app/src/androidTest/java/com/ublox/BLE/EspressoExtensions.java

@@ -1,13 +1,12 @@
 package com.ublox.BLE;
 
-import com.ublox.BLE.interfaces.BluetoothDeviceRepresentation;
-
 import android.app.Activity;
-import android.support.test.espresso.ViewAction;
 import android.support.test.espresso.ViewAssertion;
 import android.support.test.espresso.ViewInteraction;
 import android.support.test.espresso.matcher.BoundedMatcher;
 
+import com.ublox.BLE.bluetooth.BluetoothPeripheral;
+
 import org.hamcrest.Description;
 import org.hamcrest.TypeSafeMatcher;
 
@@ -20,17 +19,17 @@
 
 public class EspressoExtensions {
 
-    public static TypeSafeMatcher<BluetoothDeviceRepresentation> withDevice(final String address) {
-        return new TypeSafeMatcher<BluetoothDeviceRepresentation>() {
+    public static TypeSafeMatcher<BluetoothPeripheral> withDevice(final String address) {
+        return new TypeSafeMatcher<BluetoothPeripheral>() {
 
             @Override
             public void describeTo(Description description) {
                 description.appendText(String.format("With bluetooth device: %s", address));
             }
 
             @Override
-            protected boolean matchesSafely(BluetoothDeviceRepresentation item) {
-                return address.equals(item.getAddress());
+            protected boolean matchesSafely(BluetoothPeripheral peripheral) {
+                return address.equals(peripheral.identifier());
             }
         };
     }