Resolve issue with iOS project search the incorrect folder name for Unity files

Author: Eric Miller

Sources/UBKit/Files/Xcode/SpecFile.swift

@@ -30,26 +30,26 @@ extension File {
      It is specifically indented and formatted in order
      to work once the data is written to the spec file.
      */
-    class func specFile(projectName: String, bundleIdentifier: String, unityVersion: String) -> Data? {
+    class func specFile(iOSProjectName: String, bundleIdentifier: String, unityProjectName: String, unityVersion: String) -> Data? {
         let file = """
-            name: \(projectName)
+            name: \(iOSProjectName)
             configs:
               Debug: debug
               Release: release
             targets:
-              \(projectName):
+              \(iOSProjectName):
                 type: application
                 platform: iOS
                 sources:
-                  - \(projectName)
+                  - \(iOSProjectName)
                   - Vendor
                 settings:
                   PRODUCT_BUNDLE_IDENTIFIER: \(bundleIdentifier)
                   IOS_DEPLOYMENT_TARGET: 11.0
                   IPHONEOS_DEPLOYMENT_TARGET: 11.0
                   UNITY_RUNTIME_VERSION: \(unityVersion)
                   UNITY_SCRIPTING_BACKEND: il2cpp
-                  UNITY_IOS_EXPORT_PATH: ${SRCROOT}/../Unity/\(projectName)/ios_build
+                  UNITY_IOS_EXPORT_PATH: ${SRCROOT}/../Unity/\(unityProjectName)/ios_build
                   GCC_PREFIX_HEADER: $(UNITY_IOS_EXPORT_PATH)/Classes/Prefix.pch
                   OTHER_LDFLAGS: -weak-lSystem -liconv.2 -liPhone-lib -weak_framework CoreMotion -weak_framework iAd -framework OpenGLES 
                   HEADER_SEARCH_PATHS: $(UNITY_IOS_EXPORT_PATH)/Classes $(UNITY_IOS_EXPORT_PATH)/Classes/Native $(UNITY_IOS_EXPORT_PATH)/Libraries/libil2cpp/include
@@ -58,7 +58,7 @@ extension File {
                   OTHER_CFLAGS: $(inherited) -DINIT_SCRIPTING_BACKEND=1 -fno-strict-overflow -DRUNTIME_IL2CPP=1
                   CLANG_CXX_LANGUAGE_STANDARD: c++11
                   CLANG_CXX_LIBRARY: libc++
-                  SWIFT_OBJC_BRIDGING_HEADER: \(projectName)/UnityBridge/UnityBridge.h
+                  SWIFT_OBJC_BRIDGING_HEADER: \(iOSProjectName)/UnityBridge/UnityBridge.h
                   CLANG_ENABLE_MODULES: NO
                   CLANG_WARN_BOOL_CONVERSION: NO
                   CLANG_WARN_CONSTANT_CONVERSION: NO

Sources/UBKit/Workers/XcodeProject.swift

@@ -114,8 +114,9 @@ private extension XcodeProject {
         }
 
         let contents = File.specFile(
-            projectName: config.iOS.projectName,
+            iOSProjectName: config.iOS.projectName,
             bundleIdentifier: config.iOS.bundleId,
+            unityProjectName: config.unity.projectName,
             unityVersion: config.unity.version
         )
 

UnityBuildKit.xcodeproj/UBKit_Info.plist

@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.1.1</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleExecutable</key>
+  <string>$(EXECUTABLE_NAME)</string>
+  <key>CFBundleIdentifier</key>
+  <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>$(PRODUCT_NAME)</string>
+  <key>CFBundlePackageType</key>
+  <string>FMWK</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>$(CURRENT_PROJECT_VERSION)</string>
+  <key>NSPrincipalClass</key>
+  <string></string>
 </dict>
 </plist>