Merge pull request #90 from lvsti/spm-support

Swift package manager support
appsquickly · Jan 23, 2018 · f3234db · f3234db
2 parents 849de69 + 913fa44
commit f3234db
Show file tree

Hide file tree

Showing 34 changed files with 143 additions and 108 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@ xcuserdata
 *.blend2
 *.blend3
 .DS_Store
-build
+build
+.build
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,23 @@
+// swift-tools-version:4.0
+//
+//  Package.swift
+//  XcodeEditor
+//
+
+import PackageDescription
+
+let package = Package(
+    name: "XcodeEditor",
+    products: [
+        .library(name: "XcodeEditor", targets: ["XcodeEditor"]),
+    ],
+    targets: [
+        .target(
+            name: "XcodeEditor",
+            dependencies: [],
+            path: "Source",
+            publicHeadersPath: "Include"
+        ),
+    ],
+    swiftLanguageVersions: [4]
+)
diff --git a/Source/Utils/NSString+RemoveEmoji.h → Source/Include/NSString+RemoveEmoji.h b/Source/Utils/NSString+RemoveEmoji.h → Source/Include/NSString+RemoveEmoji.h
diff --git a/Source/XCAbstractDefinition.h → Source/Include/XCAbstractDefinition.h b/Source/XCAbstractDefinition.h → Source/Include/XCAbstractDefinition.h
diff --git a/Source/XCBuildFile.h → Source/Include/XCBuildFile.h b/Source/XCBuildFile.h → Source/Include/XCBuildFile.h
@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "XcodeMemberType.h"
 
 @protocol XCBuildFile <NSObject>
 

diff --git a/Source/XCBuildShellScript.h → Source/Include/XCBuildShellScript.h b/Source/XCBuildShellScript.h → Source/Include/XCBuildShellScript.h
diff --git a/Source/XCBuildShellScriptDefinition.h → ...ce/Include/XCBuildShellScriptDefinition.h b/Source/XCBuildShellScriptDefinition.h → ...ce/Include/XCBuildShellScriptDefinition.h
diff --git a/Source/XCClassDefinition.h → Source/Include/XCClassDefinition.h b/Source/XCClassDefinition.h → Source/Include/XCClassDefinition.h
diff --git a/Source/XCFileOperationQueue.h → Source/Include/XCFileOperationQueue.h b/Source/XCFileOperationQueue.h → Source/Include/XCFileOperationQueue.h
diff --git a/Source/XCFrameworkDefinition.h → Source/Include/XCFrameworkDefinition.h b/Source/XCFrameworkDefinition.h → Source/Include/XCFrameworkDefinition.h
diff --git a/Source/XCGroup.h → Source/Include/XCGroup.h b/Source/XCGroup.h → Source/Include/XCGroup.h
diff --git a/Source/Utils/XCKeyBuilder.h → Source/Include/XCKeyBuilder.h b/Source/Utils/XCKeyBuilder.h → Source/Include/XCKeyBuilder.h
diff --git a/Source/XCProject+SubProject.h → Source/Include/XCProject+SubProject.h b/Source/XCProject+SubProject.h → Source/Include/XCProject+SubProject.h
diff --git a/Source/XCProject.h → Source/Include/XCProject.h b/Source/XCProject.h → Source/Include/XCProject.h
diff --git a/Source/XCProjectBuildConfig.h → Source/Include/XCProjectBuildConfig.h b/Source/XCProjectBuildConfig.h → Source/Include/XCProjectBuildConfig.h
diff --git a/Source/XCSourceFile.h → Source/Include/XCSourceFile.h b/Source/XCSourceFile.h → Source/Include/XCSourceFile.h
diff --git a/Source/XCSourceFileDefinition.h → Source/Include/XCSourceFileDefinition.h b/Source/XCSourceFileDefinition.h → Source/Include/XCSourceFileDefinition.h
diff --git a/Source/XCSubProjectDefinition.h → Source/Include/XCSubProjectDefinition.h b/Source/XCSubProjectDefinition.h → Source/Include/XCSubProjectDefinition.h
diff --git a/Source/XCTarget.h → Source/Include/XCTarget.h b/Source/XCTarget.h → Source/Include/XCTarget.h
diff --git a/Source/XCVersionGroup.h → Source/Include/XCVersionGroup.h b/Source/XCVersionGroup.h → Source/Include/XCVersionGroup.h
diff --git a/Source/XCXibDefinition.h → Source/Include/XCXibDefinition.h b/Source/XCXibDefinition.h → Source/Include/XCXibDefinition.h
diff --git a/Source/XcodeEditor.h → Source/Include/XcodeEditor.h b/Source/XcodeEditor.h → Source/Include/XcodeEditor.h
@@ -9,7 +9,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
 
 //! Project version number for XcodeEditor.
 FOUNDATION_EXPORT double XcodeEditorVersionNumber;
