Эх сурвалжийг харах

Merge branch 'watchOS'

* watchOS:
  Resolve "failed: Check dependencies" by "TARGETED_DEVICE_FAMILY = 4;"
  Remove unnecessary build configs
  Add watchOS
  Update xcconfigs to ec5753493605deed7358dec5f9260f503d3ed650
Norio Nomura 10 жил өмнө
parent
commit
47c76f4ce1

+ 129 - 0
Base32.xcodeproj/project.pbxproj

@@ -30,6 +30,10 @@
 		6CA0A80C1A75135D00AC539F /* SecEncodeTransformTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CA0A80B1A75135D00AC539F /* SecEncodeTransformTests.swift */; };
 		6CA0A80C1A75135D00AC539F /* SecEncodeTransformTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CA0A80B1A75135D00AC539F /* SecEncodeTransformTests.swift */; };
 		6CA0A80D1A75135D00AC539F /* Base32.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CA0A7981A74E80600AC539F /* Base32.framework */; };
 		6CA0A80D1A75135D00AC539F /* Base32.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CA0A7981A74E80600AC539F /* Base32.framework */; };
 		6CA0A8131A75138900AC539F /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CA0A7F71A7507CE00AC539F /* Security.framework */; };
 		6CA0A8131A75138900AC539F /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CA0A7F71A7507CE00AC539F /* Security.framework */; };
+		6CCCF1F31BC208C1003CE287 /* Base32.h in Headers */ = {isa = PBXBuildFile; fileRef = 6CA0A79D1A74E80600AC539F /* Base32.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6CCCF1F41BC208C7003CE287 /* Base32.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CA0A7EF1A74ECEE00AC539F /* Base32.swift */; };
+		6CCCF1F51BC208CA003CE287 /* Base16.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C122F791A85DC1E004FD458 /* Base16.swift */; };
+		6CCCF1F61BC208CE003CE287 /* StringExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C122F7C1A85E52C004FD458 /* StringExtension.swift */; };
 /* End PBXBuildFile section */
 /* End PBXBuildFile section */
 
 
 /* Begin PBXContainerItemProxy section */
 /* Begin PBXContainerItemProxy section */
@@ -98,6 +102,15 @@
 		6CA0A8071A75135D00AC539F /* SecEncodeTransformTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SecEncodeTransformTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		6CA0A8071A75135D00AC539F /* SecEncodeTransformTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SecEncodeTransformTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		6CA0A80A1A75135D00AC539F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		6CA0A80A1A75135D00AC539F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		6CA0A80B1A75135D00AC539F /* SecEncodeTransformTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecEncodeTransformTests.swift; sourceTree = "<group>"; };
 		6CA0A80B1A75135D00AC539F /* SecEncodeTransformTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecEncodeTransformTests.swift; sourceTree = "<group>"; };
+		6CCCF1C41BC205D1003CE287 /* tvOS-Application.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "tvOS-Application.xcconfig"; sourceTree = "<group>"; };
+		6CCCF1C51BC205D1003CE287 /* tvOS-Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "tvOS-Base.xcconfig"; sourceTree = "<group>"; };
+		6CCCF1C61BC205D1003CE287 /* tvOS-Framework.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "tvOS-Framework.xcconfig"; sourceTree = "<group>"; };
+		6CCCF1C71BC205D1003CE287 /* tvOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "tvOS-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
+		6CCCF1C91BC205D1003CE287 /* watchOS-Application.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "watchOS-Application.xcconfig"; sourceTree = "<group>"; };
+		6CCCF1CA1BC205D1003CE287 /* watchOS-Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "watchOS-Base.xcconfig"; sourceTree = "<group>"; };
+		6CCCF1CB1BC205D1003CE287 /* watchOS-Framework.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "watchOS-Framework.xcconfig"; sourceTree = "<group>"; };
+		6CCCF1CC1BC205D1003CE287 /* watchOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "watchOS-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
+		6CCCF1EB1BC20835003CE287 /* Base32.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Base32.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 /* End PBXFileReference section */
 
 
 /* Begin PBXFrameworksBuildPhase section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -140,6 +153,13 @@
 			);
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		};
+		6CCCF1E71BC20835003CE287 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXFrameworksBuildPhase section */
 /* End PBXFrameworksBuildPhase section */
 
 
 /* Begin PBXGroup section */
 /* Begin PBXGroup section */
@@ -165,6 +185,7 @@
 				6CA0A7D31A74E91700AC539F /* Base32.framework */,
 				6CA0A7D31A74E91700AC539F /* Base32.framework */,
 				6CA0A7DD1A74E91800AC539F /* Base32-iOSTests.xctest */,
 				6CA0A7DD1A74E91800AC539F /* Base32-iOSTests.xctest */,
 				6CA0A8071A75135D00AC539F /* SecEncodeTransformTests.xctest */,
 				6CA0A8071A75135D00AC539F /* SecEncodeTransformTests.xctest */,
