Merge pull request #9 from handsomecode/develop

Develop
handsomecode · Feb 1, 2018 · 432c31d · 432c31d
2 parents 9997f2a + a88a016
commit 432c31d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 TOOL_NAME = UnityBuildKit
-VERSION = 0.7.0
+VERSION = 1.1.1
 
 PREFIX = /usr/local
 INSTALL_PATH = $(PREFIX)/bin/$(TOOL_NAME)

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
     <img src="Assets/ubk_logo.png">
 </p>
 <p align="center">
-    <img src="https://img.shields.io/badge/version-1.1.0-blue.svg?style=flat-square" />
+    <img src="https://img.shields.io/badge/version-1.1.1-blue.svg?style=flat-square" />
     <a href="https://github.com/handsomecode/UnityBuildKit/blob/master/LICENSE">
         <img src="https://img.shields.io/github/license/mashape/apistatus.svg?style=flat-square"/>
     </a>

diff --git a/Sources/UBKit/Files/Unity/UnityEditorBuildScript.swift b/Sources/UBKit/Files/Unity/UnityEditorBuildScript.swift
@@ -67,7 +67,7 @@ extension File {
                 var pbxPath = Path.Combine(iOSProjectRoot, PbxFilePath);
                 pbx.ReadFromFile(pbxPath);
 
-                var folderGuid = pbx.AddFolderReference(Path.Combine(folderRootPath, "Data"), Path.Combine(iOSProjectRoot, DataProjectPath), PBXSourceTree.Absolute);
+                var folderGuid = pbx.AddFolderReference(Path.Combine(folderRootPath, "Data"), DataProjectPath, PBXSourceTree.Absolute);
                 var targetGiud = pbx.TargetGuidByName(iOSProjectName);
                 var resourceGiud = pbx.GetResourcesBuildPhaseByTarget(targetGiud);
                 pbx.AddFileToBuildSection(targetGiud, resourceGiud, folderGuid);

diff --git a/Sources/UBKit/Workers/XcodeProject.swift b/Sources/UBKit/Workers/XcodeProject.swift
@@ -31,6 +31,8 @@ class XcodeProject {
     private let unityVersion: String
     private let projectPath: String
     private let vendorFolderPath: String
+    private let vendorClassesFolderPath: String
+    private let vendorLibrariesFolderPath: String
     private let specFileName: String
     private let bridgingFilesPath: String
 
@@ -45,6 +47,8 @@ class XcodeProject {
 
         self.projectPath = workingPath.appending(projectName).appending("/")
         self.vendorFolderPath = workingPath.appending("Vendor/UBK/")
+        self.vendorClassesFolderPath = vendorFolderPath.appending("Classes")
+        self.vendorLibrariesFolderPath = vendorFolderPath.appending("Libraries")
         self.specFileName = "project.yml"
         self.bridgingFilesPath = projectPath.appending("UnityBridge/")
     }
@@ -80,9 +84,9 @@ class XcodeProject {
             return unityFilesResult
         }
 
-        let unityFolderResult = createUnityVendorFolder()
-        guard unityFolderResult == .success else {
-            return unityFolderResult
+        let unityFoldersResult = createUnityVendorFolders()
+        guard unityFoldersResult == .success else {
+            return unityFoldersResult
         }
 
         let projectGenerationResult = generateXcodeProject()
@@ -211,9 +215,11 @@ private extension XcodeProject {
         }
     }
 
-    func createUnityVendorFolder() -> Result {
+    func createUnityVendorFolders() -> Result {
         do {
             try fileManager.createDirectory(atPath: vendorFolderPath, withIntermediateDirectories: true, attributes: nil)
+            try fileManager.createDirectory(atPath: vendorClassesFolderPath, withIntermediateDirectories: true, attributes: nil)
+            try fileManager.createDirectory(atPath: vendorLibrariesFolderPath, withIntermediateDirectories: true, attributes: nil)
 
             return .success
         } catch {

diff --git a/UnityBuildKit.xcodeproj/UBKit_Info.plist b/UnityBuildKit.xcodeproj/UBKit_Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1</string>
+	<string>1.1.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>