Skip to content

Commit

Permalink
Merge pull request #3 from DrAma999/develop
Browse files Browse the repository at this point in the history
Updated to 0.3.0
  • Loading branch information
DrAma999 authored Aug 3, 2020
2 parents 3b1c4f1 + e7abe86 commit b0b61f8
Show file tree
Hide file tree
Showing 28 changed files with 615 additions and 339 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/swift.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Build
run: swift build
run: swift build -v
- name: Run tests
run: swift test -v

3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,5 @@ Carthage/Build
fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
fastlane/test_output
Package.resolved
26 changes: 26 additions & 0 deletions LittleBlueTooth copy-Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
298 changes: 253 additions & 45 deletions LittleBlueTooth.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"package": "CoreBluetoothMock",
"repositoryURL": "https://github.com/enricodk/IOS-CoreBluetooth-Mock.git",
"state": {
"branch": "multiplatform",
"revision": "725088fb62c17aa8db3d45d1081cd1ff7f757564",
"version": null
"branch": null,
"revision": "835c9785d41b824218f86c78154a61a3b3abb297",
"version": "0.8.0"
}
}
]
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug Test"
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
Expand All @@ -41,16 +41,6 @@
</EnvironmentVariable>
</EnvironmentVariables>
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "LittleBlueTooth::LittleBlueToothTests"
BuildableName = "LittleBlueToothTests.xctest"
BlueprintName = "LittleBlueToothTests"
ReferencedContainer = "container:LittleBlueTooth.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<dict>
<key>SchemeUserState</key>
<dict>
<key>LittleBlueTooth-Package.xcscheme_^#shared#^_</key>
<key>LittleBlueTooth-Package.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>2</integer>
Expand All @@ -14,6 +14,11 @@
<key>orderHint</key>
<integer>0</integer>
</dict>
<key>LittleBlueToothForTest.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>3</integer>
</dict>
<key>LittleBlueToothPackageDescription.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
Expand All @@ -32,6 +37,11 @@
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>65AD4BD024D437B700C0CBE6</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>E12C12E82490B60D00496496</key>
<dict>
<key>primary</key>
Expand Down
18 changes: 13 additions & 5 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,30 @@ let package = Package(
// Products define the executables and libraries produced by a package, and make them visible to other packages.
.library(
name: "LittleBlueTooth",
targets: ["LittleBlueTooth"])
targets: ["LittleBlueTooth"]),
.library(
name: "LittleBlueToothForTest",
targets: ["LittleBlueToothForTest"])
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(name: "CoreBluetoothMock",
url: "https://github.com/enricodk/IOS-CoreBluetooth-Mock.git",
.branch("multiplatform")),
.package(name: "CoreBluetoothMock",
url: "https://github.com/NordicSemiconductor/IOS-CoreBluetooth-Mock.git",
.upToNextMinor(from: "0.9.0")),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
// Targets can depend on other targets in this package, and on products in packages which this package depends on.
.target(
name: "LittleBlueTooth",
dependencies: []),
.target(
name: "LittleBlueToothForTest",
dependencies: ["CoreBluetoothMock"],
swiftSettings: [.define("TEST")]
),
.testTarget(
name: "LittleBlueToothTests",
dependencies: ["LittleBlueTooth","CoreBluetoothMock"])
dependencies: ["LittleBlueToothForTest","CoreBluetoothMock"])
]
)
Loading

0 comments on commit b0b61f8

Please sign in to comment.