+				6CCCF1EB1BC20835003CE287 /* Base32.framework */,
 			);
 			);
 			name = Products;
 			name = Products;
 			sourceTree = "<group>";
 			sourceTree = "<group>";
@@ -214,6 +235,8 @@
 				6CA0A7B51A74E88E00AC539F /* Base */,
 				6CA0A7B51A74E88E00AC539F /* Base */,
 				6CA0A7C21A74E88E00AC539F /* iOS */,
 				6CA0A7C21A74E88E00AC539F /* iOS */,
 				6CA0A7C71A74E88E00AC539F /* Mac OS X */,
 				6CA0A7C71A74E88E00AC539F /* Mac OS X */,
+				6CCCF1C31BC205D1003CE287 /* tvOS */,
+				6CCCF1C81BC205D1003CE287 /* watchOS */,
 				6CA0A7CD1A74E88E00AC539F /* README.md */,
 				6CA0A7CD1A74E88E00AC539F /* README.md */,
 			);
 			);
 			name = xcconfigs;
 			name = xcconfigs;
@@ -304,6 +327,28 @@
 			name = "Supporting Files";
 			name = "Supporting Files";
 			sourceTree = "<group>";
 			sourceTree = "<group>";
 		};
 		};
+		6CCCF1C31BC205D1003CE287 /* tvOS */ = {
+			isa = PBXGroup;
+			children = (
+				6CCCF1C41BC205D1003CE287 /* tvOS-Application.xcconfig */,
+				6CCCF1C51BC205D1003CE287 /* tvOS-Base.xcconfig */,
+				6CCCF1C61BC205D1003CE287 /* tvOS-Framework.xcconfig */,
+				6CCCF1C71BC205D1003CE287 /* tvOS-StaticLibrary.xcconfig */,
+			);
+			path = tvOS;
+			sourceTree = "<group>";
+		};
+		6CCCF1C81BC205D1003CE287 /* watchOS */ = {
+			isa = PBXGroup;
+			children = (
+				6CCCF1C91BC205D1003CE287 /* watchOS-Application.xcconfig */,
+				6CCCF1CA1BC205D1003CE287 /* watchOS-Base.xcconfig */,
+				6CCCF1CB1BC205D1003CE287 /* watchOS-Framework.xcconfig */,
+				6CCCF1CC1BC205D1003CE287 /* watchOS-StaticLibrary.xcconfig */,
+			);
+			path = watchOS;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 /* End PBXGroup section */
 
 
 /* Begin PBXHeadersBuildPhase section */
 /* Begin PBXHeadersBuildPhase section */
@@ -323,6 +368,14 @@
 			);
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		};
+		6CCCF1E81BC20835003CE287 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				6CCCF1F31BC208C1003CE287 /* Base32.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXHeadersBuildPhase section */
 /* End PBXHeadersBuildPhase section */
 
 
 /* Begin PBXNativeTarget section */
 /* Begin PBXNativeTarget section */
@@ -416,6 +469,24 @@
 			productReference = 6CA0A8071A75135D00AC539F /* SecEncodeTransformTests.xctest */;
 			productReference = 6CA0A8071A75135D00AC539F /* SecEncodeTransformTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
 		};
+		6CCCF1EA1BC20835003CE287 /* Base32-watchOS */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 6CCCF1F01BC20835003CE287 /* Build configuration list for PBXNativeTarget "Base32-watchOS" */;
+			buildPhases = (
+				6CCCF1E61BC20835003CE287 /* Sources */,
+				6CCCF1E71BC20835003CE287 /* Frameworks */,
+				6CCCF1E81BC20835003CE287 /* Headers */,
+				6CCCF1E91BC20835003CE287 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "Base32-watchOS";
+			productName = Base32;
+			productReference = 6CCCF1EB1BC20835003CE287 /* Base32.framework */;
+			productType = "com.apple.product-type.framework";
+		};
 /* End PBXNativeTarget section */
 /* End PBXNativeTarget section */
 
 
 /* Begin PBXProject section */
 /* Begin PBXProject section */
@@ -442,6 +513,9 @@
 					6CA0A8061A75135D00AC539F = {
 					6CA0A8061A75135D00AC539F = {
 						CreatedOnToolsVersion = 6.1.1;
 						CreatedOnToolsVersion = 6.1.1;
 					};
 					};
+					6CCCF1EA1BC20835003CE287 = {
+						CreatedOnToolsVersion = 7.1;
+					};
 				};
 				};
 			};
 			};
 			buildConfigurationList = 6CA0A7921A74E80600AC539F /* Build configuration list for PBXProject "Base32" */;
 			buildConfigurationList = 6CA0A7921A74E80600AC539F /* Build configuration list for PBXProject "Base32" */;
