Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Swift 6 でビルドできるようにする #220

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

[WIP] Swift 6 でビルドできるようにする #220

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
412ffc1
Swift 6 対応のために upcoming feature を有効化する
zztkm Jan 10, 2025
f26b418
GlobalConcurrency を有効化
zztkm Jan 10, 2025
8c4c321
InferSendableFromCaptures を有効化
zztkm Jan 10, 2025
4a71d93
strict-concurrency を complete に変更する
zztkm Jan 10, 2025
4feda17
ForwardTrailingClosures を有効化
zztkm Jan 10, 2025
6bc8c5e
ConciseMagicFile を有効化
zztkm Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 51 additions & 2 deletions Sora.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -75,6 +76,8 @@
/* Begin PBXFileReference section */
3591D8ED27014F7C000AD514 /* PackageInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PackageInfo.swift; sourceTree = "<group>"; };
3591D8EF27032233000AD514 /* SoraDispatcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SoraDispatcher.swift; sourceTree = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
9100904F1E58B5450099E00E /* VideoView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoView.swift; sourceTree = "<group>"; };
910444CE253EC6F400EA06BE /* AudioMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioMode.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -117,13 +120,15 @@
91FA6F201D93CA9800D38DB4 /* VideoFrame.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoFrame.swift; sourceTree = "<group>"; };
91FD95741DCA06F700047BA9 /* RTC+Description.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "RTC+Description.swift"; sourceTree = "<group>"; };
AD7227112716B5F100001A23 /* DataChannel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataChannel.swift; sourceTree = "<group>"; };
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 = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
91C7B0851D54636A006F5FA2 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
85356AEF270D06C2A407AED3 /* Pods_Sora.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -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 = "<group>";
};
9182018E1D58667600178E2B /* Frameworks */ = {
isa = PBXGroup;
children = (
808DBC57446C4DD0B8B07A66 /* Pods_Sora.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand All @@ -161,6 +176,7 @@
91C7B0971D54636A006F5FA2 /* SoraTests */,
9182018E1D58667600178E2B /* Frameworks */,
91C7B08A1D54636A006F5FA2 /* Products */,
673E827EFDA6558C59CE9D4D /* Pods */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -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 */,
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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;
Expand All @@ -568,6 +607,7 @@
};
91C7B09E1D54636A006F5FA2 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 6BB48B62CA701A8DC0314F6F /* Pods-Sora.debug.xcconfig */;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "";
Expand All @@ -587,13 +627,17 @@
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 -enable-experimental-feature ForwardTrailingClosures";
PRODUCT_BUNDLE_IDENTIFIER = jp.shiguredo.sora.ios.sdk.Sora;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
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;
WATCHOS_DEPLOYMENT_TARGET = "";
Expand All @@ -602,6 +646,7 @@
};
91C7B09F1D54636A006F5FA2 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = C065E54A1EE9089E681120C8 /* Pods-Sora.release.xcconfig */;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "";
Expand All @@ -621,12 +666,16 @@
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 -enable-experimental-feature ForwardTrailingClosures";
PRODUCT_BUNDLE_IDENTIFIER = jp.shiguredo.sora.ios.sdk.Sora;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
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;
WATCHOS_DEPLOYMENT_TARGET = "";
Expand Down