Merge pull request #545 from NordicSemiconductor/nordic-dfu

CocoaPods repo renamed to NordicDFU

Author: philips77

iOSDFULibrary.podspec renamed to NordicDFU.podspec

@@ -1,7 +1,6 @@
 Pod::Spec.new do |s|
-  s.name             = "iOSDFULibrary"
-  s.module_name      = 'NordicDFU'
-  s.version          = "4.15.3"
+  s.name             = "NordicDFU"
+  s.version          = "4.16.0"
   s.summary          = "This repository contains a library 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.
@@ -12,7 +11,7 @@ The nRF5x Series chips are flash-based SoCs, and as such they represent the most
   s.license          = 'BSD 3-Clause'
   s.authors          = { "Aleksander Nowakowski" => "aleksander.nowakowski@nordicsemi.no" }
   s.source           = { :git => "https://github.com/NordicSemiconductor/IOS-DFU-Library.git", :tag => s.version.to_s }
-  s.social_media_url = 'https://twitter.com/nordictweets'
+  s.social_media_url = 'https://x.com/nordictweets'
   s.swift_versions   = ['4.2', '5.0', '5.1', '5.2', '5.3', '5.4', '5.5', '5.6', '5.7', '5.8', '5.9']
 
   s.ios.deployment_target = '12.0'

README.md

@@ -11,7 +11,7 @@ Settings screen allows to change the DFU library parameters used for uploading f
 
 # iOS DFU Library
 
