diff --git a/BPBleOTA.podspec b/BPBleOTA.podspec index 6fbf12c..e9f8999 100644 --- a/BPBleOTA.podspec +++ b/BPBleOTA.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'BPBleOTA' - s.version = '0.5.0' + s.version = '0.6.0' s.summary = 'a swift library aggregating NordicDFU and SMPDFU implement' # This description is used to generate tags and improve search results. @@ -18,21 +18,22 @@ Pod::Spec.new do |s| # * Finally, don't worry about the indent, CocoaPods strips it! s.description = <<-DESC - BPBleOTA is a swift library support NordicDFU and SMPDFU for compatible devices. It depended on iOSDFULibrary and iOSMcuManagerLibrary,so can support NordicDFU and SMPDFU by BLE. All things BPBleOTA done are aggregating them and provide a unified interface，So it can support pure Objective-C projects which are not supported directly by NordicDFU and SMPDFU - DESC + BPBleOTA is a swift library support NordicDFU and SMPDFU for compatible devices. + It depended on iOSDFULibrary and iOSMcuManagerLibrary,so can support NordicDFU and SMPDFU by BLE. + All things BPBleOTA done are aggregating them and provide a unified interface，So it can support pure Objective-C projects which are not supported directly by NordicDFU and SMPDFU. + DESC s.homepage = 'https://github.com/zhxf2012/BPBleOTA' # s.screenshots = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2' s.license = { :type => 'MIT', :file => 'LICENSE' } s.author = { 'zhouxingfa' => 'zhouxingfa@bibibetter.com' } - #s.source = { :git => 'https://github.com/zhxf2012/BPBleOTA.git', :tag => s.version.to_s } s.source = { :git => 'https://github.com/zhxf2012/BPBleOTA.git', :tag => s.version.to_s } # s.social_media_url = 'https://twitter.com/' - s.ios.deployment_target = '9.0' + s.ios.deployment_target = '11.0' s.swift_versions = ["5.0", "5.1", "5.2", "5.3", "5.4", "5.5", "5.6", "5.7"] - s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } - s.user_target_xcconfig = {'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } + #s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } + #s.user_target_xcconfig = {'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } s.source_files = 'Sources/BPBleOTA/Classes/**/*' diff --git a/BPBleOTA.xcodeproj/project.pbxproj b/BPBleOTA.xcodeproj/project.pbxproj index 07181d2..537cc3f 100644 --- a/BPBleOTA.xcodeproj/project.pbxproj +++ b/BPBleOTA.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 51; objects = { /* Begin PBXAggregateTarget section */ @@ -207,7 +207,7 @@ 6B9D5C4091D07A2539C90936 /* Data+Serialization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Data+Serialization.swift"; sourceTree = ""; }; 6DAB51E2F314D29559550D58 /* DFUExecutor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DFUExecutor.swift; sourceTree = ""; }; 700A46DED312470CCEE2F77E /* DFUStarterPeripheral.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DFUStarterPeripheral.swift; sourceTree = ""; }; - 754BFB05C816FF2F03E06C5E /* .gitkeep */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitkeep; sourceTree = ""; }; + 754BFB05C816FF2F03E06C5E /* .gitkeep */ = {isa = PBXFileReference; path = .gitkeep; sourceTree = ""; }; 7A08905B61BEEDA114253276 /* Data+McuManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Data+McuManager.swift"; sourceTree = ""; }; 7EB4F2B5BC36522619D15F20 /* FixedWidthInteger+Bytes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FixedWidthInteger+Bytes.swift"; sourceTree = ""; }; 7FC530F7FA2241FB3EB33881 /* BPBleOTATests.xctest */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.cfbundle; path = BPBleOTATests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -237,7 +237,7 @@ AED40315D80E7B9D51066AAF /* DefaultManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultManager.swift; sourceTree = ""; }; AEDD0D84472679B0CDC30C8D /* CBOR.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CBOR.swift; sourceTree = ""; }; B31FAE0833204EF5D0516343 /* UnkeyedDecodingContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnkeyedDecodingContainer.swift; sourceTree = ""; }; - B43657E3C81C297038B3A7AF /* .gitkeep */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitkeep; sourceTree = ""; }; + B43657E3C81C297038B3A7AF /* .gitkeep */ = {isa = PBXFileReference; path = .gitkeep; sourceTree = ""; }; B4B0EBC89779FF074B2597FC /* Archive+Writing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Archive+Writing.swift"; sourceTree = ""; }; B5C29A2D281BFA41B859563B /* SecureDFUPacket.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureDFUPacket.swift; sourceTree = ""; }; B646FDCE5EE6A478115BDB41 /* NordicDFU.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = NordicDFU.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -714,7 +714,7 @@ 9439E788E4C243EDECD6E0EB /* SwiftCBOR.framework */, 1B9FBD31B4AA896830C87226 /* ZIPFoundation.framework */, ); - path = Products; + name = Products; sourceTree = ""; }; E4509736AF7FE0EAB139CE30 /* DFU */ = { @@ -898,6 +898,8 @@ isa = PBXProject; attributes = { LastUpgradeCheck = 1200; + TargetAttributes = { + }; }; buildConfigurationList = D4B72E61CE151C9C4D8BFE0D /* Build configuration list for PBXProject "BPBleOTA" */; compatibilityVersion = "Xcode 11.0"; @@ -1110,7 +1112,7 @@ buildSettings = { CODE_SIGNING_ALLOWED = NO; CODE_SIGN_IDENTITY = ""; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 0.4.4; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -1122,6 +1124,7 @@ "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 0.4.4; PRODUCT_BUNDLE_IDENTIFIER = com.bbb.zhxf.SwiftCBOR; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -1153,7 +1156,7 @@ buildSettings = { CODE_SIGNING_ALLOWED = NO; CODE_SIGN_IDENTITY = ""; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 0.9.11; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -1164,6 +1167,7 @@ "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 0.9.11; PRODUCT_BUNDLE_IDENTIFIER = com.bbb.zhxf.ZIPFoundation; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -1177,7 +1181,7 @@ buildSettings = { CODE_SIGNING_ALLOWED = NO; CODE_SIGN_IDENTITY = ""; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 4.13.0; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -1188,6 +1192,7 @@ "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 4.13.0; PRODUCT_BUNDLE_IDENTIFIER = com.bbb.zhxf.NordicDFU; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -1201,7 +1206,7 @@ buildSettings = { CODE_SIGNING_ALLOWED = NO; CODE_SIGN_IDENTITY = ""; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 1.3.1; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -1213,6 +1218,7 @@ "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 1.3.1; PRODUCT_BUNDLE_IDENTIFIER = com.bbb.zhxf.iOSMcuManagerLibrary; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -1290,7 +1296,7 @@ buildSettings = { CODE_SIGNING_ALLOWED = NO; CODE_SIGN_IDENTITY = ""; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 0.9.11; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -1301,6 +1307,7 @@ "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 0.9.11; PRODUCT_BUNDLE_IDENTIFIER = com.bbb.zhxf.ZIPFoundation; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -1322,7 +1329,7 @@ buildSettings = { CODE_SIGNING_ALLOWED = NO; CODE_SIGN_IDENTITY = ""; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 1.3.1; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -1334,6 +1341,7 @@ "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 1.3.1; PRODUCT_BUNDLE_IDENTIFIER = com.bbb.zhxf.iOSMcuManagerLibrary; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -1347,7 +1355,7 @@ buildSettings = { CODE_SIGNING_ALLOWED = NO; CODE_SIGN_IDENTITY = ""; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 0.6.20230506; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -1359,6 +1367,7 @@ "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 0.6.0; PRODUCT_BUNDLE_IDENTIFIER = com.bbb.zhxf.BPBleOTA; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -1373,7 +1382,7 @@ buildSettings = { CODE_SIGNING_ALLOWED = NO; CODE_SIGN_IDENTITY = ""; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 4.13.0; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -1384,6 +1393,7 @@ "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 4.13.0; PRODUCT_BUNDLE_IDENTIFIER = com.bbb.zhxf.NordicDFU; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -1415,7 +1425,7 @@ buildSettings = { CODE_SIGNING_ALLOWED = NO; CODE_SIGN_IDENTITY = ""; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 0.4.4; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -1427,6 +1437,7 @@ "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 0.4.4; PRODUCT_BUNDLE_IDENTIFIER = com.bbb.zhxf.SwiftCBOR; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -1503,7 +1514,7 @@ buildSettings = { CODE_SIGNING_ALLOWED = NO; CODE_SIGN_IDENTITY = ""; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 0.6.20230506; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -1515,6 +1526,7 @@ "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 0.6.0; PRODUCT_BUNDLE_IDENTIFIER = com.bbb.zhxf.BPBleOTA; SDKROOT = iphoneos; SKIP_INSTALL = YES; diff --git a/project.yml b/project.yml index 2053e4d..556b96f 100644 --- a/project.yml +++ b/project.yml @@ -4,7 +4,7 @@ options: deploymentTarget: iOS: "11.0" bundleIdPrefix: com.bbb.zhxf - version: 0.5.0 + version: 0.6.0 packages: iOSMcuManagerLibrary: @@ -30,25 +30,31 @@ targetTemplates: settings: GENERATE_INFOPLIST_FILE: YES CODE_SIGNING_ALLOWED: NO + MARKETING_VERSION: ${PACKAGE_VERSION} + CURRENT_PROJECT_VERSION: ${PACKAGE_VERSION} targets: iOSMcuManagerLibrary: templates: - Framework templateAttributes: frameworSourceFolder: IOS-nRF-Connect-Device-Manager/Source + PACKAGE_VERSION: 1.3.1 dependencies: - package: SwiftCBOR + SwiftCBOR: templates: - Framework templateAttributes: frameworSourceFolder: SwiftCBOR/Sources + PACKAGE_VERSION: 0.4.4 NordicDFU: templates: - Framework templateAttributes: frameworSourceFolder: IOS-DFU-Library/iOSDFULibrary + PACKAGE_VERSION: 4.13.0 dependencies: - package: ZIPFoundation @@ -57,6 +63,7 @@ targets: - Framework templateAttributes: frameworSourceFolder: ZIPFoundation/Sources + PACKAGE_VERSION: 0.9.11 @@ -73,6 +80,8 @@ targets: SWIFT_ACTIVE_COMPILATION_CONDITIONS: "$(inherited) SWIFT_PACKAGE" GENERATE_INFOPLIST_FILE: YES CODE_SIGNING_ALLOWED: NO + MARKETING_VERSION: 0.6.0 + CURRENT_PROJECT_VERSION: 0.6.20230506 BPBleOTATests: type: bundle.unit-test platform: iOS