@@ -460,6 +534,7 @@
 				6CA0A7A21A74E80600AC539F /* Base32-MacTests */,
 				6CA0A7A21A74E80600AC539F /* Base32-MacTests */,
 				6CA0A7D21A74E91700AC539F /* Base32-iOS */,
 				6CA0A7D21A74E91700AC539F /* Base32-iOS */,
 				6CA0A7DC1A74E91800AC539F /* Base32-iOSTests */,
 				6CA0A7DC1A74E91800AC539F /* Base32-iOSTests */,
+				6CCCF1EA1BC20835003CE287 /* Base32-watchOS */,
 				6CA0A8061A75135D00AC539F /* SecEncodeTransformTests */,
 				6CA0A8061A75135D00AC539F /* SecEncodeTransformTests */,
 			);
 			);
 		};
 		};
@@ -501,6 +576,13 @@
 			);
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		};
+		6CCCF1E91BC20835003CE287 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXResourcesBuildPhase section */
 /* End PBXResourcesBuildPhase section */
 
 
 /* Begin PBXSourcesBuildPhase section */
 /* Begin PBXSourcesBuildPhase section */
@@ -556,6 +638,16 @@
 			);
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		};
+		6CCCF1E61BC20835003CE287 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				6CCCF1F41BC208C7003CE287 /* Base32.swift in Sources */,
+				6CCCF1F51BC208CA003CE287 /* Base16.swift in Sources */,
+				6CCCF1F61BC208CE003CE287 /* StringExtension.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXSourcesBuildPhase section */
 /* End PBXSourcesBuildPhase section */
 
 
 /* Begin PBXTargetDependency section */
 /* Begin PBXTargetDependency section */
@@ -719,6 +811,34 @@
 			};
 			};
 			name = Release;
 			name = Release;
 		};
 		};
+		6CCCF1F11BC20835003CE287 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 6CCCF1CB1BC205D1003CE287 /* watchOS-Framework.xcconfig */;
+			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				INFOPLIST_FILE = Base32/Info.plist;
+				PRODUCT_BUNDLE_IDENTIFIER = "io.github.norio-nomura.$(PRODUCT_NAME:rfc1034identifier)";
+				TARGETED_DEVICE_FAMILY = 4;
+				WATCHOS_DEPLOYMENT_TARGET = 2.0;
+			};
+			name = Debug;
+		};
+		6CCCF1F21BC20835003CE287 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 6CCCF1CB1BC205D1003CE287 /* watchOS-Framework.xcconfig */;
+			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				INFOPLIST_FILE = Base32/Info.plist;
+				PRODUCT_BUNDLE_IDENTIFIER = "io.github.norio-nomura.$(PRODUCT_NAME:rfc1034identifier)";
+				TARGETED_DEVICE_FAMILY = 4;
+				WATCHOS_DEPLOYMENT_TARGET = 2.0;
+			};
+			name = Release;
+		};
 /* End XCBuildConfiguration section */
 /* End XCBuildConfiguration section */
 
 
 /* Begin XCConfigurationList section */
 /* Begin XCConfigurationList section */
@@ -776,6 +896,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 			defaultConfigurationName = Release;
 		};
 		};
+		6CCCF1F01BC20835003CE287 /* Build configuration list for PBXNativeTarget "Base32-watchOS" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				6CCCF1F11BC20835003CE287 /* Debug */,
+				6CCCF1F21BC20835003CE287 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 /* End XCConfigurationList section */
 /* End XCConfigurationList section */
 	};
 	};
 	rootObject = 6CA0A78F1A74E80600AC539F /* Project object */;
 	rootObject = 6CA0A78F1A74E80600AC539F /* Project object */;

+ 80 - 0
Base32.xcodeproj/xcshareddata/xcschemes/Base32-watchOS.xcscheme

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0710"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "6CCCF1EA1BC20835003CE287"
+               BuildableName = "Base32.framework"
+               BlueprintName = "Base32-watchOS"
+               ReferencedContainer = "container:Base32.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6CCCF1EA1BC20835003CE287"
+            BuildableName = "Base32.framework"
+            BlueprintName = "Base32-watchOS"
+            ReferencedContainer = "container:Base32.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6CCCF1EA1BC20835003CE287"
+            BuildableName = "Base32.framework"
+            BlueprintName = "Base32-watchOS"
+            ReferencedContainer = "container:Base32.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

+ 1 - 1
Cartfile.private

@@ -1 +1 @@
-github "jspahrsummers/xcconfigs" "0.8.1"
+github "jspahrsummers/xcconfigs" "ec5753493605deed7358dec5f9260f503d3ed650"

+ 1 - 1
Cartfile.resolved

@@ -1 +1 @@
-github "jspahrsummers/xcconfigs" "0.8.1"
+github "jspahrsummers/xcconfigs" "ec5753493605deed7358dec5f9260f503d3ed650"

+ 1 - 1
Carthage/Checkouts/xcconfigs

@@ -1 +1 @@
-Subproject commit 99624a6af366c015b678a1135e4c558776a59be6
+Subproject commit ec5753493605deed7358dec5f9260f503d3ed650