-[![Version](http://img.shields.io/cocoapods/v/iOSDFULibrary.svg)](http://cocoapods.org/pods/iOSDFULibrary)
+[![Version](http://img.shields.io/cocoapods/v/NordicDFU.svg)](http://cocoapods.org/pods/NordicDFU)
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 
 ## Installation
@@ -23,7 +23,7 @@ Settings screen allows to change the DFU library parameters used for uploading f
 ```ruby
 target 'YourAppTargetName' do
     use_frameworks!
-    pod 'iOSDFULibrary'
+    pod 'NordicDFU'
 end
 ```
 
@@ -52,7 +52,7 @@ github "NordicSemiconductor/IOS-DFU-Library" ~> x.y // Replace x.y with your req
 carthage update --use-xcframeworks --platform iOS // other supported platforms: macOS, tvOS, watchOS
 ```
 
-- Carthage will build the **iOSDFULibrary.framework** and **ZipFramework.framework** files in **Carthage/Build/**, 
+- Carthage will build the **NordicDFU.framework** and **ZipFramework.framework** files in **Carthage/Build/**, 
 you may now copy all those files to your project and use the library, additionally, carthage also builds **\*.dsym** files 
 if you need to resymbolicate crash logs. you may want to keep those files bundled with your builds for future use.
 
@@ -160,7 +160,7 @@ The library is compatible with nRF51 and nRF52 devices with S-Series Soft Device
 * **SDK 14.0.0** - Buttonless DFU no longer experimental. New buttonless characteristic added for bonded devices (requires bond, cache cleaning relies on Service Changed indication).
 * **SDK 15.0.0** - Support for higher MTUs added.
 
-This library is fully backwards compatible and supports both the new and legacy DFU. The experimental buttonless DFU service from SDK 12 is supported since version 1.1.0. Due to the fact, that this experimental service from SDK 12 is not safe, you have to set [enableUnsafeExperimentalButtonlessServiceInSecureDfu](https://github.com/NordicSemiconductor/IOS-DFU-Library/blob/master/iOSDFULibrary/Classes/Implementation/DFUServiceInitiator.swift#L296) to true to enable it, this is off by default. Read the method documentation for details. It is recommended to use the Buttonless service from SDK 13 (for non-bonded devices, or 14 for bonded). Both are supported since DFU Library 1.3.0.
+This library is fully backwards compatible and supports both the new and legacy DFU. The experimental buttonless DFU service from SDK 12 is supported since version 1.1.0. Due to the fact, that this experimental service from SDK 12 is not safe, you have to set [enableUnsafeExperimentalButtonlessServiceInSecureDfu](https://github.com/NordicSemiconductor/IOS-DFU-Library/blob/main/Library/Classes/Implementation/DFUServiceInitiator.swift#L325) to true to enable it, this is off by default. Read the method documentation for details. It is recommended to use the Buttonless service from SDK 13 (for non-bonded devices, or 14 for bonded). Both are supported since DFU Library 1.3.0.
 
 Check platform folders for mode details about compatibility for each library.
 

README_OBJC.md

@@ -1,6 +1,6 @@
 # iOS DFU Library
 
-[![Version](http://img.shields.io/cocoapods/v/iOSDFULibrary.svg)](http://cocoapods.org/pods/iOSDFULibrary)
+[![Version](http://img.shields.io/cocoapods/v/NordicDFU.svg)](http://cocoapods.org/pods/NordicDFU)
 
 ## Installation instructions for Obj-C projects
 
@@ -10,7 +10,7 @@
 ```
 target 'YourAppTargetName' do
 use_frameworks!
-pod 'iOSDFULibrary'
+pod 'NordicDFU'
 end
 ```
 - Install dependencies
@@ -20,7 +20,7 @@ pod install
 - Open the newly created `.xcworkspace` and begin working on your project.
 - If Xcode asks to migrate code to Swift 5.5, choose **Later**. (The codebase is Swift 5.5 already)
 - Click on the `Pods` project, then go to the `Build Settings`
-- Click on the `iOSDFULibrary` target, then set the `Use Legacy Swift version` setting to `No`
+- Click on the `NordicDFU` target, then set the `Use Legacy Swift version` setting to `No`
 - Repeat the same for the `ZIPFoundation` target.
 - Build the project, it should now succeed.
 - Import the library to any of your obj-c classes by using `@import NordicDFU;` and begin working on your project.

Test App/DFU Test Performer.xcodeproj/project.pbxproj

@@ -29,7 +29,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		3B0557890E61EFF388A8734B /* iOSDFULibrary.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = iOSDFULibrary.podspec; path = ../iOSDFULibrary.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
+		3B0557890E61EFF388A8734B /* NordicDFU.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = NordicDFU.podspec; path = ../NordicDFU.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		5223723E2029C40F00068EE4 /* DFUViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DFUViewController.swift; sourceTree = "<group>"; };
 		522372432029CCDE00068EE4 /* DFUTestSet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DFUTestSet.swift; sourceTree = "<group>"; };
 		522372452029CFFD00068EE4 /* nRF51TestSet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = nRF51TestSet.swift; sourceTree = "<group>"; };
@@ -165,7 +165,7 @@
 		607FACF51AFB993E008FA782 /* Podspec Metadata */ = {
 			isa = PBXGroup;
 			children = (
-				3B0557890E61EFF388A8734B /* iOSDFULibrary.podspec */,
+				3B0557890E61EFF388A8734B /* NordicDFU.podspec */,
 				8EE39CA79039E8FFBDA0C9D3 /* README.md */,
 				5288C1E1236C3C7400321ED3 /* README_OBJC.md */,
 				52A9C166230D633A0036792A /* changelog.md */,
@@ -213,7 +213,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1530;
+				LastUpgradeCheck = 1610;
 				ORGANIZATIONNAME = CocoaPods;
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
@@ -293,13 +293,13 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-DFU Test Performer/Pods-DFU Test Performer-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/NordicDFU/NordicDFU.framework",
 				"${BUILT_PRODUCTS_DIR}/ZIPFoundation/ZIPFoundation.framework",
-				"${BUILT_PRODUCTS_DIR}/iOSDFULibrary/NordicDFU.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ZIPFoundation.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NordicDFU.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ZIPFoundation.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -345,7 +345,6 @@
 		607FACED1AFB9204008FA782 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
@@ -408,7 +407,6 @@
 		607FACEE1AFB9204008FA782 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
@@ -466,7 +464,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = A53D3A4C2442F2EDB0E18C1E /* Pods-DFU Test Performer.debug.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -482,7 +479,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				MARKETING_VERSION = 1.0.0;
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.nordicsemi.DFU-Example";
@@ -498,7 +495,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = EC4C9A434AF0A6D23C24D283 /* Pods-DFU Test Performer.release.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -514,7 +510,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				MARKETING_VERSION = 1.0.0;
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.nordicsemi.DFU-Example";

Test App/DFU Test Performer.xcodeproj/xcshareddata/xcschemes/DFU Test Performer.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1530"
+   LastUpgradeVersion = "1610"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

Test App/Podfile

@@ -1,5 +1,5 @@
 use_frameworks!
 target 'DFU Test Performer' do
   platform :ios, '12.0'
-  pod 'iOSDFULibrary', :path => '../'
-end
+  pod 'NordicDFU', :path => '../'
+end

Test App/Podfile.lock

@@ -1,23 +1,23 @@
 PODS:
-  - iOSDFULibrary (4.15.3):
+  - NordicDFU (4.16.0):
     - ZIPFoundation (= 0.9.19)
   - ZIPFoundation (0.9.19)
 
 DEPENDENCIES:
-  - iOSDFULibrary (from `../`)
+  - NordicDFU (from `../`)
 
 SPEC REPOS:
   trunk:
     - ZIPFoundation
 
 EXTERNAL SOURCES:
-  iOSDFULibrary:
+  NordicDFU:
     :path: "../"
 
 SPEC CHECKSUMS:
-  iOSDFULibrary: ef7e1fbb3fc7a5fabd106297a9cd0e775bcfcec6
+  NordicDFU: 116a4ec458945889f8e0e71759e03b23c39c3482
   ZIPFoundation: b8c29ea7ae353b309bc810586181fd073cb3312c
 
-PODFILE CHECKSUM: ae4b20f609dc65f886ce92e7f350ae5ef1fa65ca
+PODFILE CHECKSUM: 9a7e01b8ffa6bf429152c8dacc8e138552ed18aa
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2