From 6bbc254daa7d352c858754b9a6568680b8ac7b7f Mon Sep 17 00:00:00 2001 From: Jonas Vautherin Date: Fri, 1 Feb 2019 19:02:13 +0100 Subject: [PATCH] Move to xcodegen --- .gitignore | 1 + Cartfile | 4 +- Cartfile.resolved | 6 +- .../project.pbxproj | 688 ------------------ DronecodeSDKSwiftDemo/Info.plist | 47 -- .../DronecodeSDKSwiftDemoTests.swift | 36 - DronecodeSDKSwiftDemoTests/Info.plist | 22 - .../DronecodeSDKSwiftDemo}/AppDelegate.swift | 2 +- .../AppIcon.appiconset/Contents.json | 0 .../AppIcon.appiconset/logo-1024.jpeg | Bin .../AppIcon.appiconset/logo-120.jpg | Bin .../AppIcon.appiconset/logo-167.jpg | Bin .../AppIcon.appiconset/logo-76.jpg | Bin .../Assets.xcassets/Contents.json | 0 .../annotation-drone.imageset/Contents.json | 0 .../annotation-drone.imageset/drone (1).png | Bin .../annotation-drone.imageset/drone (2).png | Bin .../annotation-drone.imageset/drone.png | Bin .../Contents.json | 0 .../icon-action-remote.png | Bin .../icon-tab-camera.imageset/Contents.json | 0 .../icon-tab-camera.png | Bin .../icon-tab-drone.imageset/Contents.json | 0 .../icon-tab-drone.imageset/drone.png | Bin .../Contents.json | 0 .../placeholder-location.png | Bin .../Contents.json | 0 .../logo-DroneCore-thumb.png | Bin .../logo-DroneCore.imageset/Contents.json | 0 .../DroneCore_Logo.png | Bin .../pin-image.imageset/Contents.json | 0 .../pin-image.imageset/pin-x1.png | Bin .../pin-image.imageset/pin-x2.png | Bin .../pin-image.imageset/pin.png | Bin .../Base.lproj/LaunchScreen.storyboard | 0 .../Base.lproj/Main.storyboard | 0 .../Controllers/ActionsViewController.swift | 0 .../CameraActionViewController.swift | 24 +- .../Controllers/CameraViewController.swift | 2 + .../Controllers/MapViewController.swift | 9 +- .../Controllers/Mapkit/Drone/DroneView.swift | 0 .../Mapkit/Pins/CustomPinAnnotationView.swift | 0 .../Mapkit/Pins/NamedAnnotation.swift | 0 .../Controllers/TelemetryViewController.swift | 0 .../DronecodeSDKSwiftDemo-Bridging-Header.h | 0 .../Manager/CoreManager.swift | 0 .../MobileVLCKit/empty.cpp | 0 .../MobileVLCKit/empty.hpp | 0 .../Models/ExampleMission.swift | 0 project.yml | 41 ++ 50 files changed, 62 insertions(+), 820 deletions(-) delete mode 100644 DronecodeSDKSwiftDemo.xcodeproj/project.pbxproj delete mode 100644 DronecodeSDKSwiftDemo/Info.plist delete mode 100644 DronecodeSDKSwiftDemoTests/DronecodeSDKSwiftDemoTests.swift delete mode 100644 DronecodeSDKSwiftDemoTests/Info.plist rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/AppDelegate.swift (95%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Assets.xcassets/AppIcon.appiconset/logo-1024.jpeg (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Assets.xcassets/AppIcon.appiconset/logo-120.jpg (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Assets.xcassets/AppIcon.appiconset/logo-167.jpg (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Assets.xcassets/AppIcon.appiconset/logo-76.jpg (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Assets.xcassets/Contents.json (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Assets.xcassets/annotation-drone.imageset/Contents.json (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Assets.xcassets/annotation-drone.imageset/drone (1).png (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Assets.xcassets/annotation-drone.imageset/drone (2).png (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Assets.xcassets/annotation-drone.imageset/drone.png (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Assets.xcassets/icon-tab-action-remote.imageset/Contents.json (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Assets.xcassets/icon-tab-action-remote.imageset/icon-action-remote.png (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Assets.xcassets/icon-tab-camera.imageset/Contents.json (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Assets.xcassets/icon-tab-camera.imageset/icon-tab-camera.png (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Assets.xcassets/icon-tab-drone.imageset/Contents.json (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Assets.xcassets/icon-tab-drone.imageset/drone.png (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Assets.xcassets/icon-tab-placeholder-location.imageset/Contents.json (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Assets.xcassets/icon-tab-placeholder-location.imageset/placeholder-location.png (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Assets.xcassets/logo-DroneCore-thumb.imageset/Contents.json (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Assets.xcassets/logo-DroneCore-thumb.imageset/logo-DroneCore-thumb.png (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Assets.xcassets/logo-DroneCore.imageset/Contents.json (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Assets.xcassets/logo-DroneCore.imageset/DroneCore_Logo.png (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Assets.xcassets/pin-image.imageset/Contents.json (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Assets.xcassets/pin-image.imageset/pin-x1.png (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Assets.xcassets/pin-image.imageset/pin-x2.png (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Assets.xcassets/pin-image.imageset/pin.png (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Base.lproj/LaunchScreen.storyboard (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Base.lproj/Main.storyboard (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Controllers/ActionsViewController.swift (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Controllers/CameraActionViewController.swift (82%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Controllers/CameraViewController.swift (98%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Controllers/MapViewController.swift (97%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Controllers/Mapkit/Drone/DroneView.swift (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Controllers/Mapkit/Pins/CustomPinAnnotationView.swift (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Controllers/Mapkit/Pins/NamedAnnotation.swift (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Controllers/TelemetryViewController.swift (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/DronecodeSDKSwiftDemo-Bridging-Header.h (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Manager/CoreManager.swift (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/MobileVLCKit/empty.cpp (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/MobileVLCKit/empty.hpp (100%) rename {DronecodeSDKSwiftDemo => Sources/DronecodeSDKSwiftDemo}/Models/ExampleMission.swift (100%) create mode 100644 project.yml diff --git a/.gitignore b/.gitignore index 80bdb67..88b23a4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ build !*.xcodeproj/project.pbxproj !*.xcworkspace/contents.xcworkspacedata *.xcworkspace +Info.plist ### Various settings ### *.pbxuser diff --git a/Cartfile b/Cartfile index c4fbe01..ba4ad95 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -github "Dronecode/DronecodeSDK-Swift" "0.1.6" -binary "https://code.videolan.org/videolan/VLCKit/raw/master/Packaging/MobileVLCKit.json" == 3.1.1 +github "Dronecode/DronecodeSDK-Swift" "0.2.1" +binary "https://code.videolan.org/videolan/VLCKit/raw/master/Packaging/MobileVLCKit.json" == 3.1.4 diff --git a/Cartfile.resolved b/Cartfile.resolved index 9ed63ba..572aa28 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,5 +1,5 @@ -binary "https://code.videolan.org/videolan/VLCKit/raw/master/Packaging/MobileVLCKit.json" "3.1.1" -binary "https://s3.eu-central-1.amazonaws.com/dronecode-sdk/backend.json" "0.7.3" -github "Dronecode/DronecodeSDK-Swift" "0.1.6" +binary "https://code.videolan.org/videolan/VLCKit/raw/master/Packaging/MobileVLCKit.json" "3.1.4" +binary "https://s3.eu-central-1.amazonaws.com/dronecode-sdk/backend.json" "0.10.1" +github "Dronecode/DronecodeSDK-Swift" "0.2.1" github "ReactiveX/RxSwift" "4.4.0" github "grpc/grpc-swift" "23a0ebdee9613f615f2f2469ed3e700df5856417" diff --git a/DronecodeSDKSwiftDemo.xcodeproj/project.pbxproj b/DronecodeSDKSwiftDemo.xcodeproj/project.pbxproj deleted file mode 100644 index 298ad6a..0000000 --- a/DronecodeSDKSwiftDemo.xcodeproj/project.pbxproj +++ /dev/null @@ -1,688 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 48; - objects = { - -/* Begin PBXBuildFile section */ - 2C0648C72091DC06002BD970 /* ExampleMission.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C0648C62091DC06002BD970 /* ExampleMission.swift */; }; - 2C365EC1207610C500F42184 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C365EC0207610C500F42184 /* AppDelegate.swift */; }; - 2C365EC3207610C500F42184 /* TelemetryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C365EC2207610C500F42184 /* TelemetryViewController.swift */; }; - 2C365ECB207610C500F42184 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2C365EC9207610C500F42184 /* Main.storyboard */; }; - 2C365ED6207610C500F42184 /* DronecodeSDKSwiftDemoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C365ED5207610C500F42184 /* DronecodeSDKSwiftDemoTests.swift */; }; - 2C365EE320761F3000F42184 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2C365EE120761F3000F42184 /* LaunchScreen.storyboard */; }; - 2C365EE52076247100F42184 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2C365EE42076247000F42184 /* Assets.xcassets */; }; - 2CA1F0CE20CE618700C913D6 /* CustomPinAnnotationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CA1F0CC20CE618700C913D6 /* CustomPinAnnotationView.swift */; }; - 2CA1F0CF20CE618700C913D6 /* NamedAnnotation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CA1F0CD20CE618700C913D6 /* NamedAnnotation.swift */; }; - 2CA1F0D520CE625D00C913D6 /* DroneView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CA1F0D320CE625D00C913D6 /* DroneView.swift */; }; - 2CCEB7992089F2510086AA37 /* CoreManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CCEB7982089F2510086AA37 /* CoreManager.swift */; }; - 2CDBF021207652340064C8A5 /* MapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CDBF020207652340064C8A5 /* MapViewController.swift */; }; - 2CE6B6D120AED1CA0086958C /* empty.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2CE6B6CF20AED1C90086958C /* empty.cpp */; }; - 2CE6B6D420AEECE10086958C /* CameraViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE6B6D320AEECE10086958C /* CameraViewController.swift */; }; - 2CFF7271207750AF0060D31B /* ActionsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CFF7270207750AF0060D31B /* ActionsViewController.swift */; }; - DF0AF2B1212B7F4700B15E67 /* MobileVLCKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF0AF2B0212B7F4700B15E67 /* MobileVLCKit.framework */; }; - DF0AF2B3212B7F5900B15E67 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF0AF2B2212B7F5900B15E67 /* AVFoundation.framework */; }; - DF0AF2B5212B7F6300B15E67 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF0AF2B4212B7F6200B15E67 /* AudioToolbox.framework */; }; - DF0AF2B7212B7F6B00B15E67 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF0AF2B6212B7F6B00B15E67 /* CoreMedia.framework */; }; - DF0AF2B9212B7F7600B15E67 /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = DF0AF2B8212B7F7600B15E67 /* libiconv.tbd */; }; - DF0AF2BB212B7F8100B15E67 /* libbz2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = DF0AF2BA212B7F8100B15E67 /* libbz2.tbd */; }; - DF0AF2BD212B7F8A00B15E67 /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF0AF2BC212B7F8A00B15E67 /* VideoToolbox.framework */; }; - DF0AF2BF212B7FD500B15E67 /* Dronecode_SDK_Swift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF0AF2BE212B7FD500B15E67 /* Dronecode_SDK_Swift.framework */; }; - DF0AF2C0212B7FD500B15E67 /* Dronecode_SDK_Swift.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DF0AF2BE212B7FD500B15E67 /* Dronecode_SDK_Swift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - DF0AF2CA212B801D00B15E67 /* backend.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF0AF2C2212B801C00B15E67 /* backend.framework */; }; - DF0AF2CB212B801D00B15E67 /* backend.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DF0AF2C2212B801C00B15E67 /* backend.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - DF0AF2CC212B801D00B15E67 /* SwiftGRPC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF0AF2C3212B801D00B15E67 /* SwiftGRPC.framework */; }; - DF0AF2CD212B801D00B15E67 /* SwiftGRPC.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DF0AF2C3212B801D00B15E67 /* SwiftGRPC.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - DF0AF2CE212B801D00B15E67 /* CgRPC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF0AF2C4212B801D00B15E67 /* CgRPC.framework */; }; - DF0AF2CF212B801D00B15E67 /* CgRPC.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DF0AF2C4212B801D00B15E67 /* CgRPC.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - DF0AF2D0212B801D00B15E67 /* RxBlocking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF0AF2C5212B801D00B15E67 /* RxBlocking.framework */; }; - DF0AF2D1212B801D00B15E67 /* RxBlocking.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DF0AF2C5212B801D00B15E67 /* RxBlocking.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - DF0AF2D2212B801D00B15E67 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF0AF2C6212B801D00B15E67 /* RxSwift.framework */; }; - DF0AF2D3212B801D00B15E67 /* RxSwift.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DF0AF2C6212B801D00B15E67 /* RxSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - DF0AF2D4212B801D00B15E67 /* SwiftProtobuf.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF0AF2C7212B801D00B15E67 /* SwiftProtobuf.framework */; }; - DF0AF2D5212B801D00B15E67 /* SwiftProtobuf.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DF0AF2C7212B801D00B15E67 /* SwiftProtobuf.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - DF0AF2D7212B80E400B15E67 /* BoringSSL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF0AF2D6212B80E400B15E67 /* BoringSSL.framework */; }; - DF0AF2D8212B80E400B15E67 /* BoringSSL.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DF0AF2D6212B80E400B15E67 /* BoringSSL.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - DFBB1C5C20FF8ADE0080B093 /* (null) in Embed Frameworks */ = {isa = PBXBuildFile; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 2C365ED2207610C500F42184 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 2C365EB5207610C500F42184 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 2C365EBC207610C500F42184; - remoteInfo = DronecodeSDKSwiftDemo; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXCopyFilesBuildPhase section */ - DFBB1C5D20FF8ADE0080B093 /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - DF0AF2D8212B80E400B15E67 /* BoringSSL.framework in Embed Frameworks */, - DF0AF2D1212B801D00B15E67 /* RxBlocking.framework in Embed Frameworks */, - DF0AF2CF212B801D00B15E67 /* CgRPC.framework in Embed Frameworks */, - DF0AF2CB212B801D00B15E67 /* backend.framework in Embed Frameworks */, - DF0AF2D5212B801D00B15E67 /* SwiftProtobuf.framework in Embed Frameworks */, - DF0AF2D3212B801D00B15E67 /* RxSwift.framework in Embed Frameworks */, - DFBB1C5C20FF8ADE0080B093 /* (null) in Embed Frameworks */, - DF0AF2C0212B7FD500B15E67 /* Dronecode_SDK_Swift.framework in Embed Frameworks */, - DF0AF2CD212B801D00B15E67 /* SwiftGRPC.framework in Embed Frameworks */, - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 2C0648C62091DC06002BD970 /* ExampleMission.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleMission.swift; sourceTree = ""; }; - 2C365EBD207610C500F42184 /* DronecodeSDKSwiftDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DronecodeSDKSwiftDemo.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 2C365EC0207610C500F42184 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 2C365EC2207610C500F42184 /* TelemetryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TelemetryViewController.swift; sourceTree = ""; }; - 2C365ECA207610C500F42184 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 2C365ECC207610C500F42184 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 2C365ED1207610C500F42184 /* DronecodeSDKSwiftDemoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DronecodeSDKSwiftDemoTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 2C365ED5207610C500F42184 /* DronecodeSDKSwiftDemoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DronecodeSDKSwiftDemoTests.swift; sourceTree = ""; }; - 2C365ED7207610C500F42184 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 2C365EE220761F3000F42184 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - 2C365EE42076247000F42184 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 2CA1F0CC20CE618700C913D6 /* CustomPinAnnotationView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomPinAnnotationView.swift; sourceTree = ""; }; - 2CA1F0CD20CE618700C913D6 /* NamedAnnotation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NamedAnnotation.swift; sourceTree = ""; }; - 2CA1F0D320CE625D00C913D6 /* DroneView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DroneView.swift; sourceTree = ""; }; - 2CCEB7982089F2510086AA37 /* CoreManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreManager.swift; sourceTree = ""; }; - 2CDBF020207652340064C8A5 /* MapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapViewController.swift; sourceTree = ""; }; - 2CE6B6CE20AED1C90086958C /* empty.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = empty.hpp; sourceTree = ""; }; - 2CE6B6CF20AED1C90086958C /* empty.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = empty.cpp; sourceTree = ""; }; - 2CE6B6D220AED28E0086958C /* DronecodeSDKSwiftDemo-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "DronecodeSDKSwiftDemo-Bridging-Header.h"; path = "DronecodeSDKSwiftDemo/DronecodeSDKSwiftDemo-Bridging-Header.h"; sourceTree = SOURCE_ROOT; }; - 2CE6B6D320AEECE10086958C /* CameraViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraViewController.swift; sourceTree = ""; }; - 2CFF7270207750AF0060D31B /* ActionsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionsViewController.swift; sourceTree = ""; }; - DF0AF2B0212B7F4700B15E67 /* MobileVLCKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileVLCKit.framework; path = Carthage/Build/iOS/MobileVLCKit.framework; sourceTree = ""; }; - DF0AF2B2212B7F5900B15E67 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; - DF0AF2B4212B7F6200B15E67 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; - DF0AF2B6212B7F6B00B15E67 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; - DF0AF2B8212B7F7600B15E67 /* libiconv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; }; - DF0AF2BA212B7F8100B15E67 /* libbz2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libbz2.tbd; path = usr/lib/libbz2.tbd; sourceTree = SDKROOT; }; - DF0AF2BC212B7F8A00B15E67 /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/Frameworks/VideoToolbox.framework; sourceTree = SDKROOT; }; - DF0AF2BE212B7FD500B15E67 /* Dronecode_SDK_Swift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Dronecode_SDK_Swift.framework; path = Carthage/Build/iOS/Dronecode_SDK_Swift.framework; sourceTree = ""; }; - DF0AF2C2212B801C00B15E67 /* backend.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = backend.framework; path = Carthage/Build/iOS/backend.framework; sourceTree = ""; }; - DF0AF2C3212B801D00B15E67 /* SwiftGRPC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftGRPC.framework; path = Carthage/Build/iOS/SwiftGRPC.framework; sourceTree = ""; }; - DF0AF2C4212B801D00B15E67 /* CgRPC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CgRPC.framework; path = Carthage/Build/iOS/CgRPC.framework; sourceTree = ""; }; - DF0AF2C5212B801D00B15E67 /* RxBlocking.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxBlocking.framework; path = Carthage/Build/iOS/RxBlocking.framework; sourceTree = ""; }; - DF0AF2C6212B801D00B15E67 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/iOS/RxSwift.framework; sourceTree = ""; }; - DF0AF2C7212B801D00B15E67 /* SwiftProtobuf.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftProtobuf.framework; path = Carthage/Build/iOS/SwiftProtobuf.framework; sourceTree = ""; }; - DF0AF2D6212B80E400B15E67 /* BoringSSL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BoringSSL.framework; path = Carthage/Build/iOS/BoringSSL.framework; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 2C365EBA207610C500F42184 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - DF0AF2BD212B7F8A00B15E67 /* VideoToolbox.framework in Frameworks */, - DF0AF2D2212B801D00B15E67 /* RxSwift.framework in Frameworks */, - DF0AF2CC212B801D00B15E67 /* SwiftGRPC.framework in Frameworks */, - DF0AF2D7212B80E400B15E67 /* BoringSSL.framework in Frameworks */, - DF0AF2BF212B7FD500B15E67 /* Dronecode_SDK_Swift.framework in Frameworks */, - DF0AF2CA212B801D00B15E67 /* backend.framework in Frameworks */, - DF0AF2BB212B7F8100B15E67 /* libbz2.tbd in Frameworks */, - DF0AF2D4212B801D00B15E67 /* SwiftProtobuf.framework in Frameworks */, - DF0AF2CE212B801D00B15E67 /* CgRPC.framework in Frameworks */, - DF0AF2B9212B7F7600B15E67 /* libiconv.tbd in Frameworks */, - DF0AF2B7212B7F6B00B15E67 /* CoreMedia.framework in Frameworks */, - DF0AF2B5212B7F6300B15E67 /* AudioToolbox.framework in Frameworks */, - DF0AF2D0212B801D00B15E67 /* RxBlocking.framework in Frameworks */, - DF0AF2B3212B7F5900B15E67 /* AVFoundation.framework in Frameworks */, - DF0AF2B1212B7F4700B15E67 /* MobileVLCKit.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 2C365ECE207610C500F42184 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 2C0A6A5B208F6D9A00B3E12F /* Models */ = { - isa = PBXGroup; - children = ( - 2C0648C62091DC06002BD970 /* ExampleMission.swift */, - ); - path = Models; - sourceTree = ""; - }; - 2C365EB4207610C500F42184 = { - isa = PBXGroup; - children = ( - DF0AF2D6212B80E400B15E67 /* BoringSSL.framework */, - DF0AF2C2212B801C00B15E67 /* backend.framework */, - DF0AF2C4212B801D00B15E67 /* CgRPC.framework */, - DF0AF2C5212B801D00B15E67 /* RxBlocking.framework */, - DF0AF2C6212B801D00B15E67 /* RxSwift.framework */, - DF0AF2C3212B801D00B15E67 /* SwiftGRPC.framework */, - DF0AF2C7212B801D00B15E67 /* SwiftProtobuf.framework */, - DF0AF2BE212B7FD500B15E67 /* Dronecode_SDK_Swift.framework */, - 2C365EBF207610C500F42184 /* DronecodeSDKSwiftDemo */, - 2C365ED4207610C500F42184 /* DronecodeSDKSwiftDemoTests */, - 2C365EBE207610C500F42184 /* Products */, - DF0AF2AF212B7F4600B15E67 /* Frameworks */, - ); - sourceTree = ""; - }; - 2C365EBE207610C500F42184 /* Products */ = { - isa = PBXGroup; - children = ( - 2C365EBD207610C500F42184 /* DronecodeSDKSwiftDemo.app */, - 2C365ED1207610C500F42184 /* DronecodeSDKSwiftDemoTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; - 2C365EBF207610C500F42184 /* DronecodeSDKSwiftDemo */ = { - isa = PBXGroup; - children = ( - 2C365EC0207610C500F42184 /* AppDelegate.swift */, - 2CCEB79A2089F25B0086AA37 /* Manager */, - 2CDBF022207659D00064C8A5 /* Controllers */, - 2C0A6A5B208F6D9A00B3E12F /* Models */, - 2CE6B6CD20AED1C90086958C /* MobileVLCKit */, - 2CE6B6D220AED28E0086958C /* DronecodeSDKSwiftDemo-Bridging-Header.h */, - 2C365EE42076247000F42184 /* Assets.xcassets */, - 2C365EE120761F3000F42184 /* LaunchScreen.storyboard */, - 2C365EC9207610C500F42184 /* Main.storyboard */, - 2C365ECC207610C500F42184 /* Info.plist */, - ); - path = DronecodeSDKSwiftDemo; - sourceTree = ""; - }; - 2C365ED4207610C500F42184 /* DronecodeSDKSwiftDemoTests */ = { - isa = PBXGroup; - children = ( - 2C365ED5207610C500F42184 /* DronecodeSDKSwiftDemoTests.swift */, - 2C365ED7207610C500F42184 /* Info.plist */, - ); - path = DronecodeSDKSwiftDemoTests; - sourceTree = ""; - }; - 2CA1F0CB20CE618700C913D6 /* Mapkit */ = { - isa = PBXGroup; - children = ( - 2CA1F0D020CE622800C913D6 /* Drone */, - 2CA1F0D120CE623300C913D6 /* Pins */, - ); - path = Mapkit; - sourceTree = ""; - }; - 2CA1F0D020CE622800C913D6 /* Drone */ = { - isa = PBXGroup; - children = ( - 2CA1F0D320CE625D00C913D6 /* DroneView.swift */, - ); - path = Drone; - sourceTree = ""; - }; - 2CA1F0D120CE623300C913D6 /* Pins */ = { - isa = PBXGroup; - children = ( - 2CA1F0CC20CE618700C913D6 /* CustomPinAnnotationView.swift */, - 2CA1F0CD20CE618700C913D6 /* NamedAnnotation.swift */, - ); - path = Pins; - sourceTree = ""; - }; - 2CCEB79A2089F25B0086AA37 /* Manager */ = { - isa = PBXGroup; - children = ( - 2CCEB7982089F2510086AA37 /* CoreManager.swift */, - ); - path = Manager; - sourceTree = ""; - }; - 2CDBF022207659D00064C8A5 /* Controllers */ = { - isa = PBXGroup; - children = ( - 2C365EC2207610C500F42184 /* TelemetryViewController.swift */, - 2CFF7270207750AF0060D31B /* ActionsViewController.swift */, - 2CDBF020207652340064C8A5 /* MapViewController.swift */, - 2CA1F0CB20CE618700C913D6 /* Mapkit */, - 2CE6B6D320AEECE10086958C /* CameraViewController.swift */, - ); - path = Controllers; - sourceTree = ""; - }; - 2CE6B6CD20AED1C90086958C /* MobileVLCKit */ = { - isa = PBXGroup; - children = ( - 2CE6B6CE20AED1C90086958C /* empty.hpp */, - 2CE6B6CF20AED1C90086958C /* empty.cpp */, - ); - path = MobileVLCKit; - sourceTree = ""; - }; - DF0AF2AF212B7F4600B15E67 /* Frameworks */ = { - isa = PBXGroup; - children = ( - DF0AF2BC212B7F8A00B15E67 /* VideoToolbox.framework */, - DF0AF2BA212B7F8100B15E67 /* libbz2.tbd */, - DF0AF2B8212B7F7600B15E67 /* libiconv.tbd */, - DF0AF2B6212B7F6B00B15E67 /* CoreMedia.framework */, - DF0AF2B4212B7F6200B15E67 /* AudioToolbox.framework */, - DF0AF2B2212B7F5900B15E67 /* AVFoundation.framework */, - DF0AF2B0212B7F4700B15E67 /* MobileVLCKit.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 2C365EBC207610C500F42184 /* DronecodeSDKSwiftDemo */ = { - isa = PBXNativeTarget; - buildConfigurationList = 2C365EDA207610C500F42184 /* Build configuration list for PBXNativeTarget "DronecodeSDKSwiftDemo" */; - buildPhases = ( - 2C365EB9207610C500F42184 /* Sources */, - 2C365EBA207610C500F42184 /* Frameworks */, - 2C365EBB207610C500F42184 /* Resources */, - DFBB1C5D20FF8ADE0080B093 /* Embed Frameworks */, - DF5B5688212C721200923C8F /* ShellScript */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = DronecodeSDKSwiftDemo; - productName = DronecodeSDKSwiftDemo; - productReference = 2C365EBD207610C500F42184 /* DronecodeSDKSwiftDemo.app */; - productType = "com.apple.product-type.application"; - }; - 2C365ED0207610C500F42184 /* DronecodeSDKSwiftDemoTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 2C365EDD207610C500F42184 /* Build configuration list for PBXNativeTarget "DronecodeSDKSwiftDemoTests" */; - buildPhases = ( - 2C365ECD207610C500F42184 /* Sources */, - 2C365ECE207610C500F42184 /* Frameworks */, - 2C365ECF207610C500F42184 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 2C365ED3207610C500F42184 /* PBXTargetDependency */, - ); - name = DronecodeSDKSwiftDemoTests; - productName = DronecodeSDKSwiftDemoTests; - productReference = 2C365ED1207610C500F42184 /* DronecodeSDKSwiftDemoTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 2C365EB5207610C500F42184 /* Project object */ = { - isa = PBXProject; - attributes = { - LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 0920; - ORGANIZATIONNAME = "Marjory Silvestre"; - TargetAttributes = { - 2C365EBC207610C500F42184 = { - CreatedOnToolsVersion = 9.2; - ProvisioningStyle = Automatic; - }; - 2C365ED0207610C500F42184 = { - CreatedOnToolsVersion = 9.2; - ProvisioningStyle = Automatic; - TestTargetID = 2C365EBC207610C500F42184; - }; - }; - }; - buildConfigurationList = 2C365EB8207610C500F42184 /* Build configuration list for PBXProject "DronecodeSDKSwiftDemo" */; - compatibilityVersion = "Xcode 8.0"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 2C365EB4207610C500F42184; - productRefGroup = 2C365EBE207610C500F42184 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 2C365EBC207610C500F42184 /* DronecodeSDKSwiftDemo */, - 2C365ED0207610C500F42184 /* DronecodeSDKSwiftDemoTests */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 2C365EBB207610C500F42184 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 2C365ECB207610C500F42184 /* Main.storyboard in Resources */, - 2C365EE52076247100F42184 /* Assets.xcassets in Resources */, - 2C365EE320761F3000F42184 /* LaunchScreen.storyboard in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 2C365ECF207610C500F42184 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - DF5B5688212C721200923C8F /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/Carthage/Build/iOS/BoringSSL.framework", - "$(SRCROOT)/Carthage/Build/iOS/SwiftProtobuf.framework", - "$(SRCROOT)/Carthage/Build/iOS/CgRPC.framework", - "$(SRCROOT)/Carthage/Build/iOS/SwiftGRPC.framework", - "$(SRCROOT)/Carthage/Build/iOS/Dronecode_SDK_Swift.framework", - "$(SRCROOT)/Carthage/Build/iOS/RxSwift.framework", - "$(SRCROOT)/Carthage/Build/iOS/RxBlocking.framework", - ); - outputPaths = ( - "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/BoringSSL.framework", - "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/SwiftProtobuf.framework", - "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/CgRPC.framework", - "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/SwiftGRPC.framework", - "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Dronecode_SDK_Swift.framework", - "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/RxSwift.framework", - "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/RxBlocking.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/usr/local/bin/carthage copy-frameworks\n"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 2C365EB9207610C500F42184 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 2CA1F0CE20CE618700C913D6 /* CustomPinAnnotationView.swift in Sources */, - 2CA1F0CF20CE618700C913D6 /* NamedAnnotation.swift in Sources */, - 2C365EC3207610C500F42184 /* TelemetryViewController.swift in Sources */, - 2CE6B6D420AEECE10086958C /* CameraViewController.swift in Sources */, - 2CA1F0D520CE625D00C913D6 /* DroneView.swift in Sources */, - 2CE6B6D120AED1CA0086958C /* empty.cpp in Sources */, - 2CDBF021207652340064C8A5 /* MapViewController.swift in Sources */, - 2CFF7271207750AF0060D31B /* ActionsViewController.swift in Sources */, - 2C0648C72091DC06002BD970 /* ExampleMission.swift in Sources */, - 2C365EC1207610C500F42184 /* AppDelegate.swift in Sources */, - 2CCEB7992089F2510086AA37 /* CoreManager.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 2C365ECD207610C500F42184 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 2C365ED6207610C500F42184 /* DronecodeSDKSwiftDemoTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 2C365ED3207610C500F42184 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 2C365EBC207610C500F42184 /* DronecodeSDKSwiftDemo */; - targetProxy = 2C365ED2207610C500F42184 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin PBXVariantGroup section */ - 2C365EC9207610C500F42184 /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 2C365ECA207610C500F42184 /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; - 2C365EE120761F3000F42184 /* LaunchScreen.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 2C365EE220761F3000F42184 /* Base */, - ); - name = LaunchScreen.storyboard; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 2C365ED8207610C500F42184 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - 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_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = 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_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; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - 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 = 11.2; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - }; - name = Debug; - }; - 2C365ED9207610C500F42184 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - 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_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = 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_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; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = 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 = 11.2; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - 2C365EDB207610C500F42184 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = Y4U8WX82HX; - ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", - ); - INFOPLIST_FILE = DronecodeSDKSwiftDemo/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = io.dronecode.DronecodeSDKSwiftDemo; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "DronecodeSDKSwiftDemo/DronecodeSDKSwiftDemo-Bridging-Header.h"; - SWIFT_VERSION = 4.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 2C365EDC207610C500F42184 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = Y4U8WX82HX; - ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", - ); - INFOPLIST_FILE = DronecodeSDKSwiftDemo/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = io.dronecode.DronecodeSDKSwiftDemo; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "DronecodeSDKSwiftDemo/DronecodeSDKSwiftDemo-Bridging-Header.h"; - SWIFT_VERSION = 4.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; - 2C365EDE207610C500F42184 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = HBV2V5DL5C; - INFOPLIST_FILE = DronecodeSDKSwiftDemoTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = io.dronecode.DronecodeSDKSwiftDemoTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; - TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/DronecodeSDKSwiftDemo.app/DronecodeSDKSwiftDemo"; - }; - name = Debug; - }; - 2C365EDF207610C500F42184 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = HBV2V5DL5C; - INFOPLIST_FILE = DronecodeSDKSwiftDemoTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = io.dronecode.DronecodeSDKSwiftDemoTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; - TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/DronecodeSDKSwiftDemo.app/DronecodeSDKSwiftDemo"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 2C365EB8207610C500F42184 /* Build configuration list for PBXProject "DronecodeSDKSwiftDemo" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 2C365ED8207610C500F42184 /* Debug */, - 2C365ED9207610C500F42184 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 2C365EDA207610C500F42184 /* Build configuration list for PBXNativeTarget "DronecodeSDKSwiftDemo" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 2C365EDB207610C500F42184 /* Debug */, - 2C365EDC207610C500F42184 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 2C365EDD207610C500F42184 /* Build configuration list for PBXNativeTarget "DronecodeSDKSwiftDemoTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 2C365EDE207610C500F42184 /* Debug */, - 2C365EDF207610C500F42184 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 2C365EB5207610C500F42184 /* Project object */; -} diff --git a/DronecodeSDKSwiftDemo/Info.plist b/DronecodeSDKSwiftDemo/Info.plist deleted file mode 100644 index 45cbf8c..0000000 --- a/DronecodeSDKSwiftDemo/Info.plist +++ /dev/null @@ -1,47 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - LSRequiresIPhoneOS - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - NSLocationWhenInUseUsageDescription - This application use this information to show you your location - - diff --git a/DronecodeSDKSwiftDemoTests/DronecodeSDKSwiftDemoTests.swift b/DronecodeSDKSwiftDemoTests/DronecodeSDKSwiftDemoTests.swift deleted file mode 100644 index fc466f5..0000000 --- a/DronecodeSDKSwiftDemoTests/DronecodeSDKSwiftDemoTests.swift +++ /dev/null @@ -1,36 +0,0 @@ -// -// DronecodeSDKSwiftDemoTests.swift -// DronecodeSDKSwiftDemoTests -// -// Created by Marjory Silvestre on 05.04.18. -// Copyright © 2018 Marjory Silvestre. All rights reserved. -// - -import XCTest -@testable import DronecodeSDKSwiftDemo - -class DronecodeSDKSwiftDemoTests: XCTestCase { - - override func setUp() { - super.setUp() - // Put setup code here. This method is called before the invocation of each test method in the class. - } - - override func tearDown() { - // Put teardown code here. This method is called after the invocation of each test method in the class. - super.tearDown() - } - - func testExample() { - // This is an example of a functional test case. - // Use XCTAssert and related functions to verify your tests produce the correct results. - } - - func testPerformanceExample() { - // This is an example of a performance test case. - self.measure { - // Put the code you want to measure the time of here. - } - } - -} diff --git a/DronecodeSDKSwiftDemoTests/Info.plist b/DronecodeSDKSwiftDemoTests/Info.plist deleted file mode 100644 index 6c40a6c..0000000 --- a/DronecodeSDKSwiftDemoTests/Info.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - - diff --git a/DronecodeSDKSwiftDemo/AppDelegate.swift b/Sources/DronecodeSDKSwiftDemo/AppDelegate.swift similarity index 95% rename from DronecodeSDKSwiftDemo/AppDelegate.swift rename to Sources/DronecodeSDKSwiftDemo/AppDelegate.swift index ecede7f..849f883 100644 --- a/DronecodeSDKSwiftDemo/AppDelegate.swift +++ b/Sources/DronecodeSDKSwiftDemo/AppDelegate.swift @@ -6,7 +6,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { // Override point for customization after application launch. return true } diff --git a/DronecodeSDKSwiftDemo/Assets.xcassets/AppIcon.appiconset/Contents.json b/Sources/DronecodeSDKSwiftDemo/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from DronecodeSDKSwiftDemo/Assets.xcassets/AppIcon.appiconset/Contents.json rename to Sources/DronecodeSDKSwiftDemo/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/DronecodeSDKSwiftDemo/Assets.xcassets/AppIcon.appiconset/logo-1024.jpeg b/Sources/DronecodeSDKSwiftDemo/Assets.xcassets/AppIcon.appiconset/logo-1024.jpeg similarity index 100% rename from DronecodeSDKSwiftDemo/Assets.xcassets/AppIcon.appiconset/logo-1024.jpeg rename to Sources/DronecodeSDKSwiftDemo/Assets.xcassets/AppIcon.appiconset/logo-1024.jpeg diff --git a/DronecodeSDKSwiftDemo/Assets.xcassets/AppIcon.appiconset/logo-120.jpg b/Sources/DronecodeSDKSwiftDemo/Assets.xcassets/AppIcon.appiconset/logo-120.jpg similarity index 100% rename from DronecodeSDKSwiftDemo/Assets.xcassets/AppIcon.appiconset/logo-120.jpg rename to Sources/DronecodeSDKSwiftDemo/Assets.xcassets/AppIcon.appiconset/logo-120.jpg diff --git a/DronecodeSDKSwiftDemo/Assets.xcassets/AppIcon.appiconset/logo-167.jpg b/Sources/DronecodeSDKSwiftDemo/Assets.xcassets/AppIcon.appiconset/logo-167.jpg similarity index 100% rename from DronecodeSDKSwiftDemo/Assets.xcassets/AppIcon.appiconset/logo-167.jpg rename to Sources/DronecodeSDKSwiftDemo/Assets.xcassets/AppIcon.appiconset/logo-167.jpg diff --git a/DronecodeSDKSwiftDemo/Assets.xcassets/AppIcon.appiconset/logo-76.jpg b/Sources/DronecodeSDKSwiftDemo/Assets.xcassets/AppIcon.appiconset/logo-76.jpg similarity index 100% rename from DronecodeSDKSwiftDemo/Assets.xcassets/AppIcon.appiconset/logo-76.jpg rename to Sources/DronecodeSDKSwiftDemo/Assets.xcassets/AppIcon.appiconset/logo-76.jpg diff --git a/DronecodeSDKSwiftDemo/Assets.xcassets/Contents.json b/Sources/DronecodeSDKSwiftDemo/Assets.xcassets/Contents.json similarity index 100% rename from DronecodeSDKSwiftDemo/Assets.xcassets/Contents.json rename to Sources/DronecodeSDKSwiftDemo/Assets.xcassets/Contents.json diff --git a/DronecodeSDKSwiftDemo/Assets.xcassets/annotation-drone.imageset/Contents.json b/Sources/DronecodeSDKSwiftDemo/Assets.xcassets/annotation-drone.imageset/Contents.json similarity index 100% rename from DronecodeSDKSwiftDemo/Assets.xcassets/annotation-drone.imageset/Contents.json rename to Sources/DronecodeSDKSwiftDemo/Assets.xcassets/annotation-drone.imageset/Contents.json diff --git a/DronecodeSDKSwiftDemo/Assets.xcassets/annotation-drone.imageset/drone (1).png b/Sources/DronecodeSDKSwiftDemo/Assets.xcassets/annotation-drone.imageset/drone (1).png similarity index 100% rename from DronecodeSDKSwiftDemo/Assets.xcassets/annotation-drone.imageset/drone (1).png rename to Sources/DronecodeSDKSwiftDemo/Assets.xcassets/annotation-drone.imageset/drone (1).png diff --git a/DronecodeSDKSwiftDemo/Assets.xcassets/annotation-drone.imageset/drone (2).png b/Sources/DronecodeSDKSwiftDemo/Assets.xcassets/annotation-drone.imageset/drone (2).png similarity index 100% rename from DronecodeSDKSwiftDemo/Assets.xcassets/annotation-drone.imageset/drone (2).png rename to Sources/DronecodeSDKSwiftDemo/Assets.xcassets/annotation-drone.imageset/drone (2).png diff --git a/DronecodeSDKSwiftDemo/Assets.xcassets/annotation-drone.imageset/drone.png b/Sources/DronecodeSDKSwiftDemo/Assets.xcassets/annotation-drone.imageset/drone.png similarity index 100% rename from DronecodeSDKSwiftDemo/Assets.xcassets/annotation-drone.imageset/drone.png rename to Sources/DronecodeSDKSwiftDemo/Assets.xcassets/annotation-drone.imageset/drone.png diff --git a/DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-action-remote.imageset/Contents.json b/Sources/DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-action-remote.imageset/Contents.json similarity index 100% rename from DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-action-remote.imageset/Contents.json rename to Sources/DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-action-remote.imageset/Contents.json diff --git a/DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-action-remote.imageset/icon-action-remote.png b/Sources/DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-action-remote.imageset/icon-action-remote.png similarity index 100% rename from DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-action-remote.imageset/icon-action-remote.png rename to Sources/DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-action-remote.imageset/icon-action-remote.png diff --git a/DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-camera.imageset/Contents.json b/Sources/DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-camera.imageset/Contents.json similarity index 100% rename from DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-camera.imageset/Contents.json rename to Sources/DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-camera.imageset/Contents.json diff --git a/DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-camera.imageset/icon-tab-camera.png b/Sources/DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-camera.imageset/icon-tab-camera.png similarity index 100% rename from DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-camera.imageset/icon-tab-camera.png rename to Sources/DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-camera.imageset/icon-tab-camera.png diff --git a/DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-drone.imageset/Contents.json b/Sources/DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-drone.imageset/Contents.json similarity index 100% rename from DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-drone.imageset/Contents.json rename to Sources/DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-drone.imageset/Contents.json diff --git a/DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-drone.imageset/drone.png b/Sources/DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-drone.imageset/drone.png similarity index 100% rename from DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-drone.imageset/drone.png rename to Sources/DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-drone.imageset/drone.png diff --git a/DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-placeholder-location.imageset/Contents.json b/Sources/DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-placeholder-location.imageset/Contents.json similarity index 100% rename from DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-placeholder-location.imageset/Contents.json rename to Sources/DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-placeholder-location.imageset/Contents.json diff --git a/DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-placeholder-location.imageset/placeholder-location.png b/Sources/DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-placeholder-location.imageset/placeholder-location.png similarity index 100% rename from DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-placeholder-location.imageset/placeholder-location.png rename to Sources/DronecodeSDKSwiftDemo/Assets.xcassets/icon-tab-placeholder-location.imageset/placeholder-location.png diff --git a/DronecodeSDKSwiftDemo/Assets.xcassets/logo-DroneCore-thumb.imageset/Contents.json b/Sources/DronecodeSDKSwiftDemo/Assets.xcassets/logo-DroneCore-thumb.imageset/Contents.json similarity index 100% rename from DronecodeSDKSwiftDemo/Assets.xcassets/logo-DroneCore-thumb.imageset/Contents.json rename to Sources/DronecodeSDKSwiftDemo/Assets.xcassets/logo-DroneCore-thumb.imageset/Contents.json diff --git a/DronecodeSDKSwiftDemo/Assets.xcassets/logo-DroneCore-thumb.imageset/logo-DroneCore-thumb.png b/Sources/DronecodeSDKSwiftDemo/Assets.xcassets/logo-DroneCore-thumb.imageset/logo-DroneCore-thumb.png similarity index 100% rename from DronecodeSDKSwiftDemo/Assets.xcassets/logo-DroneCore-thumb.imageset/logo-DroneCore-thumb.png rename to Sources/DronecodeSDKSwiftDemo/Assets.xcassets/logo-DroneCore-thumb.imageset/logo-DroneCore-thumb.png diff --git a/DronecodeSDKSwiftDemo/Assets.xcassets/logo-DroneCore.imageset/Contents.json b/Sources/DronecodeSDKSwiftDemo/Assets.xcassets/logo-DroneCore.imageset/Contents.json similarity index 100% rename from DronecodeSDKSwiftDemo/Assets.xcassets/logo-DroneCore.imageset/Contents.json rename to Sources/DronecodeSDKSwiftDemo/Assets.xcassets/logo-DroneCore.imageset/Contents.json diff --git a/DronecodeSDKSwiftDemo/Assets.xcassets/logo-DroneCore.imageset/DroneCore_Logo.png b/Sources/DronecodeSDKSwiftDemo/Assets.xcassets/logo-DroneCore.imageset/DroneCore_Logo.png similarity index 100% rename from DronecodeSDKSwiftDemo/Assets.xcassets/logo-DroneCore.imageset/DroneCore_Logo.png rename to Sources/DronecodeSDKSwiftDemo/Assets.xcassets/logo-DroneCore.imageset/DroneCore_Logo.png diff --git a/DronecodeSDKSwiftDemo/Assets.xcassets/pin-image.imageset/Contents.json b/Sources/DronecodeSDKSwiftDemo/Assets.xcassets/pin-image.imageset/Contents.json similarity index 100% rename from DronecodeSDKSwiftDemo/Assets.xcassets/pin-image.imageset/Contents.json rename to Sources/DronecodeSDKSwiftDemo/Assets.xcassets/pin-image.imageset/Contents.json diff --git a/DronecodeSDKSwiftDemo/Assets.xcassets/pin-image.imageset/pin-x1.png b/Sources/DronecodeSDKSwiftDemo/Assets.xcassets/pin-image.imageset/pin-x1.png similarity index 100% rename from DronecodeSDKSwiftDemo/Assets.xcassets/pin-image.imageset/pin-x1.png rename to Sources/DronecodeSDKSwiftDemo/Assets.xcassets/pin-image.imageset/pin-x1.png diff --git a/DronecodeSDKSwiftDemo/Assets.xcassets/pin-image.imageset/pin-x2.png b/Sources/DronecodeSDKSwiftDemo/Assets.xcassets/pin-image.imageset/pin-x2.png similarity index 100% rename from DronecodeSDKSwiftDemo/Assets.xcassets/pin-image.imageset/pin-x2.png rename to Sources/DronecodeSDKSwiftDemo/Assets.xcassets/pin-image.imageset/pin-x2.png diff --git a/DronecodeSDKSwiftDemo/Assets.xcassets/pin-image.imageset/pin.png b/Sources/DronecodeSDKSwiftDemo/Assets.xcassets/pin-image.imageset/pin.png similarity index 100% rename from DronecodeSDKSwiftDemo/Assets.xcassets/pin-image.imageset/pin.png rename to Sources/DronecodeSDKSwiftDemo/Assets.xcassets/pin-image.imageset/pin.png diff --git a/DronecodeSDKSwiftDemo/Base.lproj/LaunchScreen.storyboard b/Sources/DronecodeSDKSwiftDemo/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from DronecodeSDKSwiftDemo/Base.lproj/LaunchScreen.storyboard rename to Sources/DronecodeSDKSwiftDemo/Base.lproj/LaunchScreen.storyboard diff --git a/DronecodeSDKSwiftDemo/Base.lproj/Main.storyboard b/Sources/DronecodeSDKSwiftDemo/Base.lproj/Main.storyboard similarity index 100% rename from DronecodeSDKSwiftDemo/Base.lproj/Main.storyboard rename to Sources/DronecodeSDKSwiftDemo/Base.lproj/Main.storyboard diff --git a/DronecodeSDKSwiftDemo/Controllers/ActionsViewController.swift b/Sources/DronecodeSDKSwiftDemo/Controllers/ActionsViewController.swift similarity index 100% rename from DronecodeSDKSwiftDemo/Controllers/ActionsViewController.swift rename to Sources/DronecodeSDKSwiftDemo/Controllers/ActionsViewController.swift diff --git a/DronecodeSDKSwiftDemo/Controllers/CameraActionViewController.swift b/Sources/DronecodeSDKSwiftDemo/Controllers/CameraActionViewController.swift similarity index 82% rename from DronecodeSDKSwiftDemo/Controllers/CameraActionViewController.swift rename to Sources/DronecodeSDKSwiftDemo/Controllers/CameraActionViewController.swift index 8dcde32..cf69640 100644 --- a/DronecodeSDKSwiftDemo/Controllers/CameraActionViewController.swift +++ b/Sources/DronecodeSDKSwiftDemo/Controllers/CameraActionViewController.swift @@ -1,11 +1,3 @@ -// -// CameraActionViewController.swift -// DronecodeSDKSwiftDemo -// -// Created by Sushma Sathyanarayana on 6/21/18. -// Copyright © 2018 Marjory Silvestre. All rights reserved. -// - import Foundation import UIKit @@ -17,11 +9,9 @@ class CameraActionViewController: UIViewController { @IBOutlet weak var videoLabel: UIButton! @IBOutlet weak var photoIntervalLabel: UIButton! - // MARK: - override func viewDidLoad() { super.viewDidLoad() - // init text for feedback and add round corner and border feedbackLabel.text = "Welcome" feedbackLabel.layer.cornerRadius = UI_CORNER_RADIUS_BUTTONS feedbackLabel?.layer.masksToBounds = true @@ -35,7 +25,7 @@ class CameraActionViewController: UIViewController { } @IBAction func capturePicture(_ sender: UIButton) { - let myRoutine = CoreManager.shared().camera.takePhoto() + let myRoutine = CoreManager.shared.camera.takePhoto() .do(onError: { error in self.feedbackLabel.text = "Photo Capture Failed : \(error.localizedDescription)" }, onCompleted: { self.feedbackLabel.text = "Photo Capture Success" }) _ = myRoutine.subscribe() @@ -43,7 +33,7 @@ class CameraActionViewController: UIViewController { @IBAction func videoAction(_ sender: UIButton) { if(videoLabel.titleLabel?.text == "Start Video") { - let myRoutine = CoreManager.shared().camera.startVideo() + let myRoutine = CoreManager.shared.camera.startVideo() .do(onError: { error in self.feedbackLabel.text = "Start Video Failed : \(error.localizedDescription)" }, onCompleted: { self.feedbackLabel.text = "Start Video Success" @@ -53,7 +43,7 @@ class CameraActionViewController: UIViewController { } else { - let myRoutine = CoreManager.shared().camera.stopVideo() + let myRoutine = CoreManager.shared.camera.stopVideo() .do(onError: { error in self.feedbackLabel.text = "Stop Video Failed : \(error.localizedDescription)" }, onCompleted: { self.feedbackLabel.text = "Stop Video Success" @@ -67,7 +57,7 @@ class CameraActionViewController: UIViewController { @IBAction func photoIntervalAction(_ sender: UIButton) { let intervalTimeS = 3 if(photoIntervalLabel.titleLabel?.text == "Start Photo Interval") { - let myRoutine = CoreManager.shared().camera.startPhotoInteval(interval: Float(intervalTimeS)) + let myRoutine = CoreManager.shared.camera.startPhotoInteval(interval: Float(intervalTimeS)) .do(onError: { error in self.feedbackLabel.text = "Start Photo Interval Failed : \(error.localizedDescription)" }, onCompleted: { self.feedbackLabel.text = "Start Photo Interval Success" @@ -76,7 +66,7 @@ class CameraActionViewController: UIViewController { _ = myRoutine.subscribe() } else { - let myRoutine = CoreManager.shared().camera.stopPhotoInterval() + let myRoutine = CoreManager.shared.camera.stopPhotoInterval() .do(onError: { error in self.feedbackLabel.text = "Stop Photo Interval Failed : \(error.localizedDescription)" }, onCompleted: { self.feedbackLabel.text = "Stop Photo Interval Success" @@ -88,14 +78,14 @@ class CameraActionViewController: UIViewController { } @IBAction func setPhotoMode(_ sender: UIButton) { - let myRoutine = CoreManager.shared().camera.setMode(mode: CameraMode.photo) + let myRoutine = CoreManager.shared.camera.setMode(mode: CameraMode.photo) .do(onError: { error in self.feedbackLabel.text = "Set Photo Mode Failed : \(error.localizedDescription)" }, onCompleted: { self.feedbackLabel.text = "Set Photo Mode Success" }) _ = myRoutine.subscribe() } @IBAction func setVideoMode(_ sender: UIButton) { - let myRoutine = CoreManager.shared().camera.setMode(mode: CameraMode.video) + let myRoutine = CoreManager.shared.camera.setMode(mode: CameraMode.video) .do(onError: { error in self.feedbackLabel.text = "Set Video Mode Failed : \(error.localizedDescription)" }, onCompleted: { self.feedbackLabel.text = "Set Video Mode Success" }) _ = myRoutine.subscribe() diff --git a/DronecodeSDKSwiftDemo/Controllers/CameraViewController.swift b/Sources/DronecodeSDKSwiftDemo/Controllers/CameraViewController.swift similarity index 98% rename from DronecodeSDKSwiftDemo/Controllers/CameraViewController.swift rename to Sources/DronecodeSDKSwiftDemo/Controllers/CameraViewController.swift index bde8d97..3b61d71 100644 --- a/DronecodeSDKSwiftDemo/Controllers/CameraViewController.swift +++ b/Sources/DronecodeSDKSwiftDemo/Controllers/CameraViewController.swift @@ -1,3 +1,5 @@ +import UIKit + class CameraViewController: UIViewController, VLCMediaPlayerDelegate { @IBOutlet weak var cameraView: UIView! diff --git a/DronecodeSDKSwiftDemo/Controllers/MapViewController.swift b/Sources/DronecodeSDKSwiftDemo/Controllers/MapViewController.swift similarity index 97% rename from DronecodeSDKSwiftDemo/Controllers/MapViewController.swift rename to Sources/DronecodeSDKSwiftDemo/Controllers/MapViewController.swift index 1bbb707..a4ac746 100644 --- a/DronecodeSDKSwiftDemo/Controllers/MapViewController.swift +++ b/Sources/DronecodeSDKSwiftDemo/Controllers/MapViewController.swift @@ -125,8 +125,9 @@ class MapViewController: UIViewController, CLLocationManagerDelegate { } private func centerMapOnLocation(location: CLLocation) { - let coordinateRegion = MKCoordinateRegionMakeWithDistance(location.coordinate, - regionRadius, regionRadius) + let coordinateRegion = MKCoordinateRegion(center: location.coordinate, + latitudinalMeters: regionRadius, + longitudinalMeters: regionRadius) mapView.setRegion(coordinateRegion, animated: true) } @@ -286,14 +287,14 @@ class MapViewController: UIViewController, CLLocationManagerDelegate { } func drawMissionTrace() { - mapView.remove(missionTrace) + mapView.removeOverlay(missionTrace) let points = mission.missionItems.map { missionItem -> CLLocationCoordinate2D in CLLocationCoordinate2DMake(missionItem.latitudeDeg, missionItem.longitudeDeg) } missionTrace = MKPolyline(coordinates: points, count: points.count) - mapView.add(missionTrace) + mapView.addOverlay(missionTrace) let startMissionItem = mission.missionItems.first! startPin.coordinate = CLLocationCoordinate2DMake(startMissionItem.latitudeDeg, startMissionItem.longitudeDeg) diff --git a/DronecodeSDKSwiftDemo/Controllers/Mapkit/Drone/DroneView.swift b/Sources/DronecodeSDKSwiftDemo/Controllers/Mapkit/Drone/DroneView.swift similarity index 100% rename from DronecodeSDKSwiftDemo/Controllers/Mapkit/Drone/DroneView.swift rename to Sources/DronecodeSDKSwiftDemo/Controllers/Mapkit/Drone/DroneView.swift diff --git a/DronecodeSDKSwiftDemo/Controllers/Mapkit/Pins/CustomPinAnnotationView.swift b/Sources/DronecodeSDKSwiftDemo/Controllers/Mapkit/Pins/CustomPinAnnotationView.swift similarity index 100% rename from DronecodeSDKSwiftDemo/Controllers/Mapkit/Pins/CustomPinAnnotationView.swift rename to Sources/DronecodeSDKSwiftDemo/Controllers/Mapkit/Pins/CustomPinAnnotationView.swift diff --git a/DronecodeSDKSwiftDemo/Controllers/Mapkit/Pins/NamedAnnotation.swift b/Sources/DronecodeSDKSwiftDemo/Controllers/Mapkit/Pins/NamedAnnotation.swift similarity index 100% rename from DronecodeSDKSwiftDemo/Controllers/Mapkit/Pins/NamedAnnotation.swift rename to Sources/DronecodeSDKSwiftDemo/Controllers/Mapkit/Pins/NamedAnnotation.swift diff --git a/DronecodeSDKSwiftDemo/Controllers/TelemetryViewController.swift b/Sources/DronecodeSDKSwiftDemo/Controllers/TelemetryViewController.swift similarity index 100% rename from DronecodeSDKSwiftDemo/Controllers/TelemetryViewController.swift rename to Sources/DronecodeSDKSwiftDemo/Controllers/TelemetryViewController.swift diff --git a/DronecodeSDKSwiftDemo/DronecodeSDKSwiftDemo-Bridging-Header.h b/Sources/DronecodeSDKSwiftDemo/DronecodeSDKSwiftDemo-Bridging-Header.h similarity index 100% rename from DronecodeSDKSwiftDemo/DronecodeSDKSwiftDemo-Bridging-Header.h rename to Sources/DronecodeSDKSwiftDemo/DronecodeSDKSwiftDemo-Bridging-Header.h diff --git a/DronecodeSDKSwiftDemo/Manager/CoreManager.swift b/Sources/DronecodeSDKSwiftDemo/Manager/CoreManager.swift similarity index 100% rename from DronecodeSDKSwiftDemo/Manager/CoreManager.swift rename to Sources/DronecodeSDKSwiftDemo/Manager/CoreManager.swift diff --git a/DronecodeSDKSwiftDemo/MobileVLCKit/empty.cpp b/Sources/DronecodeSDKSwiftDemo/MobileVLCKit/empty.cpp similarity index 100% rename from DronecodeSDKSwiftDemo/MobileVLCKit/empty.cpp rename to Sources/DronecodeSDKSwiftDemo/MobileVLCKit/empty.cpp diff --git a/DronecodeSDKSwiftDemo/MobileVLCKit/empty.hpp b/Sources/DronecodeSDKSwiftDemo/MobileVLCKit/empty.hpp similarity index 100% rename from DronecodeSDKSwiftDemo/MobileVLCKit/empty.hpp rename to Sources/DronecodeSDKSwiftDemo/MobileVLCKit/empty.hpp diff --git a/DronecodeSDKSwiftDemo/Models/ExampleMission.swift b/Sources/DronecodeSDKSwiftDemo/Models/ExampleMission.swift similarity index 100% rename from DronecodeSDKSwiftDemo/Models/ExampleMission.swift rename to Sources/DronecodeSDKSwiftDemo/Models/ExampleMission.swift diff --git a/project.yml b/project.yml new file mode 100644 index 0000000..e9cab81 --- /dev/null +++ b/project.yml @@ -0,0 +1,41 @@ +name: DronecodeSDK-Swift-Example +options: + deploymentTarget: + iOS: "11.2" + bundleIdPrefix: org.dronecode.sdk +settings: + ENABLE_BITCODE: NO +targets: + DronecodeSDK_Swift_Example: + info: + path: Sources/DronecodeSDKSwiftDemo/Info.plist + properties: + UILaunchStoryboardName: LaunchScreen + UIMainStoryboardFile: Main + type: application + platform: iOS + settings: + configs: + debug: + SWIFT_OBJC_BRIDGING_HEADER: "Sources/DronecodeSDKSwiftDemo/DronecodeSDKSwiftDemo-Bridging-Header.h" + release: + SWIFT_OBJC_BRIDGING_HEADER: "Sources/DronecodeSDKSwiftDemo/DronecodeSDKSwiftDemo-Bridging-Header.h" + sources: [Sources/DronecodeSDKSwiftDemo] + dependencies: + - carthage: backend + - carthage: BoringSSL + - carthage: CgRPC + - carthage: Dronecode_SDK_Swift + - carthage: MobileVLCKit + embed: false + - carthage: RxBlocking + - carthage: RxSwift + - carthage: SwiftGRPC + - carthage: SwiftProtobuf + - sdk: AVFoundation.framework + - sdk: AudioToolbox.framework + - sdk: CoreMedia.framework + - sdk: libbz2.tbd + - sdk: libiconv.tbd + - sdk: VideoToolbox.framework + directlyEmbedCarthageDependencies: true