Skip to content

Commit

Permalink
Merge pull request #13 from XYOracleNetwork/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
carterharrison authored Oct 28, 2019
2 parents 6611dcf + 3f5669a commit d0c6e2f
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 13 deletions.
4 changes: 2 additions & 2 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ platform :ios, '11.0'
use_frameworks!

target 'sdk-xyobleinterface-swift' do
pod 'XyBleSdk', '~> 3.0.1'
pod 'sdk-objectmodel-swift', '~> 3.0'
pod 'XyBleSdk', '~> 3.0.7'
pod 'sdk-objectmodel-swift', '~> 3.0.2'
pod 'sdk-core-swift', '~> 3.0.1'
end

Expand Down
14 changes: 7 additions & 7 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ PODS:
- sdk-core-swift (3.0.1):
- sdk-objectmodel-swift (~> 3.0)
- secp256k1.swift
- sdk-objectmodel-swift (3.0.1)
- sdk-objectmodel-swift (3.0.2)
- secp256k1.swift (0.1.4)
- XyBleSdk (3.0.6):
- XyBleSdk (3.0.7):
- PromisesSwift

DEPENDENCIES:
- sdk-core-swift (~> 3.0.1)
- sdk-objectmodel-swift (~> 3.0)
- XyBleSdk (~> 3.0.1)
- sdk-objectmodel-swift (~> 3.0.2)
- XyBleSdk (~> 3.0.7)

SPEC REPOS:
https://github.com/CocoaPods/Specs.git:
Expand All @@ -28,10 +28,10 @@ SPEC CHECKSUMS:
PromisesObjC: c119f3cd559f50b7ae681fa59dc1acd19173b7e6
PromisesSwift: 37bad6f4daddb02f7c9c531efe91e8b21c13ee2f
sdk-core-swift: 6b089045fe8483388bd3c82d2d1375d796c29745
sdk-objectmodel-swift: ef0331719d7fb2249a883928286c4746dbcf9067
sdk-objectmodel-swift: 8d880c7871ab0ce16fed958d782c737fd495dd53
secp256k1.swift: a7e7a214f6db6ce5db32cc6b2b45e5c4dd633634
XyBleSdk: 4dc44b737643a564cd77610c96725d0532e07616
XyBleSdk: 8d63d5cba164fa7d05d662fca0231f065fddccbe

PODFILE CHECKSUM: acf5f0bb1995f517bcfb594d0d9cd8b66fa57570
PODFILE CHECKSUM: e4c0067ce6f987340831b6f47f607cb6ab2933d6

COCOAPODS: 1.8.4
4 changes: 2 additions & 2 deletions sdk-xyobleinterface-swift.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

Pod::Spec.new do |s|
s.name = 'sdk-xyobleinterface-swift'
s.version = '3.0.7'
s.version = '3.0.8'
s.summary = 'A short description of sdk-xyobleinterface-swift'
s.swift_version = '5.0'
# This description is used to generate tags and improve search results.
Expand All @@ -35,6 +35,6 @@ XYO Ble Interface

s.dependency 'sdk-objectmodel-swift', '~> 3.0'
s.dependency 'sdk-core-swift', '~> 3.0.1'
s.dependency 'XyBleSdk', '~> 3.0.6'
s.dependency 'XyBleSdk', '~> 3.0.7'

end
4 changes: 2 additions & 2 deletions sdk-xyobleinterface-swift.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -497,7 +497,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
Expand Down
1 change: 1 addition & 0 deletions sdk-xyobleinterface-swift/XyoBluetoothServer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ public struct XyoBluetoothServer {

/// Turns off the server and advertising
public func stop () {
service.removeCharacteristics()
server.stopAdvetrtising()
server.turnOff()
}
Expand Down

0 comments on commit d0c6e2f

Please sign in to comment.