Merge pull request #199 from theheraldproject/develop

Prepping release 2.2.0
theheraldproject · Feb 19, 2023 · 0c0c6c2 · 0c0c6c2
2 parents 9afaff4 + 8632a28
commit 0c0c6c2
Show file tree

Hide file tree

Showing 18 changed files with 468 additions and 87 deletions.
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -21,12 +21,7 @@ jobs:
     strategy:
       matrix:
         destination: [
-          #'platform=iOS Simulator,OS=12.2,name=iPhone X'
-          #,
-          # 'platform=iOS Simulator,OS=15.2,name=iPhone 11 Pro'
-          'platform=iOS Simulator,OS=16.0,name=iPhone 11 Pro'
-          #,
-          #'platform=iOS Simulator,OS=9.3,name=iPhone 5s'
+          'platform=iOS Simulator,OS=16.2,name=iPhone 11 Pro'
         ]
 
     steps:

diff --git a/Herald-for-iOS.xcodeproj/project.pbxproj b/Herald-for-iOS.xcodeproj/project.pbxproj
@@ -389,6 +389,7 @@
 		B692CAA824CADA7A00F45AEE /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
@@ -399,7 +400,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.0;
+				MARKETING_VERSION = 2.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = io.heraldprox.herald.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -410,6 +411,7 @@
 		B692CAA924CADA7A00F45AEE /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
@@ -420,7 +422,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.0;
+				MARKETING_VERSION = 2.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = io.heraldprox.herald.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

diff --git a/Herald.podspec b/Herald.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |spec|
 
   spec.name         = "Herald"
-  spec.version      = "2.1.0"
+  spec.version      = "2.2.0"
   spec.summary      = "Reliable Bluetooth communication library for iOS"
 
   spec.description  = <<-DESC

diff --git a/Herald/Herald.xcodeproj/project.pbxproj b/Herald/Herald.xcodeproj/project.pbxproj
@@ -92,6 +92,8 @@
 		B6F7460A255714C2003567B7 /* SimplePayloadDataMatcherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F74606255714C2003567B7 /* SimplePayloadDataMatcherTests.swift */; };
 		B6F7460B255714C2003567B7 /* BloomFilterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F74607255714C2003567B7 /* BloomFilterTests.swift */; };
 		B6F7460C255714C2003567B7 /* InteractionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F74608255714C2003567B7 /* InteractionsTests.swift */; };
+		D1FA72CF2999233C00F2F784 /* Activities.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1FA72CE2999233C00F2F784 /* Activities.swift */; };
+		D1FA72D12999234800F2F784 /* Coordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1FA72D02999234800F2F784 /* Coordinator.swift */; };
 		D301023D25B8DD8300598DF4 /* ExtendedDataTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D301023C25B8DD8300598DF4 /* ExtendedDataTests.swift */; };
 		D32988E425C34AE20066D9D4 /* PayloadDataFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = D32988E325C34AE20066D9D4 /* PayloadDataFormatter.swift */; };
 /* End PBXBuildFile section */
