Skip to content
This repository has been archived by the owner on Dec 22, 2023. It is now read-only.

Add Swift Package Manager support #187

Closed
wants to merge 6 commits into from
Closed

Add Swift Package Manager support #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1f6760c
Add Swift Package Manager support
zocario Aug 12, 2020
9ef084d
Fix macOS compilation and add test target
zocario Aug 19, 2020
d2adb59
Fix demo project & configure travis
zocario Sep 10, 2020
bfceb5e
Remove xcodeproj and fix tests
zocario Sep 30, 2020
7fd0eab
Update travis configuration
zocario Sep 30, 2020
fd29da2
Fix master rebase
zocario Dec 8, 2020
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
2 changes: 1 addition & 1 deletion ...ject.xcworkspace/contents.xcworkspacedata → ...kage.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 23 additions & 23 deletions ...cshareddata/xcschemes/Family-iOS.xcscheme → ...areddata/xcschemes/Family-Mobile.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D5B2E89E1C3A780C00C0327D"
BuildableName = "Family.framework"
BlueprintName = "Family-iOS"
ReferencedContainer = "container:Family.xcodeproj">
BlueprintIdentifier = "Family-Mobile"
BuildableName = "Family-Mobile"
BlueprintName = "Family-Mobile"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -26,17 +26,26 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D5B2E8A81C3A780C00C0327D"
BuildableName = "Family-iOS-Tests.xctest"
BlueprintName = "Family-iOS-Tests"
ReferencedContainer = "container:Family.xcodeproj">
BlueprintIdentifier = "iOS-Tests"
BuildableName = "iOS-Tests"
BlueprintName = "iOS-Tests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "iOS+tvOS-Tests"
BuildableName = "iOS+tvOS-Tests"
BlueprintName = "iOS+tvOS-Tests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
</Testables>
Expand All @@ -51,15 +60,6 @@
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D5B2E89E1C3A780C00C0327D"
BuildableName = "Family.framework"
BlueprintName = "Family-iOS"
ReferencedContainer = "container:Family.xcodeproj">
</BuildableReference>
</MacroExpansion>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand All @@ -70,10 +70,10 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D5B2E89E1C3A780C00C0327D"
BuildableName = "Family.framework"
BlueprintName = "Family-iOS"
ReferencedContainer = "container:Family.xcodeproj">
BlueprintIdentifier = "Family-Mobile"
BuildableName = "Family-Mobile"
BlueprintName = "Family-Mobile"
ReferencedContainer = "container:">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
Expand Down
36 changes: 13 additions & 23 deletions ...shareddata/xcschemes/Family-tvOS.xcscheme → ...hareddata/xcschemes/Family-macOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D284B0FB1F79038B00D94AF3"
BuildableName = "Family.framework"
BlueprintName = "Family-tvOS"
ReferencedContainer = "container:Family.xcodeproj">
BlueprintIdentifier = "Family-macOS"
BuildableName = "Family-macOS"
BlueprintName = "Family-macOS"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -26,17 +26,16 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D284B1031F79038B00D94AF3"
BuildableName = "Family-tvOS-Tests.xctest"
BlueprintName = "Family-tvOS-Tests"
ReferencedContainer = "container:Family.xcodeproj">
BlueprintIdentifier = "macOS-Tests"
BuildableName = "macOS-Tests"
BlueprintName = "macOS-Tests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
</Testables>
Expand All @@ -51,15 +50,6 @@
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D284B0FB1F79038B00D94AF3"
BuildableName = "Family.framework"
BlueprintName = "Family-tvOS"
ReferencedContainer = "container:Family.xcodeproj">
</BuildableReference>
</MacroExpansion>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand All @@ -70,10 +60,10 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D284B0FB1F79038B00D94AF3"
BuildableName = "Family.framework"
BlueprintName = "Family-tvOS"
ReferencedContainer = "container:Family.xcodeproj">
BlueprintIdentifier = "Family-macOS"
BuildableName = "Family-macOS"
BlueprintName = "Family-macOS"
ReferencedContainer = "container:">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
Expand Down
9 changes: 5 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
os: osx
osx_image: xcode11.6
i
osx_image: xcode12
language: swift

