Skip to content

Commit c2fc52c

Browse files
author
Eric Miller
committed
Update console logs while building projects
1 parent 283ab9d commit c2fc52c

File tree

7 files changed

+27
-164
lines changed

7 files changed

+27
-164
lines changed

Sources/UBKit/Files/Config/config.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ extension File {
3838
"applicationPath": "<path_to_Unity>",
3939
"version": "",
4040
"projectPath": "",
41-
"unity_scene_name": ""
41+
"sceneNames": [
42+
""
43+
]
4244
}
4345
}
4446
""".data(using: .utf8)

Sources/UBKit/Files/Unity/UnityEditorScript.swift renamed to Sources/UBKit/Files/Unity/UnityEditorBuildScript.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// UnityEditorScript.swift
2+
// UnityEditorBuildScript.swift
33
//
44
// Copyright (c) 2017 Handsome
55
//

Sources/UBKit/UBKit.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ private extension UBKit {
111111

112112
print("\n----------")
113113
print("👍 Successfully created your iOS and Unity projects")
114-
print("The iOS project is located under iOS/")
115-
print("The Unity project is located under Unity/")
116114
completion(nil)
117115
}
118116

Sources/UBKit/UBKitManager.swift

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class UBKitManager {
4040

4141
func performInitializeTasks() -> Result {
4242
print("\n----------")
43-
print("Initializing")
43+
print("⚙️ Initializing")
4444
print("----------")
4545

4646
let initResult = initializeConfiguration()
@@ -53,43 +53,43 @@ class UBKitManager {
5353

5454
func performGenerateTasks() -> Result {
5555
print("\n----------")
56-
print("Creating iOS Project")
56+
print("⚙️ Creating iOS Project")
5757
print("----------")
5858
let iOSGenerationResult = createiOSProject()
5959
guard iOSGenerationResult == .success else {
6060
return iOSGenerationResult
6161
}
6262

63-
print("\n----------")
64-
print("Creating Unity Project")
65-
print("----------")
66-
let unityGenerationResult = createUnityProject()
67-
guard unityGenerationResult == .success else {
68-
return unityGenerationResult
69-
}
70-
71-
print("\n----------")
72-
print("Copying Unity Files")
73-
print("----------")
74-
let copyFilesResult = copyUnityFiles(refresh: false)
75-
guard copyFilesResult == .success else {
76-
return copyFilesResult
77-
}
63+
// print("\n----------")
64+
// print("⚙️ Creating Unity Project")
65+
// print("----------")
66+
// let unityGenerationResult = createUnityProject()
67+
// guard unityGenerationResult == .success else {
68+
// return unityGenerationResult
69+
// }
70+
//
71+
// print("\n----------")
72+
// print("⚙️ Copying Unity Files")
73+
// print("----------")
74+
// let copyFilesResult = copyUnityFiles(refresh: false)
75+
// guard copyFilesResult == .success else {
76+
// return copyFilesResult
77+
// }
7878

7979
return .success
8080
}
8181

8282
func performRefreshTasks() -> Result {
8383
print("\n----------")
84-
print("Refreshing Xcode project")
84+
print("⚙️ Refreshing Xcode project")
8585
print("----------")
8686
let refreshResult = refreshXcodeProject()
8787
guard refreshResult == .success else {
8888
return refreshResult
8989
}
9090

9191
print("\n----------")
92-
print("Copying Unity Files")
92+
print("⚙️ Copying Unity Files")
9393
print("----------")
9494
let copyFilesResult = copyUnityFiles(refresh: true)
9595
guard copyFilesResult == .success else {

Sources/UBKit/Workers/ProjectRefresher.swift

Lines changed: 0 additions & 128 deletions
This file was deleted.

Sources/UBKit/Workers/XcodeGenerator.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ private extension XcodeGenerator {
5454
let spec: ProjectSpec
5555
do {
5656
spec = try SpecLoader.loadSpec(path: specPath)
57-
print("\n📋 Loaded spec:\n \(spec.debugDescription.replacingOccurrences(of: "\n", with: "\n "))")
58-
5957
} catch let error as JSONUtilities.DecodingError {
6058
return .failure(error)
6159
} catch {
@@ -65,11 +63,8 @@ private extension XcodeGenerator {
6563
do {
6664
let projectGenerator = ProjectGenerator(spec: spec)
6765
let project = try projectGenerator.generateProject()
68-
print("⚙️ Generated project")
69-
7066
let projectFile = projectPath + "\(spec.name).xcodeproj"
7167
try project.write(path: projectFile, override: true)
72-
print("💾 Saved project to \(projectFile.string)")
7368

7469
} catch let error as SpecValidationError {
7570
return .failure(error)

UnityBuildKit.xcodeproj/project.pbxproj

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
OBJ_255 /* Spectre.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "Spectre::Spectre::Product" /* Spectre.framework */; };
3030
OBJ_256 /* JSONUtilities.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "JSONUtilities::JSONUtilities::Product" /* JSONUtilities.framework */; };
3131
OBJ_281 /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_10 /* File.swift */; };
32-
OBJ_282 /* UnityEditorScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_12 /* UnityEditorScript.swift */; };
32+
OBJ_282 /* UnityEditorBuildScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_12 /* UnityEditorBuildScript.swift */; };
3333
OBJ_283 /* BridgeHeaderFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_14 /* BridgeHeaderFile.swift */; };
3434
OBJ_284 /* MessageBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_15 /* MessageBridge.swift */; };
3535
OBJ_285 /* UnityUtilsFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_16 /* UnityUtilsFile.swift */; };
@@ -48,7 +48,6 @@
4848
OBJ_298 /* UBKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_31 /* UBKit.swift */; };
4949
OBJ_299 /* UBKitManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_32 /* UBKitManager.swift */; };
5050
OBJ_300 /* FileCopier.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_34 /* FileCopier.swift */; };
51-
OBJ_301 /* ProjectRefresher.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_35 /* ProjectRefresher.swift */; };
5251
OBJ_302 /* UnityProject.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_36 /* UnityProject.swift */; };
5352
OBJ_303 /* XcodeGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_37 /* XcodeGenerator.swift */; };
5453
OBJ_304 /* XcodeProject.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_38 /* XcodeProject.swift */; };
@@ -493,7 +492,7 @@
493492
OBJ_116 /* Package.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; name = Package.swift; path = "/Users/xero/Documents/Handsome/Projects/UnityBuildKit/.build/checkouts/xcproj.git-1047381684203639720/Package.swift"; sourceTree = "<group>"; };
494493
OBJ_118 /* Package.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; name = Package.swift; path = "/Users/xero/Documents/Handsome/Projects/UnityBuildKit/.build/checkouts/AEXML.git--1992474868199569405/Package.swift"; sourceTree = "<group>"; };
495494
OBJ_119 /* Document.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Document.swift; sourceTree = "<group>"; };
496-
OBJ_12 /* UnityEditorScript.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnityEditorScript.swift; sourceTree = "<group>"; };
495+
OBJ_12 /* UnityEditorBuildScript.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnityEditorBuildScript.swift; sourceTree = "<group>"; };
497496
OBJ_120 /* Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Element.swift; sourceTree = "<group>"; };
498497
OBJ_121 /* Error.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Error.swift; sourceTree = "<group>"; };
499498
OBJ_122 /* Options.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Options.swift; sourceTree = "<group>"; };
@@ -563,7 +562,6 @@
563562
OBJ_31 /* UBKit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UBKit.swift; sourceTree = "<group>"; };
564563
OBJ_32 /* UBKitManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UBKitManager.swift; sourceTree = "<group>"; };
565564
OBJ_34 /* FileCopier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileCopier.swift; sourceTree = "<group>"; };
566-
OBJ_35 /* ProjectRefresher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProjectRefresher.swift; sourceTree = "<group>"; };
567565
OBJ_36 /* UnityProject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnityProject.swift; sourceTree = "<group>"; };
568566
OBJ_37 /* XcodeGenerator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XcodeGenerator.swift; sourceTree = "<group>"; };
569567
OBJ_38 /* XcodeProject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XcodeProject.swift; sourceTree = "<group>"; };
@@ -760,7 +758,7 @@
760758
OBJ_11 /* Unity */ = {
761759
isa = PBXGroup;
762760
children = (
763-
OBJ_12 /* UnityEditorScript.swift */,
761+
OBJ_12 /* UnityEditorBuildScript.swift */,
764762
D489BB5F1FA8D20800FC1141 /* UnityEditorRefreshScript.swift */,
765763
);
766764
path = Unity;
@@ -958,7 +956,6 @@
958956
isa = PBXGroup;
959957
children = (
960958
OBJ_34 /* FileCopier.swift */,
961-
OBJ_35 /* ProjectRefresher.swift */,
962959
OBJ_36 /* UnityProject.swift */,
963960
OBJ_37 /* XcodeGenerator.swift */,
964961
OBJ_38 /* XcodeProject.swift */,
@@ -1622,7 +1619,7 @@
16221619
buildActionMask = 0;
16231620
files = (
16241621
OBJ_281 /* File.swift in Sources */,
1625-
OBJ_282 /* UnityEditorScript.swift in Sources */,
1622+
OBJ_282 /* UnityEditorBuildScript.swift in Sources */,
16261623
OBJ_283 /* BridgeHeaderFile.swift in Sources */,
16271624
OBJ_284 /* MessageBridge.swift in Sources */,
16281625
OBJ_285 /* UnityUtilsFile.swift in Sources */,
@@ -1643,7 +1640,6 @@
16431640
OBJ_298 /* UBKit.swift in Sources */,
16441641
OBJ_299 /* UBKitManager.swift in Sources */,
16451642
OBJ_300 /* FileCopier.swift in Sources */,
1646-
OBJ_301 /* ProjectRefresher.swift in Sources */,
16471643
OBJ_302 /* UnityProject.swift in Sources */,
16481644
OBJ_303 /* XcodeGenerator.swift in Sources */,
16491645
OBJ_304 /* XcodeProject.swift in Sources */,

0 commit comments

Comments
 (0)