From 412ffc1d63a86da41026e62de3e5c99487f95981 Mon Sep 17 00:00:00 2001 From: zztkm Date: Fri, 10 Jan 2025 12:04:46 +0900 Subject: [PATCH 1/6] =?UTF-8?q?Swift=206=20=E5=AF=BE=E5=BF=9C=E3=81=AE?= =?UTF-8?q?=E3=81=9F=E3=82=81=E3=81=AB=20upcoming=20feature=20=E3=82=92?= =?UTF-8?q?=E6=9C=89=E5=8A=B9=E5=8C=96=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - DisableOutwardActorInference --- Sora.xcodeproj/project.pbxproj | 49 ++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/Sora.xcodeproj/project.pbxproj b/Sora.xcodeproj/project.pbxproj index fdade4e9..e504495c 100644 --- a/Sora.xcodeproj/project.pbxproj +++ b/Sora.xcodeproj/project.pbxproj @@ -9,6 +9,7 @@ /* Begin PBXBuildFile section */ 3591D8EE27014F7C000AD514 /* PackageInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3591D8ED27014F7C000AD514 /* PackageInfo.swift */; }; 3591D8F027032233000AD514 /* SoraDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3591D8EF27032233000AD514 /* SoraDispatcher.swift */; }; + 85356AEF270D06C2A407AED3 /* Pods_Sora.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 808DBC57446C4DD0B8B07A66 /* Pods_Sora.framework */; }; 9100904E1E58B4470099E00E /* VideoView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9100904D1E58B4470099E00E /* VideoView.xib */; }; 910090501E58B5450099E00E /* VideoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9100904F1E58B5450099E00E /* VideoView.swift */; }; 9106C27E1F31A3470019E3C7 /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9106C27D1F31A3470019E3C7 /* Logger.swift */; }; @@ -75,6 +76,8 @@ /* Begin PBXFileReference section */ 3591D8ED27014F7C000AD514 /* PackageInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PackageInfo.swift; sourceTree = ""; }; 3591D8EF27032233000AD514 /* SoraDispatcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SoraDispatcher.swift; sourceTree = ""; }; + 6BB48B62CA701A8DC0314F6F /* Pods-Sora.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Sora.debug.xcconfig"; path = "Target Support Files/Pods-Sora/Pods-Sora.debug.xcconfig"; sourceTree = ""; }; + 808DBC57446C4DD0B8B07A66 /* Pods_Sora.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Sora.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9100904D1E58B4470099E00E /* VideoView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = VideoView.xib; sourceTree = ""; }; 9100904F1E58B5450099E00E /* VideoView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoView.swift; sourceTree = ""; }; 910444CE253EC6F400EA06BE /* AudioMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioMode.swift; sourceTree = ""; }; @@ -117,6 +120,7 @@ 91FA6F201D93CA9800D38DB4 /* VideoFrame.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoFrame.swift; sourceTree = ""; }; 91FD95741DCA06F700047BA9 /* RTC+Description.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "RTC+Description.swift"; sourceTree = ""; }; AD7227112716B5F100001A23 /* DataChannel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataChannel.swift; sourceTree = ""; }; + C065E54A1EE9089E681120C8 /* Pods-Sora.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Sora.release.xcconfig"; path = "Target Support Files/Pods-Sora/Pods-Sora.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -124,6 +128,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 85356AEF270D06C2A407AED3 /* Pods_Sora.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -138,9 +143,19 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 673E827EFDA6558C59CE9D4D /* Pods */ = { + isa = PBXGroup; + children = ( + 6BB48B62CA701A8DC0314F6F /* Pods-Sora.debug.xcconfig */, + C065E54A1EE9089E681120C8 /* Pods-Sora.release.xcconfig */, + ); + path = Pods; + sourceTree = ""; + }; 9182018E1D58667600178E2B /* Frameworks */ = { isa = PBXGroup; children = ( + 808DBC57446C4DD0B8B07A66 /* Pods_Sora.framework */, ); name = Frameworks; sourceTree = ""; @@ -161,6 +176,7 @@ 91C7B0971D54636A006F5FA2 /* SoraTests */, 9182018E1D58667600178E2B /* Frameworks */, 91C7B08A1D54636A006F5FA2 /* Products */, + 673E827EFDA6558C59CE9D4D /* Pods */, ); sourceTree = ""; }; @@ -246,6 +262,7 @@ isa = PBXNativeTarget; buildConfigurationList = 91C7B09D1D54636A006F5FA2 /* Build configuration list for PBXNativeTarget "Sora" */; buildPhases = ( + 5C553896F1F41E4B494209BA /* [CP] Check Pods Manifest.lock */, 913259AC274B71860018787C /* Run SwiftFormat */, 916E79682744E9B40075C37E /* Run SwiftLint */, 91C7B0841D54636A006F5FA2 /* Sources */, @@ -342,6 +359,28 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 5C553896F1F41E4B494209BA /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Sora-checkManifestLockResult.txt", + ); + 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"; + showEnvVarsInLog = 0; + }; 913259AC274B71860018787C /* Run SwiftFormat */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -500,7 +539,7 @@ PROVISIONING_PROFILE = "49e345ee-1e24-4cef-9228-9df5fc1f7525"; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALID_ARCHS = arm64; VERSIONING_SYSTEM = "apple-generic"; @@ -557,7 +596,7 @@ PROVISIONING_PROFILE = "49e345ee-1e24-4cef-9228-9df5fc1f7525"; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VALID_ARCHS = arm64; @@ -568,6 +607,7 @@ }; 91C7B09E1D54636A006F5FA2 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 6BB48B62CA701A8DC0314F6F /* Pods-Sora.debug.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = ""; @@ -587,6 +627,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MARKETING_VERSION = 2024.3.0; + OTHER_SWIFT_FLAGS = "$(inherited) -enable-experimental-feature DisableOutwardActorInference"; PRODUCT_BUNDLE_IDENTIFIER = jp.shiguredo.sora.ios.sdk.Sora; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -594,6 +635,7 @@ SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_UPCOMING_FEATURE_DISABLE_OUTWARD_ACTOR_ISOLATION = YES; SWIFT_VERSION = 5.0; VALID_ARCHS = arm64; WATCHOS_DEPLOYMENT_TARGET = ""; @@ -602,6 +644,7 @@ }; 91C7B09F1D54636A006F5FA2 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = C065E54A1EE9089E681120C8 /* Pods-Sora.release.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = ""; @@ -621,12 +664,14 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MARKETING_VERSION = 2024.3.0; + OTHER_SWIFT_FLAGS = "$(inherited) -enable-experimental-feature DisableOutwardActorInference"; PRODUCT_BUNDLE_IDENTIFIER = jp.shiguredo.sora.ios.sdk.Sora; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_UPCOMING_FEATURE_DISABLE_OUTWARD_ACTOR_ISOLATION = YES; SWIFT_VERSION = 5.0; VALID_ARCHS = arm64; WATCHOS_DEPLOYMENT_TARGET = ""; From f26b4183e71c949277caf27d519ff08dd7912896 Mon Sep 17 00:00:00 2001 From: zztkm Date: Fri, 10 Jan 2025 12:09:25 +0900 Subject: [PATCH 2/6] =?UTF-8?q?GlobalConcurrency=20=E3=82=92=E6=9C=89?= =?UTF-8?q?=E5=8A=B9=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sora.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sora.xcodeproj/project.pbxproj b/Sora.xcodeproj/project.pbxproj index e504495c..8c456182 100644 --- a/Sora.xcodeproj/project.pbxproj +++ b/Sora.xcodeproj/project.pbxproj @@ -627,7 +627,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MARKETING_VERSION = 2024.3.0; - OTHER_SWIFT_FLAGS = "$(inherited) -enable-experimental-feature DisableOutwardActorInference"; + OTHER_SWIFT_FLAGS = "$(inherited) -enable-experimental-feature DisableOutwardActorInference -enable-experimental-feature GlobalConcurrency"; PRODUCT_BUNDLE_IDENTIFIER = jp.shiguredo.sora.ios.sdk.Sora; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -664,7 +664,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MARKETING_VERSION = 2024.3.0; - OTHER_SWIFT_FLAGS = "$(inherited) -enable-experimental-feature DisableOutwardActorInference"; + OTHER_SWIFT_FLAGS = "$(inherited) -enable-experimental-feature DisableOutwardActorInference -enable-experimental-feature GlobalConcurrency"; PRODUCT_BUNDLE_IDENTIFIER = jp.shiguredo.sora.ios.sdk.Sora; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; From 8c4c321ec9d7d8daa1e37708b95ba5ece2444b35 Mon Sep 17 00:00:00 2001 From: zztkm Date: Fri, 10 Jan 2025 12:23:37 +0900 Subject: [PATCH 3/6] =?UTF-8?q?InferSendableFromCaptures=20=E3=82=92?= =?UTF-8?q?=E6=9C=89=E5=8A=B9=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sora.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sora.xcodeproj/project.pbxproj b/Sora.xcodeproj/project.pbxproj index 8c456182..1d1c7bd3 100644 --- a/Sora.xcodeproj/project.pbxproj +++ b/Sora.xcodeproj/project.pbxproj @@ -627,7 +627,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MARKETING_VERSION = 2024.3.0; - OTHER_SWIFT_FLAGS = "$(inherited) -enable-experimental-feature DisableOutwardActorInference -enable-experimental-feature GlobalConcurrency"; + OTHER_SWIFT_FLAGS = "$(inherited) -enable-experimental-feature DisableOutwardActorInference -enable-experimental-feature GlobalConcurrency -enable-experimental-feature InferSendableFromCaptures"; PRODUCT_BUNDLE_IDENTIFIER = jp.shiguredo.sora.ios.sdk.Sora; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -664,7 +664,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MARKETING_VERSION = 2024.3.0; - OTHER_SWIFT_FLAGS = "$(inherited) -enable-experimental-feature DisableOutwardActorInference -enable-experimental-feature GlobalConcurrency"; + OTHER_SWIFT_FLAGS = "$(inherited) -enable-experimental-feature DisableOutwardActorInference -enable-experimental-feature GlobalConcurrency -enable-experimental-feature InferSendableFromCaptures"; PRODUCT_BUNDLE_IDENTIFIER = jp.shiguredo.sora.ios.sdk.Sora; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; From 4a71d934db10cf8e7dedaa7c7812e2dd4057c783 Mon Sep 17 00:00:00 2001 From: zztkm Date: Fri, 10 Jan 2025 12:25:30 +0900 Subject: [PATCH 4/6] =?UTF-8?q?strict-concurrency=20=E3=82=92=20complete?= =?UTF-8?q?=20=E3=81=AB=E5=A4=89=E6=9B=B4=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sora.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Sora.xcodeproj/project.pbxproj b/Sora.xcodeproj/project.pbxproj index 1d1c7bd3..ace4cecd 100644 --- a/Sora.xcodeproj/project.pbxproj +++ b/Sora.xcodeproj/project.pbxproj @@ -634,6 +634,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_STRICT_CONCURRENCY = complete; SWIFT_SWIFT3_OBJC_INFERENCE = Off; SWIFT_UPCOMING_FEATURE_DISABLE_OUTWARD_ACTOR_ISOLATION = YES; SWIFT_VERSION = 5.0; @@ -670,6 +671,7 @@ PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; + SWIFT_STRICT_CONCURRENCY = complete; SWIFT_SWIFT3_OBJC_INFERENCE = Off; SWIFT_UPCOMING_FEATURE_DISABLE_OUTWARD_ACTOR_ISOLATION = YES; SWIFT_VERSION = 5.0; From 4feda175c8e3fdd46edcef32cc329f174873e810 Mon Sep 17 00:00:00 2001 From: zztkm Date: Fri, 10 Jan 2025 12:31:03 +0900 Subject: [PATCH 5/6] =?UTF-8?q?ForwardTrailingClosures=20=E3=82=92?= =?UTF-8?q?=E6=9C=89=E5=8A=B9=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sora.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sora.xcodeproj/project.pbxproj b/Sora.xcodeproj/project.pbxproj index ace4cecd..a9b6917a 100644 --- a/Sora.xcodeproj/project.pbxproj +++ b/Sora.xcodeproj/project.pbxproj @@ -627,7 +627,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MARKETING_VERSION = 2024.3.0; - OTHER_SWIFT_FLAGS = "$(inherited) -enable-experimental-feature DisableOutwardActorInference -enable-experimental-feature GlobalConcurrency -enable-experimental-feature InferSendableFromCaptures"; + OTHER_SWIFT_FLAGS = "$(inherited) -enable-experimental-feature DisableOutwardActorInference -enable-experimental-feature GlobalConcurrency -enable-experimental-feature InferSendableFromCaptures -enable-experimental-feature ForwardTrailingClosures"; PRODUCT_BUNDLE_IDENTIFIER = jp.shiguredo.sora.ios.sdk.Sora; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -665,7 +665,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MARKETING_VERSION = 2024.3.0; - OTHER_SWIFT_FLAGS = "$(inherited) -enable-experimental-feature DisableOutwardActorInference -enable-experimental-feature GlobalConcurrency -enable-experimental-feature InferSendableFromCaptures"; + OTHER_SWIFT_FLAGS = "$(inherited) -enable-experimental-feature DisableOutwardActorInference -enable-experimental-feature GlobalConcurrency -enable-experimental-feature InferSendableFromCaptures -enable-experimental-feature ForwardTrailingClosures"; PRODUCT_BUNDLE_IDENTIFIER = jp.shiguredo.sora.ios.sdk.Sora; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; From 6bc8c5e2d47a322e111f296ed51049a2e699f120 Mon Sep 17 00:00:00 2001 From: zztkm Date: Fri, 10 Jan 2025 12:33:00 +0900 Subject: [PATCH 6/6] =?UTF-8?q?ConciseMagicFile=20=E3=82=92=E6=9C=89?= =?UTF-8?q?=E5=8A=B9=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sora.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Sora.xcodeproj/project.pbxproj b/Sora.xcodeproj/project.pbxproj index a9b6917a..942a444d 100644 --- a/Sora.xcodeproj/project.pbxproj +++ b/Sora.xcodeproj/project.pbxproj @@ -636,6 +636,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_STRICT_CONCURRENCY = complete; SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_UPCOMING_FEATURE_CONCISE_MAGIC_FILE = YES; SWIFT_UPCOMING_FEATURE_DISABLE_OUTWARD_ACTOR_ISOLATION = YES; SWIFT_VERSION = 5.0; VALID_ARCHS = arm64; @@ -673,6 +674,7 @@ SKIP_INSTALL = YES; SWIFT_STRICT_CONCURRENCY = complete; SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_UPCOMING_FEATURE_CONCISE_MAGIC_FILE = YES; SWIFT_UPCOMING_FEATURE_DISABLE_OUTWARD_ACTOR_ISOLATION = YES; SWIFT_VERSION = 5.0; VALID_ARCHS = arm64;