@@ -36,4 +36,4 @@ FOUNDATION_EXPORT const unsigned char XcodeEditorVersionString[];
 #import "XCProjectBuildConfig.h"
 #import "XCBuildShellScript.h"
 #import "XCBuildShellScriptDefinition.h"
-#import "XCVersionGroup.h"
+#import "XCVersionGroup.h"
diff --git a/Source/XcodeGroupMember.h → Source/Include/XcodeGroupMember.h b/Source/XcodeGroupMember.h → Source/Include/XcodeGroupMember.h
diff --git a/Source/XcodeMemberType.h → Source/Include/XcodeMemberType.h b/Source/XcodeMemberType.h → Source/Include/XcodeMemberType.h
diff --git a/Source/XcodeSourceFileType.h → Source/Include/XcodeSourceFileType.h b/Source/XcodeSourceFileType.h → Source/Include/XcodeSourceFileType.h
diff --git a/Source/XcodeSourceTreeType.h → Source/Include/XcodeSourceTreeType.h b/Source/XcodeSourceTreeType.h → Source/Include/XcodeSourceTreeType.h
diff --git a/Source/Resources/XcodeEditor-Prefix.pch b/Source/Resources/XcodeEditor-Prefix.pch
@@ -4,7 +4,7 @@
 
 #ifdef __OBJC__
 
-#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
 
 #endif
 

diff --git a/Source/XCGroup.m b/Source/XCGroup.m
@@ -19,7 +19,7 @@
 #import "XCGroup.h"
 #import "XCProject.h"
 #import "XCClassDefinition.h"
-#import "Utils/XCKeyBuilder.h"
+#import "XCKeyBuilder.h"
 #import "XCSourceFileDefinition.h"
 #import "XCSubProjectDefinition.h"
 #import "XCProject+SubProject.h"

diff --git a/Source/XCProject+SubProject.m b/Source/XCProject+SubProject.m
@@ -13,7 +13,7 @@
 
 #import "XCSourceFile.h"
 #import "XCTarget.h"
-#import "Utils/XCKeyBuilder.h"
+#import "XCKeyBuilder.h"
 #import "XCProject+SubProject.h"
 #import "XCSubProjectDefinition.h"
 #import <Foundation/Foundation.h>
@@ -375,4 +375,4 @@ - (void)removeTargetDependencies:(NSString *)name
     [[self objects] removeObjectForKey:targetDependencyKey];
 }
 
-@end
+@end
diff --git a/Source/XCProject.m b/Source/XCProject.m
@@ -290,7 +290,7 @@ - (XCGroup *)groupWithPathFromRoot:(NSString *)path
     for (NSString *pathItem in pathItems) {
         id <XcodeGroupMember> group = [currentGroup memberWithDisplayName:pathItem];
         if ([group isKindOfClass:[XCGroup class]]) {
-            currentGroup = group;
+            currentGroup = (XCGroup*)group;
         } else {
             return nil;
         }

diff --git a/Source/XCSourceFile.m b/Source/XCSourceFile.m
@@ -13,7 +13,7 @@
 
 #import "XCSourceFile.h"
 #import "XCProject.h"
-#import "Utils/XCKeyBuilder.h"
+#import "XCKeyBuilder.h"
 #import "XCGroup.h"
 #import "XCTarget.h"
 

diff --git a/Source/XCVersionGroup.m b/Source/XCVersionGroup.m
@@ -11,7 +11,7 @@
 #import "XCFileOperationQueue.h"
 #import "XCSourceFile.h"
 #import "XCProject.h"
-#import "Utils/XCKeyBuilder.h"
+#import "XCKeyBuilder.h"
 #import "XCSourceFileDefinition.h"
 #import "XCProject+SubProject.h"
 

diff --git a/XcodeEditor.podspec b/XcodeEditor.podspec
@@ -7,8 +7,8 @@ Pod::Spec.new do |s|
   s.author   = { 'Jasper Blues' => '[email protected]' }
   s.source   = { :git => 'https://github.com/jasperblues/XcodeEditor.git', :tag => 'v1.6.4' }
   s.platform = :osx
-  s.source_files = 'Source/*.{h,m}', 'Source/Utils/*.{h,m}'
+  s.source_files = 'Source/*.{h,m}', 'Source/Utils/*.{h,m}', 'Source/Include/*.{h,m}'
   s.requires_arc = true
   s.ios.deployment_target = '5.0'
-  s.osx.deployment_target = '10.7'
+  s.osx.deployment_target = '10.8'
 end
diff --git a/XcodeEditor.xcodeproj/project.pbxproj b/XcodeEditor.xcodeproj/project.pbxproj
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ @@
     //
     #import <Foundation/Foundation.h>
+    #import "XcodeMemberType.h"
     @protocol XCBuildFile <NSObject>
@@ Expand Down @@