Skip to content

Commit

Permalink
removed pods. added all dependencies via SPM. fixed build errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Nick Kibysh committed Jul 27, 2021
1 parent c19f797 commit 36c278f
Show file tree
Hide file tree
Showing 18 changed files with 129 additions and 112 deletions.
206 changes: 111 additions & 95 deletions nRF Toolbox.xcodeproj/project.pbxproj
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion nRF Toolbox.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nRF Toolbox/CommonViews/LoggerTableView/LoggerTableView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@


import UIKit
import iOSDFULibrary
import NordicDFU


struct LogMessage {
Expand Down
2 changes: 1 addition & 1 deletion nRF Toolbox/Profiles/DeviceFirmwareUpdate/DFURouter.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@


import UIKit
import iOSDFULibrary
import NordicDFU
import CoreBluetooth

enum PresentationType {
Expand Down
2 changes: 1 addition & 1 deletion nRF Toolbox/Profiles/DeviceFirmwareUpdate/Utils/DFUDocumentPicker.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@


import UIKit
import iOSDFULibrary
import NordicDFU

class DocumentPicker<T>: NSObject, UIDocumentPickerDelegate {
typealias Callback = (Result<T, Error>) -> ()
Expand Down
2 changes: 1 addition & 1 deletion nRF Toolbox/Profiles/DeviceFirmwareUpdate/Utils/LogObserver.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@


import Foundation
import iOSDFULibrary
import NordicDFU

extension Notification.Name {
static let newMessage = Notification.Name("newMessage")
Expand Down
2 changes: 1 addition & 1 deletion ...Toolbox/Profiles/DeviceFirmwareUpdate/ViewConrollers/DFUFileSelector/DFUFileManager.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@


import Foundation
import iOSDFULibrary
import NordicDFU

protocol DFUPacket {
var url: URL { get }
Expand Down
2 changes: 1 addition & 1 deletion ...iles/DeviceFirmwareUpdate/ViewConrollers/DFUFileSelector/FileSelectorViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@


import UIKit
import iOSDFULibrary
import NordicDFU

class FileSelectorViewController<T>: UIViewController, AlertPresenter, UITableViewDataSource, UITableViewDelegate {

Expand Down
2 changes: 1 addition & 1 deletion ...DeviceFirmwareUpdate/ViewConrollers/DFUFirmwareInfo/Cells/DFUFirmwareSizeSchemeCell.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@


import UIKit
import iOSDFULibrary
import NordicDFU

extension DFUFirmwareSize {
var segments: [Segment] {
Expand Down
2 changes: 1 addition & 1 deletion ...s/DeviceFirmwareUpdate/ViewConrollers/DFUFirmwareInfo/DFUFirmwareInfoViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@


import UIKit
import iOSDFULibrary
import NordicDFU

class DFUFirmwareInfoViewController: UITableViewController, AlertPresenter {

Expand Down
2 changes: 1 addition & 1 deletion ...DeviceFirmwareUpdate/ViewConrollers/DFUFirmwareInfo/Sections/DFUFirmwareSizeSection.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@


import UIKit
import iOSDFULibrary
import NordicDFU

class DFUFirmwareSizeSection: DFUActionSection {

Expand Down
2 changes: 1 addition & 1 deletion ...rofiles/DeviceFirmwareUpdate/ViewConrollers/DFUUpdate/DFUUpdateTabBarViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@


import UIKit
import iOSDFULibrary
import NordicDFU

protocol DFUUpdateRouter: AnyObject {
func showLogs()
Expand Down
2 changes: 1 addition & 1 deletion ...lbox/Profiles/DeviceFirmwareUpdate/ViewConrollers/DFUUpdate/DFUUpdateViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@


import UIKit
import iOSDFULibrary
import NordicDFU

protocol UpgradeManager {
func stop()
Expand Down
2 changes: 1 addition & 1 deletion ...Toolbox/Profiles/DeviceFirmwareUpdate/ViewConrollers/DFUUpdate/Util/LogObserver+DFU.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@


import Foundation
import iOSDFULibrary
import NordicDFU


class DFULogObserver: LogObserver, LoggerDelegate {
Expand Down
4 changes: 2 additions & 2 deletions nRF Toolbox/Profiles/HeartRateMonitor/Sections/Cells/LinearChartTableViewCell.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import UIKit
import Charts

extension DateFormatter: IAxisValueFormatter {
extension DateFormatter: AxisValueFormatter {
public func stringForValue(_ value: Double,
axis: AxisBase?) -> String {
let date = Date(timeIntervalSince1970: value)
Expand Down Expand Up @@ -131,7 +131,7 @@ class LinearChartTableViewCell: UITableViewCell {
chartsView.xAxis.axisMaximum = xMax
chartsView.xAxis.axisMinimum = first

let set = LineChartDataSet(entries: chartValues, label: nil)
let set = LineChartDataSet(entries: chartValues, label: "")
set.drawCirclesEnabled = false
set.drawValuesEnabled = false

Expand Down
1 change: 1 addition & 0 deletions nRF Toolbox/Profiles/UART/Model/UARTCommandModel.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@


import Foundation
import UIKit.UIImage
import AEXML

protocol UARTCommandModel: Codable, XMLRepresentable, UARTMacroElement, NordicTextTableViewCellModel {
Expand Down
2 changes: 1 addition & 1 deletion ...ViewController/NotConnectedViewController/UpdateScreen/ZephyrDFUTableViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

import UIKit
import McuManager
import iOSDFULibrary
import NordicDFU

extension FirmwareUpgradeManager: UpgradeManager {
func stop() {
Expand Down
2 changes: 1 addition & 1 deletion nRF Toolbox/Utilities/Extensions/DFU.LogLevel+Ext.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@



import iOSDFULibrary
import NordicDFU

extension LogLevel {
var level: LogType {
Expand Down

0 comments on commit 36c278f

Please sign in to comment.