diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig index c4855bf..f4df79c 100644 --- a/ios/Flutter/Release.xcconfig +++ b/ios/Flutter/Release.xcconfig @@ -1,2 +1,3 @@ #include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig" #include "Generated.xcconfig" diff --git a/ios/Podfile b/ios/Podfile index 5d774a2..f8e1b20 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -38,41 +38,60 @@ platform :ios, '12.0' target 'RunnerTests' do inherit! :search_paths end - end - post_install do |installer| - installer.pods_project.targets.each do |target| - flutter_additional_ios_build_settings(target) + # 添加UnityLibrary的特殊配置 + post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_ios_build_settings(target) - # 为所有目标添加必要的iOS设置 - target.build_configurations.each do |config| - config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0' + # Unity资源复制配置 + if target.name == 'UnityLibrary' + target.build_phases.each do |phase| + if phase.respond_to?(:name) && phase.name == 'Copy Bundle Resources' + phase.files_references.uniq! + end + end + end - # 禁用位码 - config.build_settings['ENABLE_BITCODE'] = 'NO' + # 为所有目标添加必要的iOS设置 + target.build_configurations.each do |config| + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0' - # Unity相关设置 - if ['flutter_unity_widget', 'UnityLibrary'].include?(target.name) - config.build_settings['SWIFT_INCLUDE_PATHS'] = [ - '${PODS_ROOT}/../UnityLibrary', - '${PODS_ROOT}/../UnityLibrary/UnityFramework' - ] - config.build_settings['HEADER_SEARCH_PATHS'] ||= ['$(inherited)'] - config.build_settings['HEADER_SEARCH_PATHS'] += [ - '${PODS_ROOT}/../UnityLibrary', - '${PODS_ROOT}/../UnityLibrary/UnityFramework' - ] - config.build_settings['FRAMEWORK_SEARCH_PATHS'] ||= ['$(inherited)'] - config.build_settings['FRAMEWORK_SEARCH_PATHS'] += [ - '${PODS_ROOT}/../UnityLibrary', - '${PODS_ROOT}/../UnityLibrary/Classes' - ] - - # 添加其他必要的编译设置 - config.build_settings['CLANG_ENABLE_MODULES'] = 'YES' - config.build_settings['SWIFT_VERSION'] = '5.0' - config.build_settings['ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES'] = 'YES' - end - end - end -end \ No newline at end of file + # 禁用位码 + config.build_settings['ENABLE_BITCODE'] = 'NO' + + # Unity和Flutter集成配置 + if ['flutter_unity_widget', 'UnityLibrary'].include?(target.name) + config.build_settings['CLANG_ENABLE_MODULES'] = 'YES' + config.build_settings['DEFINES_MODULE'] = 'YES' + config.build_settings['SWIFT_INCLUDE_PATHS'] = [ + '$(inherited)', + '${PODS_ROOT}/../UnityLibrary', + '${PODS_ROOT}/../UnityLibrary/UnityFramework' + ] + + config.build_settings['HEADER_SEARCH_PATHS'] = [ + '$(inherited)', + '${PODS_ROOT}/../UnityLibrary', + '${PODS_ROOT}/../UnityLibrary/UnityFramework', + '${PODS_ROOT}/../UnityLibrary/Classes' + ] + + config.build_settings['FRAMEWORK_SEARCH_PATHS'] = [ + '$(inherited)', + '${PODS_ROOT}/../UnityLibrary', + '${PODS_ROOT}/../UnityLibrary/Frameworks' + ] + + # 模块相关设置 + config.build_settings['MODULEMAP_FILE'] = '${PODS_ROOT}/../UnityLibrary/UnityFramework/module.modulemap' + config.build_settings['PRODUCT_MODULE_NAME'] = 'UnityFramework' + + # 其他必要设置 + config.build_settings['SWIFT_VERSION'] = '5.0' + config.build_settings['ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES'] = 'YES' + end + end + end + end + end \ No newline at end of file diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 626ccfa..2bf7bdc 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -153,6 +153,6 @@ SPEC CHECKSUMS: webview_flutter_wkwebview: 3a409e0c27995945d2dabd90079927fba5c34492 WechatOpenSDK-XCFramework: 36fb2bea0754266c17184adf4963d7e6ff98b69f -PODFILE CHECKSUM: 8f767fafe8304b39e52d1e815904de759f5f4345 +PODFILE CHECKSUM: 76020ffc6aa8728c1d156bda1d337c53368f198a COCOAPODS: 1.16.2 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 12bd2de..6606d57 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -10,12 +10,12 @@ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 409FC936441D7742C8357B33 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 842CEF71C8F47ECCE720D5F3 /* Pods_RunnerTests.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; - 80CD928F836F90DE8948AA5D /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 56FEDF5A214EBBA50476FBE8 /* Pods_RunnerTests.framework */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - FA99B03F9B3F5CE94B6A1C63 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F820B9BDD70FAEB1206B4A9D /* Pods_Runner.framework */; }; + C2EE1A1EE168C2401A35E149 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 32BB6F0F48D73BBD5CCCDF67 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -166,6 +166,27 @@ remoteGlobalIDString = 9D25AB9D213FB47800354C27; remoteInfo = UnityFramework; }; + 10FC151D2DDB3CB40055C18A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 10FC120B2DDB3B2C0055C18A /* Unity-iPhone.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1D6058910D05DD3D006BFB54; + remoteInfo = "Unity-iPhone"; + }; + 10FC151F2DDB3CB40055C18A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 10FC120B2DDB3B2C0055C18A /* Unity-iPhone.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 5623C57317FDCB0800090B9E; + remoteInfo = "Unity-iPhone Tests"; + }; + 10FC15212DDB3CB40055C18A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 10FC120B2DDB3B2C0055C18A /* Unity-iPhone.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 9D25AB9D213FB47800354C27; + remoteInfo = UnityFramework; + }; 331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 97C146E61CF9000F007C117D /* Project object */; @@ -189,36 +210,37 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 0653757BBE166222BE06A248 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - 0DD766A9D228AFE4EE7C5000 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 104802882DD5E90C00D28557 /* Unity-iPhone.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = "Unity-iPhone.xcodeproj"; sourceTree = ""; }; 104837DD2DD5F00200D28557 /* Unity-iPhone.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = "Unity-iPhone.xcodeproj"; sourceTree = ""; }; 1048471F2DD5F83C00D28557 /* Unity-iPhone.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = "Unity-iPhone.xcodeproj"; sourceTree = ""; }; 10484EC62DD6E54A00D28557 /* Unity-iPhone.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = "Unity-iPhone.xcodeproj"; sourceTree = ""; }; - 106CB23C63BFEB14E6D747F8 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; 10D461DC2DD5965F004AD299 /* Unity-iPhone.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = "Unity-iPhone.xcodeproj"; sourceTree = ""; }; 10D480402DD5D629004AD299 /* Unity-iPhone.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = "Unity-iPhone.xcodeproj"; sourceTree = ""; }; 10D4865C2DD5D8F8004AD299 /* Unity-iPhone.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = "Unity-iPhone.xcodeproj"; sourceTree = ""; }; + 10FC120B2DDB3B2C0055C18A /* Unity-iPhone.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = "Unity-iPhone.xcodeproj"; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 1BDD773B56E03A04D7253A98 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; + 32BB6F0F48D73BBD5CCCDF67 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 56FEDF5A214EBBA50476FBE8 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 5B0C987C29D6C8AFCB1BDAC7 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + 730B6A8C81B3AC0823412A2A /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 790F946CC13AC288D660FAAE /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 7E8250EC5DB1DD481DDE4E75 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + 842CEF71C8F47ECCE720D5F3 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - 9A108614F75E84BA12F9953C /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; BDA79C6A8675015EB2FD4E55 /* Runner.entitlements */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = ""; }; - E1BFA1DCF0CA7E79BA268AA3 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; - F820B9BDD70FAEB1206B4A9D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + C3FC7A2AA57222C60183428D /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + D47A8FB00115C8386F63CB24 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ @@ -261,7 +283,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 80CD928F836F90DE8948AA5D /* Pods_RunnerTests.framework in Frameworks */, + 409FC936441D7742C8357B33 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -269,7 +291,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - FA99B03F9B3F5CE94B6A1C63 /* Pods_Runner.framework in Frameworks */, + C2EE1A1EE168C2401A35E149 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -346,15 +368,25 @@ name = Products; sourceTree = ""; }; + 10FC120E2DDB3B2C0055C18A /* Products */ = { + isa = PBXGroup; + children = ( + 10FC151E2DDB3CB40055C18A /* Unity-Target-New.app */, + 10FC15202DDB3CB40055C18A /* Unity-iPhone Tests.xctest */, + 10FC15222DDB3CB40055C18A /* UnityFramework.framework */, + ); + name = Products; + sourceTree = ""; + }; 223CF56C1D4EECDCB9C3A498 /* Pods */ = { isa = PBXGroup; children = ( - 790F946CC13AC288D660FAAE /* Pods-Runner.debug.xcconfig */, - 0DD766A9D228AFE4EE7C5000 /* Pods-Runner.release.xcconfig */, - 0653757BBE166222BE06A248 /* Pods-Runner.profile.xcconfig */, - 9A108614F75E84BA12F9953C /* Pods-RunnerTests.debug.xcconfig */, - E1BFA1DCF0CA7E79BA268AA3 /* Pods-RunnerTests.release.xcconfig */, - 106CB23C63BFEB14E6D747F8 /* Pods-RunnerTests.profile.xcconfig */, + D47A8FB00115C8386F63CB24 /* Pods-Runner.debug.xcconfig */, + 730B6A8C81B3AC0823412A2A /* Pods-Runner.release.xcconfig */, + C3FC7A2AA57222C60183428D /* Pods-Runner.profile.xcconfig */, + 5B0C987C29D6C8AFCB1BDAC7 /* Pods-RunnerTests.debug.xcconfig */, + 7E8250EC5DB1DD481DDE4E75 /* Pods-RunnerTests.release.xcconfig */, + 1BDD773B56E03A04D7253A98 /* Pods-RunnerTests.profile.xcconfig */, ); path = Pods; sourceTree = ""; @@ -367,11 +399,11 @@ path = RunnerTests; sourceTree = ""; }; - 8FFA730E3C5610A106B5EF5B /* Frameworks */ = { + 556FF66A37421D33E3BDAF43 /* Frameworks */ = { isa = PBXGroup; children = ( - F820B9BDD70FAEB1206B4A9D /* Pods_Runner.framework */, - 56FEDF5A214EBBA50476FBE8 /* Pods_RunnerTests.framework */, + 32BB6F0F48D73BBD5CCCDF67 /* Pods_Runner.framework */, + 842CEF71C8F47ECCE720D5F3 /* Pods_RunnerTests.framework */, ); name = Frameworks; sourceTree = ""; @@ -396,7 +428,7 @@ 97C146EF1CF9000F007C117D /* Products */, 331C8082294A63A400263BE5 /* RunnerTests */, 223CF56C1D4EECDCB9C3A498 /* Pods */, - 8FFA730E3C5610A106B5EF5B /* Frameworks */, + 556FF66A37421D33E3BDAF43 /* Frameworks */, ); sourceTree = ""; }; @@ -431,7 +463,7 @@ isa = PBXNativeTarget; buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - D8A84C5698F5212D52B3E6CE /* [CP] Check Pods Manifest.lock */, + 593A7C2560C7ACFD965A03BE /* [CP] Check Pods Manifest.lock */, 331C807D294A63A400263BE5 /* Sources */, 331C807F294A63A400263BE5 /* Resources */, 177D62B05D772BEC6FB899EF /* Frameworks */, @@ -453,15 +485,15 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - B946B66C9B94CB79D2F5F041 /* [CP] Check Pods Manifest.lock */, + C5EEEC111B879362F5B83214 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 4D8E272C4DCAD53F9D32BE78 /* [CP] Embed Pods Frameworks */, - 5BF3404375E285CA4ABCC894 /* [CP] Copy Pods Resources */, + E9F277DA3FB31FEFCDE9E81E /* [CP] Embed Pods Frameworks */, + AC91F7B92F5FC5E0AEABBC62 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -511,6 +543,10 @@ ProductGroup = 10484EC92DD6E54A00D28557 /* Products */; ProjectRef = 10484EC62DD6E54A00D28557 /* Unity-iPhone.xcodeproj */; }, + { + ProductGroup = 10FC120E2DDB3B2C0055C18A /* Products */; + ProjectRef = 10FC120B2DDB3B2C0055C18A /* Unity-iPhone.xcodeproj */; + }, { ProductGroup = 10D4865E2DD5D8F8004AD299 /* Products */; ProjectRef = 10D4865C2DD5D8F8004AD299 /* Unity-iPhone.xcodeproj */; @@ -699,6 +735,28 @@ remoteRef = 10D487EC2DD5D92B004AD299 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 10FC151E2DDB3CB40055C18A /* Unity-Target-New.app */ = { + isa = PBXReferenceProxy; + fileType = wrapper.application; + name = "Unity-Target-New.app"; + path = arTourismFlutterUnity.app; + remoteRef = 10FC151D2DDB3CB40055C18A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 10FC15202DDB3CB40055C18A /* Unity-iPhone Tests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "Unity-iPhone Tests.xctest"; + remoteRef = 10FC151F2DDB3CB40055C18A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 10FC15222DDB3CB40055C18A /* UnityFramework.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = UnityFramework.framework; + remoteRef = 10FC15212DDB3CB40055C18A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -739,38 +797,26 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 4D8E272C4DCAD53F9D32BE78 /* [CP] Embed Pods Frameworks */ = { + 593A7C2560C7ACFD965A03BE /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 5BF3404375E285CA4ABCC894 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; 9740EEB61CF901F6004384FC /* Run Script */ = { @@ -788,7 +834,24 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - B946B66C9B94CB79D2F5F041 /* [CP] Check Pods Manifest.lock */ = { + AC91F7B92F5FC5E0AEABBC62 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + C5EEEC111B879362F5B83214 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -810,26 +873,21 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - D8A84C5698F5212D52B3E6CE /* [CP] Check Pods Manifest.lock */ = { + E9F277DA3FB31FEFCDE9E81E /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -939,10 +997,10 @@ baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_MODULES = "$(inherited)"; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - ENABLE_BITCODE = NO; + ENABLE_BITCODE = "$(inherited)"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/UnityLibrary/Frameworks/com.easyar.sense/Runtime/BindingNR/Apple/iOS/ios-arm64", @@ -967,7 +1025,7 @@ }; 331C8088294A63A400263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9A108614F75E84BA12F9953C /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = 5B0C987C29D6C8AFCB1BDAC7 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -994,7 +1052,7 @@ }; 331C8089294A63A400263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E1BFA1DCF0CA7E79BA268AA3 /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = 7E8250EC5DB1DD481DDE4E75 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -1019,7 +1077,7 @@ }; 331C808A294A63A400263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 106CB23C63BFEB14E6D747F8 /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = 1BDD773B56E03A04D7253A98 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -1158,10 +1216,10 @@ baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_MODULES = "$(inherited)"; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - ENABLE_BITCODE = NO; + ENABLE_BITCODE = "$(inherited)"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/UnityLibrary/Frameworks/com.easyar.sense/Runtime/BindingNR/Apple/iOS/ios-arm64", @@ -1190,10 +1248,10 @@ baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_MODULES = "$(inherited)"; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - ENABLE_BITCODE = NO; + ENABLE_BITCODE = "$(inherited)"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/UnityLibrary/Frameworks/com.easyar.sense/Runtime/BindingNR/Apple/iOS/ios-arm64", diff --git a/ios/UnityLibrary/UnityFramework/module.modulemap b/ios/UnityLibrary/UnityFramework/module.modulemap index 5ea3947..1dcc092 100644 --- a/ios/UnityLibrary/UnityFramework/module.modulemap +++ b/ios/UnityLibrary/UnityFramework/module.modulemap @@ -1,6 +1,14 @@ framework module UnityFramework { umbrella header "UnityFramework.h" - export * - module * { export * } - link framework "UnityFramework" + + module * { + export * + } + + explicit module Framework { + header "UnityFramework.h" + export * + } + + requires objc }