From fd486453e744f3a6e05760716397b14de2b77bed Mon Sep 17 00:00:00 2001 From: Carter Harrison Date: Wed, 3 Apr 2019 15:39:26 -0700 Subject: [PATCH 01/17] update version --- Podfile | 2 +- Podfile.lock | 19 ++++++++----------- SampleiOS/Podfile | 2 +- SampleiOS/Podfile.lock | 15 +++++++-------- sdk-xyobleinterface-swift.podspec | 2 +- 5 files changed, 18 insertions(+), 22 deletions(-) diff --git a/Podfile b/Podfile index 841957e..e74bdd4 100644 --- a/Podfile +++ b/Podfile @@ -3,7 +3,7 @@ platform :ios, '11.0' use_frameworks! target 'sdk-xyobleinterface-swift' do - pod 'XyBleSdk', :path => '../sdk-ble-swift/' + pod 'XyBleSdk', '~> 0.0.1' pod 'sdk-objectmodel-swift', '~> 0.1.2-beta.3' pod 'sdk-core-swift', '~> 0.1.4-beta.6' end diff --git a/Podfile.lock b/Podfile.lock index 0d3c630..de84c99 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,7 +1,7 @@ PODS: - - PromisesObjC (1.2.6) - - PromisesSwift (1.2.6): - - PromisesObjC (= 1.2.6) + - PromisesObjC (1.2.7) + - PromisesSwift (1.2.7): + - PromisesObjC (= 1.2.7) - sdk-core-swift (0.1.5-beta.2): - sdk-objectmodel-swift (~> 0.1.2-beta.3) - secp256k1.swift @@ -13,7 +13,7 @@ PODS: DEPENDENCIES: - sdk-core-swift (~> 0.1.4-beta.6) - sdk-objectmodel-swift (~> 0.1.2-beta.3) - - XyBleSdk (from `../sdk-ble-swift/`) + - XyBleSdk (~> 0.0.1) SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -22,19 +22,16 @@ SPEC REPOS: - sdk-core-swift - sdk-objectmodel-swift - secp256k1.swift - -EXTERNAL SOURCES: - XyBleSdk: - :path: "../sdk-ble-swift/" + - XyBleSdk SPEC CHECKSUMS: - PromisesObjC: 60326422b6d692b9718a80666e67a9433862aa88 - PromisesSwift: b3219d5e6545d5d7e8ad8038b4ad139f7ee0b3f0 + PromisesObjC: 7b28ddd1e78cce8f80f1ada927d2217663a9c672 + PromisesSwift: b27f410f9ea693753cfd4cfd8ac1c60a471f137b sdk-core-swift: 8d254021959a3edaff4441ff389c05dfee55c7b8 sdk-objectmodel-swift: 93b02d39d406c39e45ad15a2d5b488c9f8e16b58 secp256k1.swift: a7e7a214f6db6ce5db32cc6b2b45e5c4dd633634 XyBleSdk: 412c59d8b05e92a4c2341bcf11909861a12ddbba -PODFILE CHECKSUM: e6fd2fb75d0edfb5aacdae3cfea75d03f46324ee +PODFILE CHECKSUM: f6bf85fc4ccb3188934cdd22191d0f26e7e3d211 COCOAPODS: 1.7.0.beta.2 diff --git a/SampleiOS/Podfile b/SampleiOS/Podfile index b78cf72..f5f7612 100644 --- a/SampleiOS/Podfile +++ b/SampleiOS/Podfile @@ -5,7 +5,7 @@ use_frameworks! target 'SampleiOS' do pod 'sdk-objectmodel-swift', '~> 0.1.2-beta.3' pod 'sdk-core-swift', '~> 0.1.5-beta.2' - pod 'XyBleSdk', :path => '/Users/carterharrison/Documents/github/xyo/sdk-ble-swift/' + pod 'XyBleSdk', '~> 0.0.1' pod 'sdk-xyobleinterface-swift', :path => '../' end diff --git a/SampleiOS/Podfile.lock b/SampleiOS/Podfile.lock index 4784eaa..737d5a8 100644 --- a/SampleiOS/Podfile.lock +++ b/SampleiOS/Podfile.lock @@ -6,13 +6,13 @@ PODS: - sdk-objectmodel-swift (~> 0.1.2-beta.3) - secp256k1.swift - sdk-objectmodel-swift (0.1.2-beta.3) - - sdk-xyobleinterface-swift (0.1.3-beta.0): + - sdk-xyobleinterface-swift (0.1.4-beta.1): - PromisesSwift (~> 1.2.4) - sdk-core-swift (~> 0.1.5-beta.2) - sdk-objectmodel-swift (~> 0.1.2-beta.3) - - sdk-xyobleinterface-swift/XyBleSdk (= 0.1.3-beta.0) + - sdk-xyobleinterface-swift/XyBleSdk (= 0.1.4-beta.1) - XyBleSdk - - sdk-xyobleinterface-swift/XyBleSdk (0.1.3-beta.0): + - sdk-xyobleinterface-swift/XyBleSdk (0.1.4-beta.1): - PromisesSwift (~> 1.2.4) - sdk-core-swift (~> 0.1.5-beta.2) - sdk-objectmodel-swift (~> 0.1.2-beta.3) @@ -25,7 +25,7 @@ DEPENDENCIES: - sdk-core-swift (~> 0.1.5-beta.2) - sdk-objectmodel-swift (~> 0.1.2-beta.3) - sdk-xyobleinterface-swift (from `../`) - - XyBleSdk (from `/Users/carterharrison/Documents/github/xyo/sdk-ble-swift/`) + - XyBleSdk (~> 0.0.1) SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -34,22 +34,21 @@ SPEC REPOS: - sdk-core-swift - sdk-objectmodel-swift - secp256k1.swift + - XyBleSdk EXTERNAL SOURCES: sdk-xyobleinterface-swift: :path: "../" - XyBleSdk: - :path: "/Users/carterharrison/Documents/github/xyo/sdk-ble-swift/" SPEC CHECKSUMS: PromisesObjC: 60326422b6d692b9718a80666e67a9433862aa88 PromisesSwift: b3219d5e6545d5d7e8ad8038b4ad139f7ee0b3f0 sdk-core-swift: 8d254021959a3edaff4441ff389c05dfee55c7b8 sdk-objectmodel-swift: 93b02d39d406c39e45ad15a2d5b488c9f8e16b58 - sdk-xyobleinterface-swift: a0f3dc4a7f6f9c6bf5a17343200d5d8739302a1a + sdk-xyobleinterface-swift: 877262720b361078a62c9fed93686d2d7098f0e8 secp256k1.swift: a7e7a214f6db6ce5db32cc6b2b45e5c4dd633634 XyBleSdk: 412c59d8b05e92a4c2341bcf11909861a12ddbba -PODFILE CHECKSUM: 00ba41a87d9c68caa536af37a64b7e3219da20d2 +PODFILE CHECKSUM: fd7c808dfc102fe18b302f1d9dffb7c2c35a2c08 COCOAPODS: 1.7.0.beta.2 diff --git a/sdk-xyobleinterface-swift.podspec b/sdk-xyobleinterface-swift.podspec index d9b36f5..a488a74 100644 --- a/sdk-xyobleinterface-swift.podspec +++ b/sdk-xyobleinterface-swift.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'sdk-xyobleinterface-swift' - s.version = '0.1.4-beta.1' + s.version = '0.1.4-beta.2' s.summary = 'A short description of sdk-xyobleinterface-swift' # This description is used to generate tags and improve search results. From 02bc7f68f481fc9da75a6ef406fcf489a77f4faf Mon Sep 17 00:00:00 2001 From: Carter Harrison Date: Wed, 3 Apr 2019 15:42:06 -0700 Subject: [PATCH 02/17] update podspec repo --- sdk-xyobleinterface-swift.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk-xyobleinterface-swift.podspec b/sdk-xyobleinterface-swift.podspec index a488a74..3dbd593 100644 --- a/sdk-xyobleinterface-swift.podspec +++ b/sdk-xyobleinterface-swift.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'sdk-xyobleinterface-swift' - s.version = '0.1.4-beta.2' + s.version = '0.1.4-beta.3' s.summary = 'A short description of sdk-xyobleinterface-swift' # This description is used to generate tags and improve search results. @@ -25,7 +25,7 @@ TODO: Add long description of the pod here. # s.screenshots = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2' s.license = { :type => 'MIT', :file => 'LICENSE.txt' } s.author = { 'Carter Harrison' => 'carterjharrison@gmail.com' } - s.source = { :git => 'https://github.com/XYOracleNetwork/sdk-xyobleinterface-swiftt', :tag => s.version.to_s } + s.source = { :git => 'https://github.com/XYOracleNetwork/sdk-xyobleinterface-swift', :tag => s.version.to_s } # s.social_media_url = 'https://twitter.com/' s.ios.deployment_target = '11.0' From 18822811c4fed539d688c6581bfd7955d988c15c Mon Sep 17 00:00:00 2001 From: Carter Harrison Date: Wed, 3 Apr 2019 15:45:27 -0700 Subject: [PATCH 03/17] update podspec for ble sdk --- sdk-xyobleinterface-swift.podspec | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/sdk-xyobleinterface-swift.podspec b/sdk-xyobleinterface-swift.podspec index 3dbd593..5bd588c 100644 --- a/sdk-xyobleinterface-swift.podspec +++ b/sdk-xyobleinterface-swift.podspec @@ -8,45 +8,28 @@ Pod::Spec.new do |s| s.name = 'sdk-xyobleinterface-swift' - s.version = '0.1.4-beta.3' + s.version = '0.1.4-beta.4' s.summary = 'A short description of sdk-xyobleinterface-swift' -# This description is used to generate tags and improve search results. -# * Think: What does it do? Why did you write it? What is the focus? -# * Try to keep it short, snappy and to the point. -# * Write the description between the DESC delimiters below. -# * Finally, don't worry about the indent, CocoaPods strips it! s.description = <<-DESC TODO: Add long description of the pod here. DESC s.homepage = 'https://github.com/XYOracleNetwork/sdk-xyobleinterface-swift' - # s.screenshots = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2' s.license = { :type => 'MIT', :file => 'LICENSE.txt' } s.author = { 'Carter Harrison' => 'carterjharrison@gmail.com' } s.source = { :git => 'https://github.com/XYOracleNetwork/sdk-xyobleinterface-swift', :tag => s.version.to_s } - # s.social_media_url = 'https://twitter.com/' s.ios.deployment_target = '11.0' s.source_files = 'sdk-xyobleinterface-swift/**/*.{swift}' - # s.resource_bundles = { - # 'sdk-objectmodel-swift' => ['sdk-objectmodel-swift/Assets/*.png'] - # } - - # s.public_header_files = 'Pod/Classes/**/*.h' - # s.frameworks = 'UIKit', 'MapKit' s.dependency 'PromisesSwift', '~> 1.2.4' s.dependency 'sdk-objectmodel-swift', '~> 0.1.2-beta.3' s.dependency 'sdk-core-swift', '~> 0.1.5-beta.2' - s.dependency 'XyBleSdk' - - s.subspec 'XyBleSdk' do |ss| - ss.source_files = '../../sdk-ble-swift/Source/**/*.{swift}' - end + s.dependency 'XyBleSdk', '~> 0.0.1' end From 92c517cd1631357e628b11593c6c5f0e177ef614 Mon Sep 17 00:00:00 2001 From: Carter Harrison Date: Fri, 5 Apr 2019 08:56:29 -0700 Subject: [PATCH 04/17] change min iOS version from 12 to 11 --- SampleiOS/Project/Project_base.xcconfig | 43 +++++++++++++++++++ SampleiOS/Project/Project_debug.xcconfig | 10 +++++ SampleiOS/Project/Project_release.xcconfig | 7 +++ SampleiOS/SampleiOS.xcodeproj/project.pbxproj | 2 +- .../SampleiOS/Base.lproj/Main.storyboard | 26 ++++++----- SampleiOS/SampleiOS/SampleiOS_base.xcconfig | 10 +++++ SampleiOS/SampleiOS/SampleiOS_debug.xcconfig | 1 + .../SampleiOS/SampleiOS_release.xcconfig | 1 + 8 files changed, 88 insertions(+), 12 deletions(-) create mode 100644 SampleiOS/Project/Project_base.xcconfig create mode 100644 SampleiOS/Project/Project_debug.xcconfig create mode 100644 SampleiOS/Project/Project_release.xcconfig create mode 100644 SampleiOS/SampleiOS/SampleiOS_base.xcconfig create mode 100644 SampleiOS/SampleiOS/SampleiOS_debug.xcconfig create mode 100644 SampleiOS/SampleiOS/SampleiOS_release.xcconfig diff --git a/SampleiOS/Project/Project_base.xcconfig b/SampleiOS/Project/Project_base.xcconfig new file mode 100644 index 0000000..7d25638 --- /dev/null +++ b/SampleiOS/Project/Project_base.xcconfig @@ -0,0 +1,43 @@ +ALWAYS_SEARCH_USER_PATHS = NO +CLANG_ANALYZER_NONNULL = YES +CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE +CLANG_CXX_LANGUAGE_STANDARD = gnu++14 +CLANG_CXX_LIBRARY = libc++ +CLANG_ENABLE_MODULES = YES +CLANG_ENABLE_OBJC_ARC = YES +CLANG_ENABLE_OBJC_WEAK = YES +CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES +CLANG_WARN_BOOL_CONVERSION = YES +CLANG_WARN_COMMA = YES +CLANG_WARN_CONSTANT_CONVERSION = YES +CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES +CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR +CLANG_WARN_DOCUMENTATION_COMMENTS = YES +CLANG_WARN_EMPTY_BODY = YES +CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES +CLANG_WARN_INT_CONVERSION = YES +CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +CLANG_WARN_OBJC_LITERAL_CONVERSION = YES +CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR +CLANG_WARN_RANGE_LOOP_ANALYSIS = YES +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_SUSPICIOUS_MOVE = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +CLANG_WARN_UNREACHABLE_CODE = YES +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CODE_SIGN_IDENTITY = iPhone Developer +COPY_PHASE_STRIP = NO +ENABLE_STRICT_OBJC_MSGSEND = YES +GCC_C_LANGUAGE_STANDARD = gnu11 +GCC_NO_COMMON_BLOCKS = YES +GCC_WARN_64_TO_32_BIT_CONVERSION = YES +GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR +GCC_WARN_UNDECLARED_SELECTOR = YES +GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE +GCC_WARN_UNUSED_FUNCTION = YES +GCC_WARN_UNUSED_VARIABLE = YES +IPHONEOS_DEPLOYMENT_TARGET = 12.1 +MTL_FAST_MATH = YES +SDKROOT = iphoneos diff --git a/SampleiOS/Project/Project_debug.xcconfig b/SampleiOS/Project/Project_debug.xcconfig new file mode 100644 index 0000000..9fc7372 --- /dev/null +++ b/SampleiOS/Project/Project_debug.xcconfig @@ -0,0 +1,10 @@ +#include "Project/Project_base.xcconfig" +DEBUG_INFORMATION_FORMAT = dwarf +ENABLE_TESTABILITY = YES +GCC_DYNAMIC_NO_PIC = NO +GCC_OPTIMIZATION_LEVEL = 0 +GCC_PREPROCESSOR_DEFINITIONS = ["DEBUG=1", "$(inherited)"] +MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE +ONLY_ACTIVE_ARCH = YES +SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG +SWIFT_OPTIMIZATION_LEVEL = -Onone diff --git a/SampleiOS/Project/Project_release.xcconfig b/SampleiOS/Project/Project_release.xcconfig new file mode 100644 index 0000000..7fe50ec --- /dev/null +++ b/SampleiOS/Project/Project_release.xcconfig @@ -0,0 +1,7 @@ +#include "Project/Project_base.xcconfig" +DEBUG_INFORMATION_FORMAT = dwarf-with-dsym +ENABLE_NS_ASSERTIONS = NO +MTL_ENABLE_DEBUG_INFO = NO +SWIFT_COMPILATION_MODE = wholemodule +SWIFT_OPTIMIZATION_LEVEL = -O +VALIDATE_PRODUCT = YES diff --git a/SampleiOS/SampleiOS.xcodeproj/project.pbxproj b/SampleiOS/SampleiOS.xcodeproj/project.pbxproj index 9a85e35..4b3fbd3 100644 --- a/SampleiOS/SampleiOS.xcodeproj/project.pbxproj +++ b/SampleiOS/SampleiOS.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 51; objects = { /* Begin PBXBuildFile section */ diff --git a/SampleiOS/SampleiOS/Base.lproj/Main.storyboard b/SampleiOS/SampleiOS/Base.lproj/Main.storyboard index 763b76c..28ac3ed 100644 --- a/SampleiOS/SampleiOS/Base.lproj/Main.storyboard +++ b/SampleiOS/SampleiOS/Base.lproj/Main.storyboard @@ -1,6 +1,10 @@ + + + + @@ -9,21 +13,21 @@ - + - + - - + + - +