Skip to content

Commit 28192ed

Browse files
author
Eric Miller
committed
Remove refresh action
1 parent 1dc4912 commit 28192ed

File tree

6 files changed

+6
-193
lines changed

6 files changed

+6
-193
lines changed

‎Sources/UBKit/Files/Unity/UnityEditorRefreshScript.swift‎

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

‎Sources/UBKit/UBKit.swift‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ public final class UBKit {
6565
initialize(workingPath: workingPath, completion)
6666
case .generate:
6767
generate(manager: kitManager, completion)
68-
case .refresh:
69-
refresh(manager: kitManager, completion)
7068
}
7169
}
7270

@@ -84,7 +82,8 @@ public final class UBKit {
8482
private extension UBKit {
8583

8684
enum Argument: String {
87-
case initialize = "init", generate, refresh
85+
case initialize = "init"
86+
case generate
8887
}
8988

9089
func initialize(workingPath: String, _ completion: @escaping ((Error?) -> Void)) {
@@ -114,17 +113,6 @@ private extension UBKit {
114113
completion(nil)
115114
}
116115

117-
func refresh(manager: UBKitManager, _ completion: @escaping ((Error?) -> Void)) {
118-
let taskResult = manager.performRefreshTasks()
119-
guard taskResult == .success else {
120-
completion(taskResult.error)
121-
return
122-
}
123-
print("\n----------")
124-
print("👍 Successfully refreshed your iOS project")
125-
completion(nil)
126-
}
127-
128116
func getArgument(for arg: String) -> Argument? {
129117
return Argument(rawValue: arg)
130118
}

‎Sources/UBKit/UBKitManager.swift‎

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -71,27 +71,7 @@ class UBKitManager {
7171
print("\n----------")
7272
print("⚙️ Copying Unity Files")
7373
print("----------")
74-
let copyFilesResult = copyUnityFiles(refresh: false)
75-
guard copyFilesResult == .success else {
76-
return copyFilesResult
77-
}
78-
79-
return .success
80-
}
81-
82-
func performRefreshTasks() -> Result {
83-
print("\n----------")
84-
print("⚙️ Refreshing Xcode project")
85-
print("----------")
86-
let refreshResult = refreshXcodeProject()
87-
guard refreshResult == .success else {
88-
return refreshResult
89-
}
90-
91-
print("\n----------")
92-
print("⚙️ Copying Unity Files")
93-
print("----------")
94-
let copyFilesResult = copyUnityFiles(refresh: true)
74+
let copyFilesResult = copyUnityFiles()
9575
guard copyFilesResult == .success else {
9676
return copyFilesResult
9777
}
@@ -124,17 +104,8 @@ private extension UBKitManager {
124104
return unityProject.create()
125105
}
126106

127-
func copyUnityFiles(refresh: Bool) -> Result {
107+
func copyUnityFiles() -> Result {
128108
let fileCopier = FileCopier(config: config)
129-
return fileCopier.copyFiles(refresh: refresh)
130-
}
131-
}
132-
133-
// MARK: - Refresh
134-
private extension UBKitManager {
135-
136-
func refreshXcodeProject() -> Result {
137-
let unityProject = UnityProject(config: config)
138-
return unityProject.refresh()
109+
return fileCopier.copyFiles()
139110
}
140111
}

‎Sources/UBKit/Workers/FileCopier.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class FileCopier {
5454
self.xcodeProjectFilePath = String(format: "%@%@%@", xcodeProjectPath, config.iOS.projectName, ".xcodeproj")
5555
}
5656

57-
func copyFiles(refresh: Bool) -> Result {
57+
func copyFiles() -> Result {
5858
let parseProjectResult = parseProjectFile()
5959
guard parseProjectResult == .success else {
6060
return parseProjectResult

‎Sources/UBKit/Workers/UnityProject.swift‎

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -75,19 +75,6 @@ class UnityProject {
7575

7676
return .success
7777
}
78-
79-
func refresh() -> Result {
80-
guard UBKit.validatePath(unityAppPath, isDirectory: false) else {
81-
return .failure(UBKitError.invalidFolder(unityAppPath))
82-
}
83-
84-
let refreshResult = refreshProject()
85-
guard refreshResult == .success else {
86-
return refreshResult
87-
}
88-
89-
return .success
90-
}
9178
}
9279

9380
private extension UnityProject {
@@ -156,13 +143,6 @@ private extension UnityProject {
156143
return .failure(UBKitError.unableToCreateFile("Unity iOS Build Script"))
157144
}
158145

159-
guard fileManager.createFile(
160-
atPath: editorFilePath.appending("iOSRefreshScript.cs"),
161-
contents: File.unityRefreshScriptFile(),
162-
attributes: nil) else {
163-
return .failure(UBKitError.unableToCreateFile("Unity iOS Refresh Script"))
164-
}
165-
166146
guard fileManager.createFile(
167147
atPath: editorFilePath.appending("ProjectScript.cs"),
168148
contents: File.unityProjectScriptFile(projectName: projectName, iOSProjectPath: config.iOS.projectPath),
@@ -212,43 +192,4 @@ private extension UnityProject {
212192
return .failure(UBKitError.waitTimedOut)
213193
}
214194
}
215-
216-
func refreshProject() -> Result {
217-
let semaphore = DispatchSemaphore(value: 0)
218-
var statusCode: Int32 = 999
219-
let projectPath = workingPath.appending(projectName)
220-
let outputLocation = projectPath.appending("/").appending("ios_build")
221-
222-
// MARK: - Main
223-
print("Refreshing Unity scenes...")
224-
print("This will take some time to complete\n")
225-
shell.perform(
226-
unityAppPath,
227-
UnityCommandLine.Arguments.batchmode,
228-
UnityCommandLine.Arguments.projectPath,
229-
projectPath,
230-
UnityCommandLine.Arguments.outputLocation,
231-
outputLocation,
232-
UnityCommandLine.Arguments.sceneName,
233-
unitySceneNames.joined(separator: ","),
234-
UnityCommandLine.Arguments.executeMethod,
235-
UnityCommandLine.refreshAction,
236-
UnityCommandLine.Arguments.quit,
237-
terminationHandler: { (process) in
238-
statusCode = process.terminationStatus
239-
semaphore.signal()
240-
})
241-
242-
let timeout = semaphore.wait(timeout: DispatchTime.now()+60.0)
243-
switch timeout {
244-
case .success:
245-
if statusCode == 0 {
246-
return .success
247-
} else {
248-
return .failure(UBKitError.shellCommand("Building Unity Project"))
249-
}
250-
case .timedOut:
251-
return .failure(UBKitError.waitTimedOut)
252-
}
253-
}
254195
}

‎UnityBuildKit.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
/* Begin PBXBuildFile section */
1010
D43456441FA3AD5B00CE9717 /* config.swift in Sources */ = {isa = PBXBuildFile; fileRef = D43456431FA3AD5B00CE9717 /* config.swift */; };
1111
D48370ED1FA9137E00A05A8B /* UnityProjectScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = D48370EB1FA912B200A05A8B /* UnityProjectScript.swift */; };
12-
D489BB601FA8D20800FC1141 /* UnityEditorRefreshScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = D489BB5F1FA8D20800FC1141 /* UnityEditorRefreshScript.swift */; };
1312
OBJ_197 /* Package.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_6 /* Package.swift */; };
1413
OBJ_203 /* Package.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_67 /* Package.swift */; };
1514
OBJ_209 /* Package.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_116 /* Package.swift */; };
@@ -472,7 +471,6 @@
472471
"AEXML::AEXML::Product" /* AEXML.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AEXML.framework; sourceTree = BUILT_PRODUCTS_DIR; };
473472
D43456431FA3AD5B00CE9717 /* config.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = config.swift; sourceTree = "<group>"; };
474473
D48370EB1FA912B200A05A8B /* UnityProjectScript.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnityProjectScript.swift; sourceTree = "<group>"; };
475-
D489BB5F1FA8D20800FC1141 /* UnityEditorRefreshScript.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnityEditorRefreshScript.swift; sourceTree = "<group>"; };
476474
"JSONUtilities::JSONUtilities::Product" /* JSONUtilities.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = JSONUtilities.framework; sourceTree = BUILT_PRODUCTS_DIR; };
477475
OBJ_10 /* File.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = File.swift; sourceTree = "<group>"; };
478476
OBJ_100 /* PBXSourcesBuildPhase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PBXSourcesBuildPhase.swift; sourceTree = "<group>"; };
@@ -761,7 +759,6 @@
761759
isa = PBXGroup;
762760
children = (
763761
OBJ_12 /* UnityEditorBuildScript.swift */,
764-
D489BB5F1FA8D20800FC1141 /* UnityEditorRefreshScript.swift */,
765762
D48370EB1FA912B200A05A8B /* UnityProjectScript.swift */,
766763
);
767764
path = Unity;
@@ -1628,7 +1625,6 @@
16281625
OBJ_285 /* UnityUtilsFile.swift in Sources */,
16291626
OBJ_286 /* AppDelegateFile.swift in Sources */,
16301627
OBJ_287 /* AppIconContentsFile.swift in Sources */,
1631-
D489BB601FA8D20800FC1141 /* UnityEditorRefreshScript.swift in Sources */,
16321628
OBJ_288 /* InfoPlistFile.swift in Sources */,
16331629
OBJ_289 /* LaunchScreenFile.swift in Sources */,
16341630
OBJ_290 /* MainStoryboardFile.swift in Sources */,

0 commit comments

Comments
 (0)