diff --git a/Example/Podfile.lock b/Example/Podfile.lock index a6887673b..d29ce6186 100755 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - nRFMeshProvision (2.0.0): + - nRFMeshProvision (2.1.0): - OpenSSL-Universal (= 1.0.2.19) - OpenSSL-Universal (1.0.2.19): - OpenSSL-Universal/Static (= 1.0.2.19) @@ -20,7 +20,7 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - nRFMeshProvision: 04f449c7576dd664441c112c867e7efb5e0e4d05 + nRFMeshProvision: 0a7cdf55c9dc7fea11c1b20f18e5a47d12208dd6 OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 SwiftLint: fc9859e4e1752340664851f667bb1898b9c90114 diff --git a/Example/Pods/Local Podspecs/nRFMeshProvision.podspec.json b/Example/Pods/Local Podspecs/nRFMeshProvision.podspec.json index dff8ae5cf..8e6d205d7 100755 --- a/Example/Pods/Local Podspecs/nRFMeshProvision.podspec.json +++ b/Example/Pods/Local Podspecs/nRFMeshProvision.podspec.json @@ -1,6 +1,6 @@ { "name": "nRFMeshProvision", - "version": "2.0.0", + "version": "2.1.0", "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,14 +13,14 @@ }, "source": { "git": "https://github.com/NordicSemiconductor/IOS-nRF-Mesh-Library.git", - "tag": "2.0.0" + "tag": "2.1.0" }, "social_media_url": "https://twitter.com/nordictweets", "platforms": { "ios": "10.0" }, "static_framework": true, - "swift_versions": "5.0", + "swift_versions": "5.1", "source_files": "nRFMeshProvision/Classes/**/*", "dependencies": { "OpenSSL-Universal": [ @@ -28,5 +28,5 @@ ] }, "frameworks": "CoreBluetooth", - "swift_version": "5.0" + "swift_version": "5.1" } diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock index a6887673b..d29ce6186 100755 --- a/Example/Pods/Manifest.lock +++ b/Example/Pods/Manifest.lock @@ -1,5 +1,5 @@ PODS: - - nRFMeshProvision (2.0.0): + - nRFMeshProvision (2.1.0): - OpenSSL-Universal (= 1.0.2.19) - OpenSSL-Universal (1.0.2.19): - OpenSSL-Universal/Static (= 1.0.2.19) @@ -20,7 +20,7 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - nRFMeshProvision: 04f449c7576dd664441c112c867e7efb5e0e4d05 + nRFMeshProvision: 0a7cdf55c9dc7fea11c1b20f18e5a47d12208dd6 OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 SwiftLint: fc9859e4e1752340664851f667bb1898b9c90114 diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index f3cc95efb..0e4e4db79 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -1889,10 +1889,11 @@ }; name = Debug; }; - 4B8A2A8CA474E707707845131213CDBF /* Release */ = { + 5CB7F59DE8031259EE8850E954F2B976 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = DEEFCB1C7EE6CF79EF60A9D66AAAE7AD /* nRFMeshProvision.xcconfig */; + baseConfigurationReference = EE9E8C1F983733637663B926CB29ECE0 /* Pods-nRFMeshProvision_Tests.debug.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CLANG_ENABLE_OBJC_WEAK = NO; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -1903,27 +1904,26 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/nRFMeshProvision/nRFMeshProvision-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/nRFMeshProvision/nRFMeshProvision-Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-nRFMeshProvision_Tests/Pods-nRFMeshProvision_Tests-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/nRFMeshProvision/nRFMeshProvision.modulemap"; - PRODUCT_MODULE_NAME = nRFMeshProvision; - PRODUCT_NAME = nRFMeshProvision; + MODULEMAP_FILE = "Target Support Files/Pods-nRFMeshProvision_Tests/Pods-nRFMeshProvision_Tests.modulemap"; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Release; + name = Debug; }; - 52B8581ECDF8EDADDB5E850771D04DE9 /* Debug */ = { + 65E51D789FFE9EC736C7253CDA8DFE34 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = DEEFCB1C7EE6CF79EF60A9D66AAAE7AD /* nRFMeshProvision.xcconfig */; buildSettings = { @@ -1949,18 +1949,17 @@ SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.1; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Debug; }; - 5CB7F59DE8031259EE8850E954F2B976 /* Debug */ = { + 6973645EB91147AAC58FFA909F26FCA9 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = EE9E8C1F983733637663B926CB29ECE0 /* Pods-nRFMeshProvision_Tests.debug.xcconfig */; + baseConfigurationReference = DEEFCB1C7EE6CF79EF60A9D66AAAE7AD /* nRFMeshProvision.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CLANG_ENABLE_OBJC_WEAK = NO; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -1971,24 +1970,25 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Target Support Files/Pods-nRFMeshProvision_Tests/Pods-nRFMeshProvision_Tests-Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/nRFMeshProvision/nRFMeshProvision-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/nRFMeshProvision/nRFMeshProvision-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-nRFMeshProvision_Tests/Pods-nRFMeshProvision_Tests.modulemap"; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + MODULEMAP_FILE = "Target Support Files/nRFMeshProvision/nRFMeshProvision.modulemap"; + PRODUCT_MODULE_NAME = nRFMeshProvision; + PRODUCT_NAME = nRFMeshProvision; SDKROOT = iphoneos; SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_VERSION = 5.1; TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Debug; + name = Release; }; 84D7C4574E8F0F3095623F0E06F5B402 /* Release */ = { isa = XCBuildConfiguration; @@ -2190,8 +2190,8 @@ EEE3D98911E7FD1B998AE2D5CAAEA2BC /* Build configuration list for PBXNativeTarget "nRFMeshProvision" */ = { isa = XCConfigurationList; buildConfigurations = ( - 52B8581ECDF8EDADDB5E850771D04DE9 /* Debug */, - 4B8A2A8CA474E707707845131213CDBF /* Release */, + 65E51D789FFE9EC736C7253CDA8DFE34 /* Debug */, + 6973645EB91147AAC58FFA909F26FCA9 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Example/Pods/Target Support Files/nRFMeshProvision/nRFMeshProvision-Info.plist b/Example/Pods/Target Support Files/nRFMeshProvision/nRFMeshProvision-Info.plist index 0a12077e3..7f71fffcf 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 - 2.0.0 + 2.1.0 CFBundleSignature ???? CFBundleVersion diff --git a/Example/nRFMeshProvision.xcodeproj/project.pbxproj b/Example/nRFMeshProvision.xcodeproj/project.pbxproj index edaa0453c..c8caf44fe 100755 --- a/Example/nRFMeshProvision.xcodeproj/project.pbxproj +++ b/Example/nRFMeshProvision.xcodeproj/project.pbxproj @@ -1178,6 +1178,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; LINK_WITH_STANDARD_LIBRARIES = YES; + MARKETING_VERSION = 2.1.0; MODULE_NAME = ExampleApp; OTHER_LDFLAGS = ( "$(inherited)", @@ -1210,6 +1211,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; LINK_WITH_STANDARD_LIBRARIES = YES; + MARKETING_VERSION = 2.1.0; MODULE_NAME = ExampleApp; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/Example/nRFMeshProvision/Info.plist b/Example/nRFMeshProvision/Info.plist index dacd492d8..1f0cae1c0 100755 --- a/Example/nRFMeshProvision/Info.plist +++ b/Example/nRFMeshProvision/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.0.0 + $(MARKETING_VERSION) CFBundleSignature ???? CFBundleVersion diff --git a/nRFMeshProvision.podspec b/nRFMeshProvision.podspec index 16d8cf487..5f009c9c2 100755 --- a/nRFMeshProvision.podspec +++ b/nRFMeshProvision.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'nRFMeshProvision' - s.version = '2.0.0' + s.version = '2.1.0' 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. @@ -20,7 +20,7 @@ Pod::Spec.new do |s| s.social_media_url = 'https://twitter.com/nordictweets' s.platform = :ios s.static_framework = true - s.swift_version = '5.0' + s.swift_version = '5.1' s.ios.deployment_target = '10.0' s.source_files = 'nRFMeshProvision/Classes/**/*' s.dependency 'OpenSSL-Universal', '= 1.0.2.19'