Merge branch 'release-3.1.4'

mbientlab · Jul 24, 2018 · 9f1088d · 9f1088d
2 parents d1c417c + 81d448c
commit 9f1088d
Show file tree

Hide file tree

Showing 56 changed files with 1,192 additions and 1,211 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.1.3
+current_version = 3.1.4
 
 [bumpversion:file:Docs/source/conf.py]
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [3.1.4] - 2018-07-23
+
+### Changed
+- Updated Podspec with the swift-version key and latest Bolts-Swift 1.4.0
+- MetaWear-SDK-Cpp v0.16.0
+
 ## [3.1.3] - 2018-07-16
 ### Added
 - Documentation for basic features of this API.

diff --git a/Docs/source/conf.py b/Docs/source/conf.py
@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.1.3'
+version = '3.1.4'
 # The full version, including alpha/beta/rc tags.
-release = '3.1.3'
+release = '3.1.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/MetaWear.podspec b/MetaWear.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name               = 'MetaWear'
-  s.version            = '3.1.3'
+  s.version            = '3.1.4'
   s.license            = { :type => 'Commercial', :text => 'See https://www.mbientlab.com/terms/', :file => 'LICENSE' }
   s.homepage           = 'https://mbientlab.com'
   s.summary            = 'iOS/macOS/tvOS/watchOS API and documentation for the MetaWear platform'
@@ -21,6 +21,8 @@ Pod::Spec.new do |s|
   s.tvos.deployment_target = '10.0'
   s.watchos.deployment_target = '4.0'
 
+  s.swift_version = '4.1'
+
   s.social_media_url   = "https://twitter.com/mbientLab"
   s.documentation_url  = "https://mbientlab.com/cppdocs/latest/"
 
@@ -33,12 +35,11 @@ Pod::Spec.new do |s|
                        'MetaWear/MetaWear-SDK-Cpp/bindings/swift/**/*'
     s.compiler_flags = '-Wno-documentation', '-Wno-comma'
     s.pod_target_xcconfig = {
-      'SWIFT_VERSION' => '4.1',
       'HEADER_SEARCH_PATHS' => '$(PODS_TARGET_SRCROOT)/MetaWear/MetaWear-SDK-Cpp/src',
       'SWIFT_INCLUDE_PATHS' => '$(PODS_TARGET_SRCROOT)/MetaWear/MetaWear-SDK-Cpp/src'
     }
     s.frameworks = 'CoreBluetooth'
-    s.dependency 'Bolts-Swift', '~> 1.3.0'
+    s.dependency 'Bolts-Swift', '~> 1'
   end
 
   s.subspec 'AsyncUtils' do |s|
@@ -58,6 +59,9 @@ Pod::Spec.new do |s|
   end
 
   s.subspec 'DFU' do |s|
+      s.ios.deployment_target = '10.0'
+      s.osx.deployment_target = '10.13'
+
       s.source_files = 'MetaWear/DFU/**/*'
       s.dependency 'MetaWear/Core'
       s.dependency 'iOSDFULibrary', '~> 4'

diff --git a/MetaWear/MetaWear-SDK-Cpp b/MetaWear/MetaWear-SDK-Cpp
diff --git a/MetaWear/MetaWear.xcodeproj/project.pbxproj b/MetaWear/MetaWear.xcodeproj/project.pbxproj
diff --git a/MetaWear/MetaWear.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/MetaWear/MetaWear.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/MetaWear/MetaWear.xcodeproj/xcshareddata/xcschemes/MetaWearDFU.xcscheme b/MetaWear/MetaWear.xcodeproj/xcshareddata/xcschemes/MetaWearDFU.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/MetaWear/MetaWear.xcodeproj/xcshareddata/xcschemes/MetaWearIntegrationTests-iOS.xcscheme b/MetaWear/MetaWear.xcodeproj/xcshareddata/xcschemes/MetaWearIntegrationTests-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/MetaWear/MetaWear.xcodeproj/xcshareddata/xcschemes/MetaWearIntegrationTests-macOS.xcscheme b/MetaWear/MetaWear.xcodeproj/xcshareddata/xcschemes/MetaWearIntegrationTests-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/MetaWear/MetaWear.xcodeproj/xcshareddata/xcschemes/MetaWearIntegrationTests-tvOS.xcscheme b/MetaWear/MetaWear.xcodeproj/xcshareddata/xcschemes/MetaWearIntegrationTests-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/MetaWear/MetaWear.xcodeproj/xcshareddata/xcschemes/MetaWearR-CI.xcscheme b/MetaWear/MetaWear.xcodeproj/xcshareddata/xcschemes/MetaWearR-CI.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/MetaWear/MetaWear.xcodeproj/xcshareddata/xcschemes/MetaWearUnitTests-iOS.xcscheme b/MetaWear/MetaWear.xcodeproj/xcshareddata/xcschemes/MetaWearUnitTests-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/MetaWear/MetaWear.xcodeproj/xcshareddata/xcschemes/MetaWearUnitTests-macOS.xcscheme b/MetaWear/MetaWear.xcodeproj/xcshareddata/xcschemes/MetaWearUnitTests-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/MetaWear/MetaWear.xcodeproj/xcshareddata/xcschemes/MetaWearUnitTests-tvOS.xcscheme b/MetaWear/MetaWear.xcodeproj/xcshareddata/xcschemes/MetaWearUnitTests-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/MetaWear/Podfile b/MetaWear/Podfile
@@ -1,8 +1,6 @@
 use_frameworks!
 
 abstract_target 'MetaWear' do