@@ -196,6 +198,8 @@
 		B6F74606255714C2003567B7 /* SimplePayloadDataMatcherTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SimplePayloadDataMatcherTests.swift; sourceTree = "<group>"; };
 		B6F74607255714C2003567B7 /* BloomFilterTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BloomFilterTests.swift; sourceTree = "<group>"; };
 		B6F74608255714C2003567B7 /* InteractionsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InteractionsTests.swift; sourceTree = "<group>"; };
+		D1FA72CE2999233C00F2F784 /* Activities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Activities.swift; path = herald/Sensor/Engine/Activities.swift; sourceTree = SOURCE_ROOT; };
+		D1FA72D02999234800F2F784 /* Coordinator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Coordinator.swift; path = herald/Sensor/Engine/Coordinator.swift; sourceTree = SOURCE_ROOT; };
 		D301023C25B8DD8300598DF4 /* ExtendedDataTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtendedDataTests.swift; sourceTree = "<group>"; };
 		D32988E325C34AE20066D9D4 /* PayloadDataFormatter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PayloadDataFormatter.swift; path = herald/Sensor/Data/PayloadDataFormatter.swift; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
@@ -267,6 +271,7 @@
 		B637EF5C251E56320072D238 /* Sensor */ = {
 			isa = PBXGroup;
 			children = (
+				D13665722992EA8A00F2B4FC /* Engine */,
 				B6EEC24425B5BC2B00D1CDF9 /* Extensions */,
 				B6599D0125A4EAE600AC306D /* Motion */,
 				B6F745EE255713C2003567B7 /* Analysis */,
@@ -484,6 +489,15 @@
 			path = Analysis;
 			sourceTree = "<group>";
 		};
+		D13665722992EA8A00F2B4FC /* Engine */ = {
+			isa = PBXGroup;
+			children = (
+				D1FA72CE2999233C00F2F784 /* Activities.swift */,
+				D1FA72D02999234800F2F784 /* Coordinator.swift */,
+			);
+			path = Engine;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -633,6 +647,7 @@
 				B6F40DC52658FAD40088B098 /* Encryption.swift in Sources */,
 				B6DA10B325A78AF50071C08E /* CalibrationLog.swift in Sources */,
 				B637EF8E251E56320072D238 /* SensorDelegate.swift in Sources */,
+				D1FA72CF2999233C00F2F784 /* Activities.swift in Sources */,
 				B637EF86251E56320072D238 /* SensorArray.swift in Sources */,
 				B637EF8D251E56320072D238 /* StatisticsLog.swift in Sources */,
 				6FE142FB2565C39A0084A59C /* Device.swift in Sources */,
@@ -653,6 +668,7 @@
 				B637EF87251E56320072D238 /* PayloadDataSupplier.swift in Sources */,
 				B65235BB26308DF6007321B8 /* Sample.swift in Sources */,
 				B6EEC24625B5BC4400D1CDF9 /* DataExtensions.swift in Sources */,
+				D1FA72D12999234800F2F784 /* Coordinator.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -704,6 +720,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -752,7 +769,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -768,6 +785,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -810,7 +828,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
@@ -840,7 +858,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.0;
+				MARKETING_VERSION = 2.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = io.heraldprox.herald;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -868,7 +886,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.0;
+				MARKETING_VERSION = 2.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = io.heraldprox.herald;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;

diff --git a/Herald/Herald/Sensor/Analysis/Mobility.swift b/Herald/Herald/Sensor/Analysis/Mobility.swift
@@ -1,8 +1,8 @@
 //
 //  Mobility.swift
 //
-//  Copyright 2021 Herald Project Contributors
-//  SPDX-License-Identifier: MIT
+//  Copyright 2021-2023 Herald Project Contributors
+//  SPDX-License-Identifier: Apache-2.0
 //
 
 import Foundation

diff --git a/Herald/Herald/Sensor/BLE/BLEDatabase.swift b/Herald/Herald/Sensor/BLE/BLEDatabase.swift
@@ -579,9 +579,10 @@ class BLEPseudoDeviceAddress {
             return nil
         }
         // HERALD pseudo device address
-        if (manufacturerId == BLESensorConfiguration.linuxFoundationManufacturerIdForSensor ||
+        if ( (BLESensorConfiguration.standardHeraldServiceDetectionEnabled && manufacturerId == BLESensorConfiguration.linuxFoundationManufacturerIdForSensor) ||
+             (BLESensorConfiguration.customServiceDetectionEnabled && 0 != BLESensorConfiguration.customManufacturerIdForSensor && manufacturerId == BLESensorConfiguration.customManufacturerIdForSensor) ||
              (BLESensorConfiguration.legacyHeraldServiceDetectionEnabled && manufacturerId == BLESensorConfiguration.legacyHeraldManufacturerIdForSensor)
-           ) && manufacturerData.count == 8 {
+           ) && manufacturerData.count >= 8 {
             self.init(data: Data(manufacturerData.subdata(in: 2..<8)))
         }
         // Legacy pseudo device address