Merge pull request #42 from jensmeder/2.0.0-alpha1

Replace Objective-C with Swift code

.swift-version

@@ -0,0 +1 @@
+3.1

.travis.yml

@@ -1,6 +1,6 @@
-language: objective-c
-osx_image: xcode7.3
+language: swift
+osx_image: xcode8.3
 script:
-  - xctool -project DarkLightning.xcodeproj -scheme OSX build test -sdk macosx GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES
+  - xcodebuild -project DarkLightning.xcodeproj -scheme OSX -sdk macosx -enableCodeCoverage YES clean build test
 after_success:
 - bash <(curl -s https://codecov.io/bash)

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 `DarkLightning` adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.0.0-alpha1
+
+### What's new
+
+* Completely rewritten in Swift
+* All new OOP interface with protocols
+
+### Known issues
+
+* No Objective-C support yet
+* No iOS / tvOS simulator support yet
+
 ## 1.0.3
 
 ### Bugfix

DarkLightning.podspec

@@ -1,9 +1,9 @@
 Pod::Spec.new do |s|
   	s.name             = "DarkLightning"
-  	s.version          = "1.0.3"
+  	s.version          = "2.0.0-alpha1"
   	s.summary          = "Simply the fastest way to transmit data between iOS/tvOS and OSX"
   	s.description      = <<-DESC
-  	DarkLightning is a lightweight Objective-C library to allow data transmission between iOS/tvOS devices (Lightning port, Dock connector, USB-C) and OSX (USB) at 480MBit. 
+  	DarkLightning is a lightweight Swift library to allow data transmission between iOS/tvOS devices (Lightning port, Dock connector, USB-C) and OSX (USB) at 480MBit. 
                        DESC
 
   	s.homepage         = "https://github.com/jensmeder/DarkLightning"
@@ -13,42 +13,27 @@ Pod::Spec.new do |s|
 
   	s.requires_arc = true
   	s.ios.deployment_target = '8.0'
-  	s.osx.deployment_target = '10.9'
+  	s.osx.deployment_target = '10.10'
   	s.tvos.deployment_target = '9.0'
 
 	s.subspec "OSX" do |sp|
 
-		sp.source_files = 'Source/OSX/**/*{h,m,c}','Source/USB/**/*{h,m,c}', 'Source/Sockets/**/*{h,m,c}'
-		sp.platform     = :osx, '10.9'
-
-		sp.dependency 'DarkLightning/PacketProtocol'
+		sp.source_files = 'Sources/Daemon/**/*{swift}', 'Sources/Utils/**/*{swift}', 'Sources/Port/**/*{swift}'
+		sp.platform     = :osx, '10.10'
 
 	end
 
 	s.subspec "iOS" do |sp|
 
-		sp.source_files = 'Source/iOS/**/*{h,m,c}', 'Source/MobileDevicePort/**/*{h,m,c}', 'Source/Sockets/**/*{h,m,c}'
+		sp.source_files = 'Sources/Port/**/*{swift}', 'Sources/Utils/**/*{swift}'
 		sp.platform     = :ios, '8.0'
-
-		sp.dependency 'DarkLightning/PacketProtocol'
 
 	end
 
 	s.subspec "tvOS" do |sp|
 
-		sp.source_files = 'Source/tvOS/**/*{h,m,c}','Source/MobileDevicePort/**/*{h,m,c}', 'Source/Sockets/**/*{h,m,c}'
+		sp.source_files = 'Sources/Port/**/*{swift}', 'Sources/Utils/**/*{swift}'
 		sp.platform     = :tvos, '9.0'
-
-		sp.dependency 'DarkLightning/PacketProtocol'
-
-	end
-
-	s.subspec "PacketProtocol" do |sp|
-
-		sp.source_files = 'Source/PacketProtocol/**/*{h,m,c}'
-		sp.ios.deployment_target = '8.0'
-  		sp.osx.deployment_target = '10.9'
-		sp.tvos.deployment_target = '9.0'
 
 	end
 

DarkLightning.pxproject

@@ -1,49 +1,42 @@
 Phoenx::Project.new do |s|
 
 	s.project_name = "DarkLightning"
-	s.config_files["Debug"] = "Configuration/Shared/debug.xcconfig"
-	s.config_files["Release"] = "Configuration/Shared/release.xcconfig"
+	s.config_files["Debug"] = "Support/Project/Debug.xcconfig"
+	s.config_files["Release"] = "Support/Project/Release.xcconfig"
 
-	s.target "iOS", :framework, :ios, '9.0' do |target|
+	s.target "iOS", :framework, :ios, '8.0' do |target|
 
-		target.config_files["Debug"] = "Configuration/iOS/debug.xcconfig"
-		target.config_files["Release"] = "Configuration/iOS/release.xcconfig"
-		target.support_files = ["Configuration/**/*.{xcconfig,plist}"]
-		target.sources = "Source/Sockets/**/*.{h,m}", "Source/MobileDevicePort/**/*.{h,m}", "Source/PacketProtocol/**/*.{h,m}", "Source/Internal/**/*.{h,m}"
-		target.public_headers = "Source/iOS/**/*.{h}","Source/MobileDevicePort/**/*.{h}", "Source/PacketProtocol/**/*.{h}"
-		target.private_headers = ["Source/Sockets/**/*.{h}"]
+		target.config_files["Debug"] = "Support/iOS/Debug.xcconfig"
+		target.config_files["Release"] = "Support/iOS/Release.xcconfig"
+		target.support_files = ["Support/**/*.{xcconfig,plist}"]
+		target.sources = ["Sources/Port/**/*.{swift}", "Sources/Utils/**/*.{swift}"]
 
 	end
 
-	s.target "OSX", :framework, :osx, '10.11' do |target|
+	s.target "OSX", :framework, :osx, '10.10' do |target|
 
-		target.config_files["Debug"] = "Configuration/OSX/debug.xcconfig"
-		target.config_files["Release"] = "Configuration/OSX/release.xcconfig"
-		target.support_files = ["Configuration/**/*.{xcconfig,plist}"]
-		target.sources = "Source/Sockets/**/*.{h,m}", "Source/USB/**/*.{h,m,c}","Source/PacketProtocol/**/*.{h,m}", "Source/Internal/**/*.{h,m}"
-		target.public_headers = "Source/OSX/**/*.{h}","Source/USB/*.{h}","Source/PacketProtocol/**/*.{h}","Source/USB/Connections/**/*.{h}"
-		target.private_headers = ["Source/Sockets/**/*.{h}", "Source/USB/USBMux/**/*.{h}"]
+		target.config_files["Debug"] = "Support/OSX/Debug.xcconfig"
+		target.config_files["Release"] = "Support/OSX/Release.xcconfig"
+		target.support_files = ["Support/**/*.{xcconfig,plist}"]
+		target.sources = ["Sources/**/*.{swift}"]
 
-		target.test_target "OSX-Tests" do |t|
+		target.test_target "Tests" do |t|
 
-			t.sources = ["Tests/**/*.{h,m,c}"]
-			t.frameworks = ["Frameworks/Kiwi/Kiwi.framework"]
-			t.config_files["Debug"] = "Configuration/OSXTests/debug.xcconfig"
-			t.config_files["Release"] = "Configuration/OSXTests/release.xcconfig"
+			t.sources = ["Tests/**/*.{swift}"]
+			t.config_files["Debug"] = "Support/Tests/Debug.xcconfig"
+			t.config_files["Release"] = "Support/Tests/Release.xcconfig"
 
 		end
 
 	end
 
 	s.target "tvOS", :framework, :tvos, '9.0' do |target|
 
-		target.config_files["Debug"] = "Configuration/tvOS/debug.xcconfig"
-		target.config_files["Release"] = "Configuration/tvOS/release.xcconfig"
-		target.support_files = ["Configuration/**/*.{xcconfig,plist}"]
-		target.sources = "Source/Sockets/**/*.{h,m}", "Source/MobileDevicePort/**/*.{h,m}","Source/PacketProtocol/**/*.{h,m}", "Source/Internal/**/*.{h,m}"
-		target.public_headers = "Source/tvOS/**/*.{h}","Source/MobileDevicePort/**/*.{h}","Source/PacketProtocol/**/*.{h}"
-		target.private_headers = ["Source/Sockets/**/*.{h}"]
+		target.config_files["Debug"] = "Support/tvOS/Debug.xcconfig"
+		target.config_files["Release"] = "Support/tvOS/Release.xcconfig"
+		target.support_files = ["Support/**/*.{xcconfig,plist}"]
+		target.sources = "Sources/Port/**/*.{swift}", "Sources/Utils/**/*.{swift}"
 
 	end
 
-end
+end