Skip to content

Develop #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
enmiller merged 3 commits into from
Feb 1, 2018
Merged

Develop #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d1752f
Fix issue with Unity Data folder creating extraneous folders in Xcode…
Feb 1, 2018
e605cf4
Rev version to 1.1.1
Feb 1, 2018
a88a016
Updating README
Feb 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TOOL_NAME = UnityBuildKit
VERSION = 0.7.0
VERSION = 1.1.1

PREFIX = /usr/local
INSTALL_PATH = $(PREFIX)/bin/$(TOOL_NAME)
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion Sources/UBKit/Files/Unity/UnityEditorBuildScript.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
14 changes: 10 additions & 4 deletions Sources/UBKit/Workers/XcodeProject.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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/")
}
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion UnityBuildKit.xcodeproj/UBKit_Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down