Merge branch 'release-2.7.3'

Author: Stephen Schiffli

.travis.yml

@@ -1,25 +1,23 @@
-# references:
-# * http://www.objc.io/issue-6/travis-ci.html
-# * https://github.com/supermarin/xcpretty#usage
-
 osx_image: xcode8
 language: objective-c
-# cache: cocoapods
-# podfile: Example/Podfile
-# before_install:
-# - gem install cocoapods # Since Travis is not always on latest version
-# - pod install --project-directory=Example
+
 before_install:
-  - TV_SIMULATOR_ID=$(xcrun instruments -s | grep -o "Apple TV 1080p (10.0) \[.*\]" | grep -o "\[.*\]" | sed "s/^\[\(.*\)\]$/\1/")
-  - IOS_SIMULATOR_ID=$(xcrun instruments -s | grep -o "iPhone 5s (10.0) \[.*\]" | grep -o "\[.*\]" | sed "s/^\[\(.*\)\]$/\1/")
+  - gem update fastlane --no-ri --no-rdoc --no-document
+
+env:
+  global:
+    - WORKSPACE="MetaWear/MetaWear.xcworkspace"
+    - DERIVED_DATA_PATH="./MetaWear/Build"
+
+  matrix:
+    - DESTINATION="platform=iOS Simulator,name=iPhone 5s,OS=10.0" SCHEME="MetaWearUnitTests-iOS"   RUN_COVERAGE="YES"
+    - DESTINATION="platform=macOS,arch=x86_64"                    SCHEME="MetaWearUnitTests-macOS" RUN_COVERAGE="NO"
+    - DESTINATION="platform=tvOS Simulator,name=Apple TV 1080p"   SCHEME="MetaWearUnitTests-tvOS"  RUN_COVERAGE="NO"
 
 script:
-  - set -o pipefail
-  - xcodebuild test -workspace Example/MetaWear.xcworkspace -scheme MetaWearUnitTests-macOS -destination 'platform=macOS,arch=x86_64' | xcpretty
-  - open -a "simulator" --args -CurrentDeviceUDID $TV_SIMULATOR_ID
-  - xcodebuild test -workspace Example/MetaWear.xcworkspace -scheme MetaWearUnitTests-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 1080p' | xcpretty
-  - open -a "simulator" --args -CurrentDeviceUDID $IOS_SIMULATOR_ID
-  - xcodebuild test -workspace Example/MetaWear.xcworkspace -scheme MetaWearUnitTests-iOS -destination 'platform=iOS Simulator,name=iPhone 5s,OS=10.0' -enableCodeCoverage YES | xcpretty
+  - scan --workspace "$WORKSPACE" --scheme "$SCHEME" --destination "$DESTINATION" --skip_build --derived_data_path "$DERIVED_DATA_PATH" --code_coverage "$RUN_COVERAGE"
 
 after_success:
-  - bash <(curl -s https://codecov.io/bash) -J '^MetaWear$'
+  - if [ $RUN_COVERAGE == "YES" ]; then
+      bash <(curl -s https://codecov.io/bash) -J '^MetaWear$' -D "$DERIVED_DATA_PATH";
+    fi

Docs/gen_api_reference.sh

@@ -1 +1 @@
-appledoc -p "MetaWear iOS API 2.7.2" --project-version "2.7.2" -c "MBIENTLAB INC" --company-id com.mbientlab --no-create-docset --no-repeat-first-par --ignore .m -o . ../MetaWear/Classes
+appledoc -p "MetaWear iOS/macOS/tvOS API 2.7.3" --project-version "2.7.3" -c "MBIENTLAB INC" --company-id com.mbientlab --no-create-docset --no-repeat-first-par --ignore .m -o . ../MetaWear/Classes

Docs/source/conf.py

@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.7.2'
+version = '2.7.3'
 # The full version, including alpha/beta/rc tags.
-release = '2.7.2'
+release = '2.7.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

Docs/source/metawear.rst

@@ -133,15 +133,15 @@ Get the state of the BLE connection.
         NSLog(@"Connected!");
     }
 
-Guest Connection
-----------------
+Programmed by Other Application
+-------------------------------
 
-If YES, this is not the owning application and you should take care because you can cause data loss for the other application that is using the device.
+Since we do not support using a single MetaWear device with multiple application, you should take care if a user accidently tries to do this.  Once connected, your application should check this BOOL and if it is YES, then you shouldn't change settings or perform any operations unless you supply the user with an alert saying, "This device is in use by another application, are you sure you want to reprogram it?  This will cause errors and data loss for the other application”.  If they agree then you need to call setConfigurationAsync: to take ownership of the device.
 
 ::
 
-    if (device.isGuestConnection) {
-        NSLog(@"WARNING - guest app, are you sure you want to continue?  Call [device setConfigurationAsync:nil] if you wish to take ownership.");
+    if (device.programedByOtherApp) {
+        NSLog(@"WARNING - device already programmed, are you sure you want to continue?  Call [device setConfigurationAsync:nil] if you wish to take ownership.");
     }
 
 Identifier

Example/MetaWear.xcodeproj/xcshareddata/xcschemes/MetaWearIntegrationTests-iOS.xcscheme

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name               = 'MetaWear'
-  s.version            = '2.7.2'
+  s.version            = '2.7.3'
   s.license            = { :type => 'Commercial', :text => 'See https://www.mbientlab.com/terms/', :file => 'LICENSE' }
   s.homepage           = 'https://mbientlab.com'
   s.summary            = 'iOS/macOS/tvOS API and documentation for the MetaWear platform'
@@ -22,7 +22,7 @@ Pod::Spec.new do |s|
   s.social_media_url   = "https://twitter.com/mbientLab"
   s.documentation_url  = "https://www.mbientlab.com/docs/metawear/ios/#{s.version}/index.html"
 
-  s.source_files = 'MetaWear/**/*'
+  s.source_files = 'MetaWear/{Assets,Classes,Internal}/**/*.{h,m}'
   s.private_header_files = 'MetaWear/Internal/**/*.h'
 
   s.frameworks      = 'CoreData', 'CoreBluetooth'

Example/MetaWear.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -36,7 +36,7 @@
 #import "MBLConstants.h"
 #import "MBLConstants+Private.h"
 
-NSString *const kMBLAPIVersion = @"2.7.2";
+NSString *const kMBLAPIVersion = @"2.7.3";
 
 NSString *MBLFirmwareVersionString(MBLFirmwareVersion version)
 {