Merge pull request #424 from NordicSemiconductor/develop

Versino 4.10.3
NordicSemiconductor · May 6, 2021 · 5e41c21 · 5e41c21
2 parents 0ad1677 + 2b540b4
commit 5e41c21
Show file tree

Hide file tree

Showing 17 changed files with 13 additions and 29 deletions.
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - iOSDFULibrary (4.10.2):
+  - iOSDFULibrary (4.10.3):
     - ZIPFoundation (= 0.9.11)
   - ZIPFoundation (0.9.11)
 
@@ -15,7 +15,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  iOSDFULibrary: 1887af06ea6ad34a9ac40880cf5e8147674999b0
+  iOSDFULibrary: 7aade51a907d01ca9a87055003cd232b09efd78f
   ZIPFoundation: b1f0de4eed33e74a676f76e12559ab6b75990197
 
 PODFILE CHECKSUM: 16697609d795697cac6384a823bc962ccbddb9d0

diff --git a/Example/Pods/Local Podspecs/iOSDFULibrary.podspec.json b/Example/Pods/Local Podspecs/iOSDFULibrary.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/...Target Support Files/Pods-iOSDFULibrary_Example/Pods-iOSDFULibrary_Example.debug.xcconfig b/...Target Support Files/Pods-iOSDFULibrary_Example/Pods-iOSDFULibrary_Example.debug.xcconfig
diff --git a/...rget Support Files/Pods-iOSDFULibrary_Example/Pods-iOSDFULibrary_Example.release.xcconfig b/...rget Support Files/Pods-iOSDFULibrary_Example/Pods-iOSDFULibrary_Example.release.xcconfig
diff --git a/...ods/Target Support Files/Pods-iOSDFULibrary_Tests/Pods-iOSDFULibrary_Tests.debug.xcconfig b/...ods/Target Support Files/Pods-iOSDFULibrary_Tests/Pods-iOSDFULibrary_Tests.debug.xcconfig
diff --git a/...s/Target Support Files/Pods-iOSDFULibrary_Tests/Pods-iOSDFULibrary_Tests.release.xcconfig b/...s/Target Support Files/Pods-iOSDFULibrary_Tests/Pods-iOSDFULibrary_Tests.release.xcconfig
diff --git a/...et Support Files/Pods-macOSDFULibrary_Example/Pods-macOSDFULibrary_Example.debug.xcconfig b/...et Support Files/Pods-macOSDFULibrary_Example/Pods-macOSDFULibrary_Example.debug.xcconfig
diff --git a/... Support Files/Pods-macOSDFULibrary_Example/Pods-macOSDFULibrary_Example.release.xcconfig b/... Support Files/Pods-macOSDFULibrary_Example/Pods-macOSDFULibrary_Example.release.xcconfig
diff --git a/Example/Pods/Target Support Files/iOSDFULibrary-iOS/iOSDFULibrary-iOS-Info.plist b/Example/Pods/Target Support Files/iOSDFULibrary-iOS/iOSDFULibrary-iOS-Info.plist
diff --git a/Example/Pods/Target Support Files/iOSDFULibrary-iOS/iOSDFULibrary-iOS.debug.xcconfig b/Example/Pods/Target Support Files/iOSDFULibrary-iOS/iOSDFULibrary-iOS.debug.xcconfig
diff --git a/Example/Pods/Target Support Files/iOSDFULibrary-iOS/iOSDFULibrary-iOS.release.xcconfig b/Example/Pods/Target Support Files/iOSDFULibrary-iOS/iOSDFULibrary-iOS.release.xcconfig
diff --git a/Example/Pods/Target Support Files/iOSDFULibrary-macOS/iOSDFULibrary-macOS-Info.plist b/Example/Pods/Target Support Files/iOSDFULibrary-macOS/iOSDFULibrary-macOS-Info.plist
diff --git a/Example/Pods/Target Support Files/iOSDFULibrary-macOS/iOSDFULibrary-macOS.debug.xcconfig b/Example/Pods/Target Support Files/iOSDFULibrary-macOS/iOSDFULibrary-macOS.debug.xcconfig
diff --git a/Example/Pods/Target Support Files/iOSDFULibrary-macOS/iOSDFULibrary-macOS.release.xcconfig b/Example/Pods/Target Support Files/iOSDFULibrary-macOS/iOSDFULibrary-macOS.release.xcconfig
diff --git a/changelog.md b/changelog.md
@@ -1,4 +1,7 @@
 ### Changelog
+- **4.10.3**
+   - Project compilation available for Arm Simulators (#423).
+
 - **4.10.2**
    - Bugfix: Fixed compilation issue in Xcode 12.4 ([#417](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/417)).
 

diff --git a/iOSDFULibrary.podspec b/iOSDFULibrary.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "iOSDFULibrary"
-  s.version          = "4.10.2"
+  s.version          = "4.10.3"
   s.summary          = "This repository contains a tested library for iOS 9+ devices to perform Device Firmware Update on the nRF5x devices"
   s.description      = <<-DESC
 The nRF5x Series chips are flash-based SoCs, and as such they represent the most flexible solution available. A key feature of the nRF5x Series and their associated software architecture and S-Series SoftDevices is the possibility for Over-The-Air Device Firmware Upgrade (OTA-DFU). See Figure 1. OTA-DFU allows firmware upgrades to be issued and downloaded to products in the field via the cloud and so enables OEMs to fix bugs and introduce new features to products that are already out on the market. This brings added security and flexibility to product development when using the nRF5x Series SoCs.
@@ -21,8 +21,5 @@ The nRF5x Series chips are flash-based SoCs, and as such they represent the most
   s.source_files = 'iOSDFULibrary/Classes/**/*'
 
   s.dependency 'ZIPFoundation', '= 0.9.11'
-
-  # Regarding the lines below see: https://stackoverflow.com/a/63955114/2115352
-  s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
-  s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
+
 end