-    pod 'Bolts-Swift', :git => 'https://github.com/BoltsFramework/Bolts-Swift.git', :commit => 'e9baa72'
-
     abstract_target 'MetaWear-iOS' do
         platform :ios, '10.0'
         pod 'MetaWear', :subspecs => ['UI', 'AsyncUtils', 'Mocks', 'DFU'], :path => '../'

diff --git a/MetaWear/Podfile.lock b/MetaWear/Podfile.lock
@@ -1,51 +1,43 @@
 PODS:
-  - Bolts-Swift (1.3.0)
+  - Bolts-Swift (1.4.0)
   - iOSDFULibrary (4.1.3):
     - Zip (~> 1.0)
-  - MetaWear/AsyncUtils (3.1.3):
+  - MetaWear/AsyncUtils (3.1.4):
     - MetaWear/Core
-  - MetaWear/Core (3.1.3):
-    - Bolts-Swift (~> 1.3.0)
-  - MetaWear/DFU (3.1.3):
+  - MetaWear/Core (3.1.4):
+    - Bolts-Swift (~> 1)
+  - MetaWear/DFU (3.1.4):
     - iOSDFULibrary (~> 4)
     - MetaWear/Core
-  - MetaWear/Mocks (3.1.3):
+  - MetaWear/Mocks (3.1.4):
     - MetaWear/Core
-  - MetaWear/UI (3.1.3):
+  - MetaWear/UI (3.1.4):
     - MetaWear/AsyncUtils
     - MetaWear/Core
   - Zip (1.1.0)
 
 DEPENDENCIES:
-  - Bolts-Swift (from `https://github.com/BoltsFramework/Bolts-Swift.git`, commit `e9baa72`)
   - MetaWear/AsyncUtils (from `../`)
   - MetaWear/DFU (from `../`)
   - MetaWear/Mocks (from `../`)
   - MetaWear/UI (from `../`)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
+    - Bolts-Swift
     - iOSDFULibrary
     - Zip
 
 EXTERNAL SOURCES:
-  Bolts-Swift:
-    :commit: e9baa72
-    :git: https://github.com/BoltsFramework/Bolts-Swift.git
   MetaWear:
     :path: "../"
 
-CHECKOUT OPTIONS:
-  Bolts-Swift:
-    :commit: e9baa72
-    :git: https://github.com/BoltsFramework/Bolts-Swift.git
-
 SPEC CHECKSUMS:
-  Bolts-Swift: fa98d1b59fc1acea9b21a21306dcdca1c85e3737
+  Bolts-Swift: 650d72e8017721b1a6bbe43d542c4578f8e5ba6f
   iOSDFULibrary: 921bc0e250ad204a68ffe0cc98a7cb6ac8b13b9f
-  MetaWear: f2189aa71a433aee6c860838b8f78993dc3a2c78
+  MetaWear: 5f10a0ab98885d39a46de59d6bf16df731001e49
   Zip: 8877eede3dda76bcac281225c20e71c25270774c
 
-PODFILE CHECKSUM: adf471a68e150fa1367c17e9255362724fa98506
+PODFILE CHECKSUM: 40f51631a47326fabd7a7939d3b4c5c6bc3dd8ba
 
 COCOAPODS: 1.5.3
diff --git a/MetaWear/Pods/Bolts-Swift/Sources/BoltsSwift/Task+WhenAll.swift b/MetaWear/Pods/Bolts-Swift/Sources/BoltsSwift/Task+WhenAll.swift
diff --git a/MetaWear/Pods/Local Podspecs/Bolts-Swift.podspec.json b/MetaWear/Pods/Local Podspecs/Bolts-Swift.podspec.json
diff --git a/MetaWear/Pods/Local Podspecs/MetaWear.podspec.json b/MetaWear/Pods/Local Podspecs/MetaWear.podspec.json
diff --git a/MetaWear/Pods/Manifest.lock b/MetaWear/Pods/Manifest.lock
+1 −1		Doxyfile
+5 −5		README.md
+662 −619		bindings/javascript/cbindings.js
+380 −329		bindings/python/mbientlab/metawear/cbindings.py
+9 −9		bindings/swift/cbindings.swift
+2 −2		project_version.mk
+2 −1		src/metawear/core/cpp/datainterpreter.h
+16 −8		src/metawear/core/cpp/event.cpp
+85 −25		src/metawear/core/cpp/logging.cpp
+2 −1		src/metawear/core/data.h
+5 −0		src/metawear/core/event.h
+44 −0		src/metawear/core/logging.h
+6 −0		src/metawear/core/metawearboard_fwd.h
+9 −0		src/metawear/core/types.h
+20 −12		src/metawear/impl/cpp/datainterpreter.cpp
+3 −0		src/metawear/sensor/cpp/accelerometer_bosch.cpp
+17 −0		src/metawear/sensor/cpp/sensor_fusion.cpp
+2 −1		src/metawear/sensor/cpp/sensor_fusion_register.h
+6 −0		src/metawear/sensor/sensor_fusion.h
+3 −0		test/common.py
+2 −1		test/test_anonymous_signal.py
+8 −12		test/test_logging.py
+4 −2		test/test_metawearboard.py
+31 −1		test/test_sensor_fusion.py