From 1e7c99c9ff202a148437eec3fdf7e9ba590507e9 Mon Sep 17 00:00:00 2001 From: Peter Hinson Date: Thu, 11 Mar 2021 16:42:13 -0800 Subject: [PATCH 1/3] Bug fixed: validation failure if database contains publish periods using 10 minute resolution. --- nRFMeshProvision/Classes/Mesh Model/Publish.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nRFMeshProvision/Classes/Mesh Model/Publish.swift b/nRFMeshProvision/Classes/Mesh Model/Publish.swift index 86960ada5..cbb6e7cdb 100644 --- a/nRFMeshProvision/Classes/Mesh Model/Publish.swift +++ b/nRFMeshProvision/Classes/Mesh Model/Publish.swift @@ -479,7 +479,7 @@ private extension Publish.Period { // If resolution or steps were set to 0, set resolution to // hundreds of milliseconds. return 100 - case 100, 1000, 10000, 60000: + case 100, 1000, 10000, 600000: // Those are the valid values. Keep it as it is. return milliseconds case _ where milliseconds % Int(steps) == 0: From a27a0d4305cebc882175b183ae8f5ed41162b037 Mon Sep 17 00:00:00 2001 From: philips77 Date: Fri, 26 Mar 2021 13:36:05 +0100 Subject: [PATCH 2/3] Bug fixed: Crash when segmenting long access message --- .../Layers/Lower Transport Layer/SegmentedAccessMessage.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nRFMeshProvision/Classes/Layers/Lower Transport Layer/SegmentedAccessMessage.swift b/nRFMeshProvision/Classes/Layers/Lower Transport Layer/SegmentedAccessMessage.swift index b3f882d4e..8bbb9594e 100644 --- a/nRFMeshProvision/Classes/Layers/Lower Transport Layer/SegmentedAccessMessage.swift +++ b/nRFMeshProvision/Classes/Layers/Lower Transport Layer/SegmentedAccessMessage.swift @@ -122,7 +122,7 @@ internal struct SegmentedAccessMessage: SegmentedMessage { self.sequenceZero = UInt16(pdu.sequence & 0x1FFF) self.segmentOffset = offset - let lowerBound = Int(offset * 12) + let lowerBound = Int(offset) * 12 let upperBound = min(pdu.transportPdu.count, Int(offset + 1) * 12) let segment = pdu.transportPdu.subdata(in: lowerBound.. Date: Fri, 26 Mar 2021 13:47:15 +0100 Subject: [PATCH 3/3] Version 3.1.1 --- CHANGELOG.md | 4 +++ Documentation/SETTING_UP.md | 2 +- Example/Podfile.lock | 4 +-- .../nRFMeshProvision.podspec.json | 4 +-- Example/Pods/Manifest.lock | 4 +-- Example/Pods/Pods.xcodeproj/project.pbxproj | 35 +++++++++++++------ .../nRFMeshProvision-Info.plist | 2 +- .../project.pbxproj | 8 ++--- nRFMeshProvision.podspec | 2 +- 9 files changed, 42 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c74579ad..7e046254d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## Changelog +- **3.1.1**: + - Bugfix: `SegmentedAccessMessage` overflow crash (#339). + - Bugfix: Validation failure if database contains 10m publish resolution (#338). + - **3.1.0**: - Sensor messages + simple UI for reading sensor values (#327). - Light LC messages (#328). diff --git a/Documentation/SETTING_UP.md b/Documentation/SETTING_UP.md index 03228cb32..2479f8472 100644 --- a/Documentation/SETTING_UP.md +++ b/Documentation/SETTING_UP.md @@ -7,7 +7,7 @@ Using CocoaPods: You can use [Swift Package Manager](https://swift.org/package-manager/) and specify dependency in `Package.swift` by adding this: ```swift -.package(url: "https://github.com/NordicSemiconductor/IOS-nRF-Mesh-Library", .upToNextMinor(from: "3.0.1")) +.package(url: "https://github.com/NordicSemiconductor/IOS-nRF-Mesh-Library", .upToNextMinor(from: "3.1.1")) ``` Also, have a look at [Swift Package Manager @ CryptoSwift](https://github.com/krzyzanowskim/CryptoSwift/blob/master/README.md#swift-package-manager). diff --git a/Example/Podfile.lock b/Example/Podfile.lock index c685294e5..b85276971 100755 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,6 +1,6 @@ PODS: - CryptoSwift (1.3.8) - - nRFMeshProvision (3.1.0): + - nRFMeshProvision (3.1.1): - CryptoSwift (= 1.3.8) DEPENDENCIES: @@ -16,7 +16,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: CryptoSwift: 01b0f0cba1d5c212e5a335ff6c054fb75a204f00 - nRFMeshProvision: 65db103d9ef4f47304314349e10ea31e6148705e + nRFMeshProvision: c1287c0156085336176e317ac2f707541c162e4c PODFILE CHECKSUM: 69a81463322ef34ca0a20b98e90da2701d94e4ec diff --git a/Example/Pods/Local Podspecs/nRFMeshProvision.podspec.json b/Example/Pods/Local Podspecs/nRFMeshProvision.podspec.json index 0f1af705b..9caa3932a 100755 --- a/Example/Pods/Local Podspecs/nRFMeshProvision.podspec.json +++ b/Example/Pods/Local Podspecs/nRFMeshProvision.podspec.json @@ -1,6 +1,6 @@ { "name": "nRFMeshProvision", - "version": "3.1.0", + "version": "3.1.1", "summary": "A Bluetooth Mesh library", "description": "nRF Mesh is a Bluetooth Mesh compliant library that has many features such as provisioning, configuration and control of Bluetooth Mesh compliant nodes.", "homepage": "https://github.com/NordicSemiconductor/IOS-nRF-Mesh-Library", @@ -13,7 +13,7 @@ }, "source": { "git": "https://github.com/NordicSemiconductor/IOS-nRF-Mesh-Library.git", - "tag": "3.1.0" + "tag": "3.1.1" }, "social_media_url": "https://twitter.com/nordictweets", "platforms": { diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock index c685294e5..b85276971 100755 --- a/Example/Pods/Manifest.lock +++ b/Example/Pods/Manifest.lock @@ -1,6 +1,6 @@ PODS: - CryptoSwift (1.3.8) - - nRFMeshProvision (3.1.0): + - nRFMeshProvision (3.1.1): - CryptoSwift (= 1.3.8) DEPENDENCIES: @@ -16,7 +16,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: CryptoSwift: 01b0f0cba1d5c212e5a335ff6c054fb75a204f00 - nRFMeshProvision: 65db103d9ef4f47304314349e10ea31e6148705e + nRFMeshProvision: c1287c0156085336176e317ac2f707541c162e4c PODFILE CHECKSUM: 69a81463322ef34ca0a20b98e90da2701d94e4ec diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index 7e7a5ce04..6d6f6ec38 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -502,7 +502,7 @@ 0A280880F4C8F13FD6499E8F8E164DDD /* LightLightnessDefaultGet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = LightLightnessDefaultGet.swift; sourceTree = ""; }; 0CBC0B6FAD4B8E1DF73631988515F121 /* Model.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Model.swift; sourceTree = ""; }; 0D39AC6D86ECF0A5FD49EB88D65DFB07 /* ConfigAppKeyDelete.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ConfigAppKeyDelete.swift; sourceTree = ""; }; - 0D52291E7D8F400A8478B5A3E5457BC7 /* Pods_nRFMeshProvision_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_nRFMeshProvision_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 0D52291E7D8F400A8478B5A3E5457BC7 /* Pods_nRFMeshProvision_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_nRFMeshProvision_Example.framework; path = "Pods-nRFMeshProvision_Example.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; 0DC909DB1A2E28D37C9C0945586D03D3 /* Utils+Foundation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Utils+Foundation.swift"; path = "Sources/CryptoSwift/Foundation/Utils+Foundation.swift"; sourceTree = ""; }; 0E52D68D447E085C5D0A5E943CD85CE2 /* BlockCipher.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BlockCipher.swift; path = Sources/CryptoSwift/BlockCipher.swift; sourceTree = ""; }; 0E91713FD0822BF4627823FA36D644E4 /* GenericDefaultTransitionTimeStatus.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = GenericDefaultTransitionTimeStatus.swift; sourceTree = ""; }; @@ -528,7 +528,7 @@ 1925AF83EF4194C1CBE862B1C56898F4 /* CFB.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CFB.swift; path = Sources/CryptoSwift/BlockMode/CFB.swift; sourceTree = ""; }; 19556D416A0355C706C41B5045F5CAFC /* LightCTLTemperatureRangeSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = LightCTLTemperatureRangeSet.swift; sourceTree = ""; }; 19F45708B71522762B7C5554D8AE2614 /* OCB.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = OCB.swift; path = Sources/CryptoSwift/BlockMode/OCB.swift; sourceTree = ""; }; - 1A90E5F0A2A984ABB870904459A08AB6 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = LICENSE; sourceTree = ""; }; + 1A90E5F0A2A984ABB870904459A08AB6 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; path = LICENSE; sourceTree = ""; }; 1A9C5C05255D9CA2E310D0B8C201CE26 /* LightHSLGet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = LightHSLGet.swift; sourceTree = ""; }; 1B38F707FDFEFFB30B88DE895C1CAD3B /* LightHSLStatus.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = LightHSLStatus.swift; sourceTree = ""; }; 1BE90CE31DAA2C7235D34F77D0D1EB83 /* Blowfish.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Blowfish.swift; path = Sources/CryptoSwift/Blowfish.swift; sourceTree = ""; }; @@ -640,7 +640,7 @@ 5A7958FA7CBB28B1A1F7C3E244C15C58 /* BlockDecryptor.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BlockDecryptor.swift; path = Sources/CryptoSwift/BlockDecryptor.swift; sourceTree = ""; }; 5AA0C0DFB4FB17BEEC1D1C7B96F6516A /* MeshState.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MeshState.swift; sourceTree = ""; }; 5AA1F177C3E873466F41E59F93BB88FF /* ApplicationKeys.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ApplicationKeys.swift; sourceTree = ""; }; - 5D1064AE7769CE96C69DAF830939B26B /* Pods_nRFMeshProvision_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_nRFMeshProvision_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 5D1064AE7769CE96C69DAF830939B26B /* Pods_nRFMeshProvision_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_nRFMeshProvision_Tests.framework; path = "Pods-nRFMeshProvision_Tests.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; 5D33BC06271B0627425B6283515933B5 /* FilterStatus.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FilterStatus.swift; sourceTree = ""; }; 5D6ECF9361E78107F7181C4B0110ED32 /* BlockMode.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BlockMode.swift; path = Sources/CryptoSwift/BlockMode/BlockMode.swift; sourceTree = ""; }; 5E3277879E1C4AACB8B75D547B1A6475 /* HMAC+Foundation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "HMAC+Foundation.swift"; path = "Sources/CryptoSwift/Foundation/HMAC+Foundation.swift"; sourceTree = ""; }; @@ -668,7 +668,7 @@ 6BB823594546C634C25D825F551CCA09 /* nRFMeshProvision-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "nRFMeshProvision-dummy.m"; sourceTree = ""; }; 6BD040CEFF2532EF00F1704479DCE886 /* ProvisioningPdu.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ProvisioningPdu.swift; sourceTree = ""; }; 6CC28DE7DA9728ADE379577F363F51E4 /* GenericDeltaSetUnacknowledged.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = GenericDeltaSetUnacknowledged.swift; sourceTree = ""; }; - 6DBF43F1EEBD7609DA20C9A60E24017B /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; + 6DBF43F1EEBD7609DA20C9A60E24017B /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; path = README.md; sourceTree = ""; }; 6E63A7555352674B611858ED34F196F2 /* ConfigVendorModelSubscriptionList.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ConfigVendorModelSubscriptionList.swift; sourceTree = ""; }; 702C82E54C0DDDACA392BC8811C9EE0C /* SensorSettingGet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SensorSettingGet.swift; sourceTree = ""; }; 715D8AD06FC0C8F2A36261047C33499F /* ConfigRelaySet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ConfigRelaySet.swift; sourceTree = ""; }; @@ -751,7 +751,7 @@ 9B75FAE6885CC2FB549E2DB112228BB4 /* Pods-nRFMeshProvision_Tests-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-nRFMeshProvision_Tests-Info.plist"; sourceTree = ""; }; 9BD9AEA5931F6114937E2C4D0A575C6B /* ConfigNodeResetStatus.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ConfigNodeResetStatus.swift; sourceTree = ""; }; 9CEAC8E82D74B2348CE17FA8B5C6FCE8 /* LightHSLSaturationStatus.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = LightHSLSaturationStatus.swift; sourceTree = ""; }; - 9D940727FF8FB9C785EB98E56350EF41 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 9D940727FF8FB9C785EB98E56350EF41 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 9E3CB4CB8F6F3D29500CCE4AE205CDB8 /* LightHSLRangeSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = LightHSLRangeSet.swift; sourceTree = ""; }; 9EDC31B03B673A037487105C9421FCD1 /* LightLightnessLinearSetUnacknowledged.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = LightLightnessLinearSetUnacknowledged.swift; sourceTree = ""; }; 9F7A47D94B25624D05EE4B282B46F9B7 /* String+Extension.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "String+Extension.swift"; path = "Sources/CryptoSwift/String+Extension.swift"; sourceTree = ""; }; @@ -766,7 +766,7 @@ A421192576A8E503AE97BBA464BDB881 /* Pods-nRFMeshProvision_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-nRFMeshProvision_Example.debug.xcconfig"; sourceTree = ""; }; A4CDE54F3779A5167BC6E7E513AA966B /* SceneRecallUnacknowledged.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SceneRecallUnacknowledged.swift; sourceTree = ""; }; A54D40C74BA67B9D7BDCFEFCD0F9819C /* PublicKey.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PublicKey.swift; sourceTree = ""; }; - A57A5A9193043D3B0479CD9130D65056 /* nRFMeshProvision.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; path = nRFMeshProvision.podspec; sourceTree = ""; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + A57A5A9193043D3B0479CD9130D65056 /* nRFMeshProvision.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; path = nRFMeshProvision.podspec; sourceTree = ""; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; A60A27C9335D1C9D0E020FE6DF6493F1 /* SceneRecall.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SceneRecall.swift; sourceTree = ""; }; A6557382692D764A45D7A7ED21B0C48E /* CryptoSwift.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = CryptoSwift.debug.xcconfig; sourceTree = ""; }; A6EB0E8A83F911C7974BA3CBB99B12D6 /* SegmentedAccessMessage.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SegmentedAccessMessage.swift; sourceTree = ""; }; @@ -803,7 +803,7 @@ B2E080FB4E261AF321DEC0CC7886DEE3 /* SensorDescriptorGet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SensorDescriptorGet.swift; sourceTree = ""; }; B3BC8620DD369A284BD6DB68A66EF7DC /* LightLCModeStatus.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = LightLCModeStatus.swift; sourceTree = ""; }; B4406258A2D04D5A32173F1D61F4690A /* LightHSLDefaultSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = LightHSLDefaultSet.swift; sourceTree = ""; }; - B4C001B7D2FB9649EC19C565872AF0D8 /* nRFMeshProvision.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = nRFMeshProvision.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + B4C001B7D2FB9649EC19C565872AF0D8 /* nRFMeshProvision.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = nRFMeshProvision.framework; path = nRFMeshProvision.framework; sourceTree = BUILT_PRODUCTS_DIR; }; B7710B4FB8FF484D1B19E19EF1893125 /* Generics.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Generics.swift; path = Sources/CryptoSwift/Generics.swift; sourceTree = ""; }; B77B735255D891A4AF589C37CBCBB586 /* MeshAddress.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MeshAddress.swift; sourceTree = ""; }; B82517944BC054091FC54F1D356BD4B6 /* Updatable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Updatable.swift; path = Sources/CryptoSwift/Updatable.swift; sourceTree = ""; }; @@ -930,7 +930,7 @@ F5FE05A89FD5E0D6A9AEF06F58F33EE6 /* GenericPowerDefaultSetUnacknowledged.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = GenericPowerDefaultSetUnacknowledged.swift; sourceTree = ""; }; F7A4DFB59F383D801346E4714FB7F7D2 /* MeshConstants.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MeshConstants.swift; sourceTree = ""; }; F7B2887C11CC9A6C0576F802E19509CD /* MeshNetwork+Nodes.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "MeshNetwork+Nodes.swift"; sourceTree = ""; }; - F81274EDB681F11E7CB05F7DCA2BB33C /* CryptoSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CryptoSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + F81274EDB681F11E7CB05F7DCA2BB33C /* CryptoSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = CryptoSwift.framework; path = CryptoSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; F8E270517B0521B9EC6632CE69A78936 /* Ranges.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Ranges.swift; sourceTree = ""; }; F9D0F84B7C410BECD23D4FE4DE4692D9 /* Pods-nRFMeshProvision_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-nRFMeshProvision_Tests.debug.xcconfig"; sourceTree = ""; }; F9E43448247F28E1FB9732AB9BCE2CD2 /* Security.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Security.swift; sourceTree = ""; }; @@ -988,6 +988,7 @@ E47D1451BBFE1BB7F2F0F7C2870F6B1C /* AccessLayer.swift */, D96A866F77D83D35F04A775F286CCB0C /* AccessPdu.swift */, ); + name = "Access Layer"; path = "Access Layer"; sourceTree = ""; }; @@ -1070,6 +1071,7 @@ 3BFAEE717DF64771979446BD91333CA7 /* GenericPowerRangeSetUnacknowledged.swift */, 8ADB7316D69FCAC06A4BAA020192697A /* GenericPowerRangeStatus.swift */, ); + name = Generic; path = Generic; sourceTree = ""; }; @@ -1099,6 +1101,7 @@ D949DA3598A09A99D22E0D575EACFF7D /* RemoveAddressesFromFilter.swift */, B0B03F3FA2C5F8CE8A34FC2C028C7112 /* SetFilterType.swift */, ); + name = "Proxy Configuration"; path = "Proxy Configuration"; sourceTree = ""; }; @@ -1123,6 +1126,7 @@ children = ( 54A6AF9B50857DEC0B7DFA970571F572 /* Configuration */, ); + name = Foundation; path = Foundation; sourceTree = ""; }; @@ -1135,6 +1139,7 @@ 1208BE6CEF065864052CCD90C59E1AFF /* SecureNetworkBeacon.swift */, 7A2C48D8FCD8C36F32B7F785E195D2CA /* UnprovisionedDeviceBeacon.swift */, ); + name = "Network Layer"; path = "Network Layer"; sourceTree = ""; }; @@ -1167,6 +1172,7 @@ 130110570FF1EFE2B7B0160E380B4E0E /* SceneStore.swift */, 14324ED03CF7604C541B084FB776C626 /* SceneStoreUnacknowledged.swift */, ); + name = "Time and Scenes"; path = "Time and Scenes"; sourceTree = ""; }; @@ -1251,6 +1257,7 @@ DE21841074A1A9716F8FF24C9050AC63 /* ConfigVendorModelSubscriptionGet.swift */, 6E63A7555352674B611858ED34F196F2 /* ConfigVendorModelSubscriptionList.swift */, ); + name = Configuration; path = Configuration; sourceTree = ""; }; @@ -1276,6 +1283,7 @@ 37AEA57F76C0D9A61679D8A0A04A44CF /* SensorSettingStatus.swift */, 2CE39D27F59D5CD022E4F055B9C0D59E /* SensorStatus.swift */, ); + name = Sensors; path = Sensors; sourceTree = ""; }; @@ -1368,6 +1376,7 @@ 9798622457A7AF72CFFC22B53447164D /* ZeroPadding.swift */, 34E45C5349815E0E82D3E88DB3A77A3B /* Support Files */, ); + name = CryptoSwift; path = CryptoSwift; sourceTree = ""; }; @@ -1474,6 +1483,7 @@ E59928D0944FF9ED19CA230C6BC5612F /* LightLightnessSetUnacknowledged.swift */, 406CA1C650A51A141AE2137F92C64C26 /* LightLightnessStatus.swift */, ); + name = Lighting; path = Lighting; sourceTree = ""; }; @@ -1499,6 +1509,7 @@ 0EED16CD1A96C8F33B6C1A994DA63774 /* PBGattBearer.swift */, 595C7C63FD3F71CC3D20903C6F93D98A /* ProxyProtocolHandler.swift */, ); + name = GATT; path = GATT; sourceTree = ""; }; @@ -1648,6 +1659,7 @@ FC276ED020333356AEC069617C80F818 /* ConfigurationServerHandler.swift */, 13C0460255311F410E3D996363C8ADEF /* SceneClientHandler.swift */, ); + name = "Foundation Layer"; path = "Foundation Layer"; sourceTree = ""; }; @@ -1706,6 +1718,7 @@ 0F225033375F94424AA4EC45BCDD8439 /* UpperTransportLayer.swift */, ED308E4D61768C5BEB268E1D208170DD /* UpperTransportPdu.swift */, ); + name = "Upper Transport Layer"; path = "Upper Transport Layer"; sourceTree = ""; }; @@ -1752,6 +1765,7 @@ 5379B0AD59C1F2452490E18D2865BCC3 /* SegmentedControlMessage.swift */, A9E2600F363DFC17475231F6F3132B75 /* SegmentedMessage.swift */, ); + name = "Lower Transport Layer"; path = "Lower Transport Layer"; sourceTree = ""; }; @@ -1876,7 +1890,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1100; - LastUpgradeCheck = 1240; + LastUpgradeCheck = 1100; }; buildConfigurationList = 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; @@ -2638,7 +2652,8 @@ MTL_FAST_MATH = YES; PRODUCT_NAME = "$(TARGET_NAME)"; STRIP_INSTALLED_PRODUCT = NO; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_VERSION = 5.0; SYMROOT = "${SRCROOT}/../build"; }; diff --git a/Example/Pods/Target Support Files/nRFMeshProvision/nRFMeshProvision-Info.plist b/Example/Pods/Target Support Files/nRFMeshProvision/nRFMeshProvision-Info.plist index 90db36aa4..793d31a9f 100644 --- a/Example/Pods/Target Support Files/nRFMeshProvision/nRFMeshProvision-Info.plist +++ b/Example/Pods/Target Support Files/nRFMeshProvision/nRFMeshProvision-Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.1.0 + 3.1.1 CFBundleSignature ???? CFBundleVersion diff --git a/Example/nRFMeshProvision.xcodeproj/project.pbxproj b/Example/nRFMeshProvision.xcodeproj/project.pbxproj index 4a7cda7c4..b1c9d1265 100644 --- a/Example/nRFMeshProvision.xcodeproj/project.pbxproj +++ b/Example/nRFMeshProvision.xcodeproj/project.pbxproj @@ -1356,7 +1356,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CODE_SIGN_ENTITLEMENTS = nRFMeshProvision_Example.entitlements; - CURRENT_PROJECT_VERSION = 4; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = P3R8YQEV4L; ENABLE_BITCODE = NO; INFOPLIST_FILE = nRFMeshProvision/Info.plist; @@ -1364,7 +1364,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; LINK_WITH_STANDARD_LIBRARIES = YES; - MARKETING_VERSION = 3.1.0; + MARKETING_VERSION = 3.1.1; MODULE_NAME = ExampleApp; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.nordicsemi.nRFProvisioner; @@ -1383,7 +1383,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CODE_SIGN_ENTITLEMENTS = nRFMeshProvision_Example.entitlements; - CURRENT_PROJECT_VERSION = 4; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = P3R8YQEV4L; ENABLE_BITCODE = NO; INFOPLIST_FILE = nRFMeshProvision/Info.plist; @@ -1391,7 +1391,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; LINK_WITH_STANDARD_LIBRARIES = YES; - MARKETING_VERSION = 3.1.0; + MARKETING_VERSION = 3.1.1; MODULE_NAME = ExampleApp; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.nordicsemi.nRFProvisioner; diff --git a/nRFMeshProvision.podspec b/nRFMeshProvision.podspec index e75210fb7..05d75db97 100755 --- a/nRFMeshProvision.podspec +++ b/nRFMeshProvision.podspec @@ -9,7 +9,7 @@ Pod::Spec.new do |s| s.name = 'nRFMeshProvision' - s.version = '3.1.0' + s.version = '3.1.1' s.summary = 'A Bluetooth Mesh library' s.description = <<-DESC nRF Mesh is a Bluetooth Mesh compliant library that has many features such as provisioning, configuration and control of Bluetooth Mesh compliant nodes.