script:
- set -o pipefail && xcodebuild -project Family.xcodeproj -scheme "Family-macOS" -sdk macosx -enableCodeCoverage YES clean build test | xcpretty
- set -o pipefail && xcodebuild -project Example/FamilyDemo/FamilyDemo.xcodeproj -scheme "Family-macOS" -sdk macosx -enableCodeCoverage YES clean build test | xcpretty
- bash <(curl -s https://codecov.io/bash) -c -F macOS
- set -o pipefail && xcodebuild -project Family.xcodeproj -scheme "Family-tvOS" -destination 'name=Apple TV,OS=13.4' -enableCodeCoverage YES clean build test | xcpretty
- set -o pipefail && xcodebuild -project Example/FamilyDemo/FamilyDemo.xcodeproj -scheme "Family-Mobile" -destination 'platform=tvOS Simulator,name=Apple TV,OS=14.0' -enableCodeCoverage YES clean build test | xcpretty
- bash <(curl -s https://codecov.io/bash) -c -F tvOS
- set -o pipefail && xcodebuild -project Family.xcodeproj -scheme "Family-iOS" -sdk iphonesimulator -destination name="iPhone 8,OS=13.5" -enableCodeCoverage YES clean build test | xcpretty
- set -o pipefail && xcodebuild -project Example/FamilyDemo/FamilyDemo.xcodeproj -scheme "Family-Mobile" -sdk iphonesimulator -destination name="iPhone 8,OS=14.0" -enableCodeCoverage YES clean build test | xcpretty
- bash <(curl -s https://codecov.io/bash) -c -F iOS

notifications:
Expand Down
104 changes: 39 additions & 65 deletions Example/FamilyDemo/FamilyDemo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,23 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 52;
objects = {

/* Begin PBXBuildFile section */
9B3B6A2C9F23EE43005B57CA /* Pods_FamilyDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C86CBFC710F745C235E46A7 /* Pods_FamilyDemo.framework */; };
BD4515BA22FDA3EB00731DF6 /* CollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD4515B922FDA3EB00731DF6 /* CollectionViewController.swift */; };
BD4515BC22FDA41900731DF6 /* Cell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD4515BB22FDA41900731DF6 /* Cell.swift */; };
C607FBC9250A96C80003210D /* Family-Mobile in Frameworks */ = {isa = PBXBuildFile; productRef = C607FBC8250A96C80003210D /* Family-Mobile */; };
D5C7F74E1C3BC9CE008CDDBA /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D5C7F74C1C3BC9CE008CDDBA /* LaunchScreen.storyboard */; };
D5C7F75B1C3BCA1E008CDDBA /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D5C7F7571C3BCA1E008CDDBA /* Assets.xcassets */; };
D5C7F75C1C3BCA1E008CDDBA /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C7F7591C3BCA1E008CDDBA /* AppDelegate.swift */; };
D5C7F75D1C3BCA1E008CDDBA /* ContainerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C7F75A1C3BCA1E008CDDBA /* ContainerController.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
0C86CBFC710F745C235E46A7 /* Pods_FamilyDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FamilyDemo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
20205134A50AAF695BC87348 /* Pods-FamilyDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FamilyDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-FamilyDemo/Pods-FamilyDemo.release.xcconfig"; sourceTree = "<group>"; };
BD4515B922FDA3EB00731DF6 /* CollectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollectionViewController.swift; sourceTree = "<group>"; };
BD4515BB22FDA41900731DF6 /* Cell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Cell.swift; sourceTree = "<group>"; };
D1AFDB456D23A46ADFEA057E /* Pods-FamilyDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FamilyDemo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-FamilyDemo/Pods-FamilyDemo.debug.xcconfig"; sourceTree = "<group>"; };
C607FBC2250A96910003210D /* Family */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Family; path = ../..; sourceTree = "<group>"; };
D5C7F7401C3BC9CE008CDDBA /* FamilyDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FamilyDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
D5C7F74D1C3BC9CE008CDDBA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
D5C7F74F1C3BC9CE008CDDBA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand All @@ -35,37 +33,27 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
9B3B6A2C9F23EE43005B57CA /* Pods_FamilyDemo.framework in Frameworks */,
C607FBC9250A96C80003210D /* Family-Mobile in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
0F6746668A62AF040D5444DC /* Frameworks */ = {
C607FBC7250A96C80003210D /* Frameworks */ = {
isa = PBXGroup;
children = (
0C86CBFC710F745C235E46A7 /* Pods_FamilyDemo.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
CABCF03D143F71E4147F34C0 /* Pods */ = {
isa = PBXGroup;
children = (
D1AFDB456D23A46ADFEA057E /* Pods-FamilyDemo.debug.xcconfig */,
20205134A50AAF695BC87348 /* Pods-FamilyDemo.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
D5C7F7371C3BC9CE008CDDBA = {
isa = PBXGroup;
children = (
C607FBC2250A96910003210D /* Family */,
D5C7F7421C3BC9CE008CDDBA /* FamilyDemo */,
D5C7F7411C3BC9CE008CDDBA /* Products */,
CABCF03D143F71E4147F34C0 /* Pods */,
0F6746668A62AF040D5444DC /* Frameworks */,
C607FBC7250A96C80003210D /* Frameworks */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -122,17 +110,19 @@
isa = PBXNativeTarget;
buildConfigurationList = D5C7F7521C3BC9CE008CDDBA /* Build configuration list for PBXNativeTarget "FamilyDemo" */;
buildPhases = (
DD9EC8FE4BB09ADD0F110FB8 /* [CP] Check Pods Manifest.lock */,
D5C7F73C1C3BC9CE008CDDBA /* Sources */,
D5C7F73D1C3BC9CE008CDDBA /* Frameworks */,
D5C7F73E1C3BC9CE008CDDBA /* Resources */,
C8D573C8F1F8DDAB63B3F691 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
dependencies = (
C607FBC4250A96C10003210D /* PBXTargetDependency */,
);
name = FamilyDemo;
packageProductDependencies = (
C607FBC8250A96C80003210D /* Family-Mobile */,
);
productName = FamilyDemo;
productReference = D5C7F7401C3BC9CE008CDDBA /* FamilyDemo.app */;
productType = "com.apple.product-type.application";
Expand Down Expand Up @@ -184,45 +174,6 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
C8D573C8F1F8DDAB63B3F691 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-FamilyDemo/Pods-FamilyDemo-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Family/Family.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Family.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FamilyDemo/Pods-FamilyDemo-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
DD9EC8FE4BB09ADD0F110FB8 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-FamilyDemo-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;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
D5C7F73C1C3BC9CE008CDDBA /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand All @@ -237,6 +188,13 @@
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
C607FBC4250A96C10003210D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = C607FBC3250A96C10003210D /* Family-Mobile */;
};
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
D5C7F74C1C3BC9CE008CDDBA /* LaunchScreen.storyboard */ = {
isa = PBXVariantGroup;
Expand Down Expand Up @@ -343,20 +301,23 @@
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 5.0;
VALIDATE_PRODUCT = YES;
};
name = Release;
};
D5C7F7531C3BC9CE008CDDBA /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D1AFDB456D23A46ADFEA057E /* Pods-FamilyDemo.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = FamilyDemo/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.zenangst.FamilyDemo;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand All @@ -365,12 +326,14 @@
};
D5C7F7541C3BC9CE008CDDBA /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 20205134A50AAF695BC87348 /* Pods-FamilyDemo.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = FamilyDemo/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.zenangst.FamilyDemo;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -399,6 +362,17 @@
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */

/* Begin XCSwiftPackageProductDependency section */
C607FBC3250A96C10003210D /* Family-Mobile */ = {
isa = XCSwiftPackageProductDependency;
productName = "Family-Mobile";
};
C607FBC8250A96C80003210D /* Family-Mobile */ = {
isa = XCSwiftPackageProductDependency;
productName = "Family-Mobile";
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = D5C7F7381C3BC9CE008CDDBA /* Project object */;
}
0 ...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
File renamed without changes.
Loading