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.

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

Switch to entirely SwiftPM distribution #6

Merged
merged 16 commits into from
Sep 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,8 @@ fastlane/test_output
# https://github.com/johnno1962/injectionforxcode

iOSInjectionProject/

# This is ignored when a repo is used as a dependency anyway.
Package.resolved

.DS_Store
1 change: 1 addition & 0 deletions .ignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
citeproc-rs
Empty file removed Cartfile
Empty file.
Empty file removed Cartfile.resolved
Empty file.
115 changes: 86 additions & 29 deletions CiteprocRsKit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,31 @@
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
851A4945260AD10B00AD1322 /* PBXContainerItemProxy */ = {
8518340526DF7D6600F7A1DE /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 850B71D026085A0200EB37D0 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 851A493A260AD10B00AD1322;
remoteInfo = CiteprocRsKit;
remoteGlobalIDString = 8518340126DF7D3000F7A1DE;
remoteInfo = CiteprocRs;
};
85A2F41E260AE1DC00B8DCE6 /* PBXContainerItemProxy */ = {
851A4945260AD10B00AD1322 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 850B71D026085A0200EB37D0 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 85A2F410260AE08400B8DCE6;
remoteInfo = "cargo-build-x";
remoteGlobalIDString = 851A493A260AD10B00AD1322;
remoteInfo = CiteprocRsKit;
};
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
8518340826DF8C4900F7A1DE /* CiteprocRs.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = CiteprocRs.xcframework; path = "citeproc-rs/target/xcframework/debug/CiteprocRs.xcframework"; sourceTree = "<group>"; };
851A493B260AD10B00AD1322 /* CiteprocRsKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CiteprocRsKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
851A4948260AD10B00AD1322 /* CiteprocRsKitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CiteprocRsKitTests.swift; sourceTree = "<group>"; };
851A494A260AD10B00AD1322 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
851A4954260AD12300AD1322 /* Driver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Driver.swift; sourceTree = "<group>"; };
851A495A260AD31D00AD1322 /* CiteprocRsKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CiteprocRsKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
851A495F260AD3EE00AD1322 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
851F28B226E209210010D76E /* Configuration */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Configuration; sourceTree = "<group>"; };
852DD4AD26B15497002AED8D /* FetchContext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FetchContext.swift; sourceTree = "<group>"; };
852DD4AF26B154BC002AED8D /* Errors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Errors.swift; sourceTree = "<group>"; };
852DD4B126B3E410002AED8D /* FFIUserData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FFIUserData.swift; sourceTree = "<group>"; };
Expand All @@ -59,10 +61,6 @@
857D733B26B1320100C34654 /* Buffer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Buffer.swift; sourceTree = "<group>"; };
8583B29926B7F26F007FF5AB /* ClusterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClusterTests.swift; sourceTree = "<group>"; };
8583B29B26B80563007FF5AB /* PanicTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PanicTests.swift; sourceTree = "<group>"; };
85A2F50D260C38BD00B8DCE6 /* Link-citeproc-rs.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Link-citeproc-rs.xcconfig"; sourceTree = "<group>"; };
85E4B4D2260D99E4001B9ED1 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
85E4B4E1260D9DA7001B9ED1 /* Common.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = "<group>"; };
85E4B4E4260D9E1A001B9ED1 /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -87,12 +85,22 @@
850B71CF26085A0200EB37D0 = {
isa = PBXGroup;
children = (
851F28B226E209210010D76E /* Configuration */,
8518340826DF8C4900F7A1DE /* CiteprocRs.xcframework */,
8518340726DF827C00F7A1DE /* Sources */,
856B441926086D410088EBFC /* Scripts */,
851A493B260AD10B00AD1322 /* CiteprocRsKit.framework */,
851A495A260AD31D00AD1322 /* CiteprocRsKitTests.xctest */,
);
sourceTree = "<group>";
};
8518340726DF827C00F7A1DE /* Sources */ = {
isa = PBXGroup;
children = (
851A493C260AD10B00AD1322 /* CiteprocRsKit */,
851A4947260AD10B00AD1322 /* CiteprocRsKitTests */,
851A495A260AD31D00AD1322 /* CiteprocRsKitTests.xctest */,
);
path = Sources;
sourceTree = "<group>";
};
851A493C260AD10B00AD1322 /* CiteprocRsKit */ = {
Expand All @@ -106,10 +114,6 @@
852DD4AD26B15497002AED8D /* FetchContext.swift */,
852DD4B126B3E410002AED8D /* FFIUserData.swift */,
857D733B26B1320100C34654 /* Buffer.swift */,
85A2F50D260C38BD00B8DCE6 /* Link-citeproc-rs.xcconfig */,
85E4B4E4260D9E1A001B9ED1 /* Debug.xcconfig */,
85E4B4E1260D9DA7001B9ED1 /* Common.xcconfig */,
85E4B4D2260D99E4001B9ED1 /* Release.xcconfig */,
854CF4A526CAD5EE00363E4B /* Documentation.docc */,
);
path = CiteprocRsKit;
Expand Down Expand Up @@ -141,6 +145,20 @@
/* End PBXHeadersBuildPhase section */

/* Begin PBXLegacyTarget section */
8518340126DF7D3000F7A1DE /* CiteprocRs */ = {
isa = PBXLegacyTarget;
buildArgumentsString = "$(ACTION)";
buildConfigurationList = 8518340226DF7D3000F7A1DE /* Build configuration list for PBXLegacyTarget "CiteprocRs" */;
buildPhases = (
);
buildToolPath = Scripts/xcframework;
buildWorkingDirectory = "";
dependencies = (
);
name = CiteprocRs;
passBuildSettingsInEnvironment = 0;
productName = CiteprocRs;
};
85A2F410260AE08400B8DCE6 /* libciteproc_rs */ = {
isa = PBXLegacyTarget;
buildArgumentsString = "bash \"$PROJECT_DIR/Scripts/cargo-build\"";
Expand Down Expand Up @@ -170,7 +188,7 @@
buildRules = (
);
dependencies = (
85A2F41F260AE1DC00B8DCE6 /* PBXTargetDependency */,
8518340626DF7D6600F7A1DE /* PBXTargetDependency */,
);
name = CiteprocRsKit;
productName = CiteprocRsKit;
Expand Down Expand Up @@ -204,6 +222,9 @@
LastSwiftUpdateCheck = 1240;
LastUpgradeCheck = 1250;
TargetAttributes = {
8518340126DF7D3000F7A1DE = {
CreatedOnToolsVersion = 12.5.1;
};
851A493A260AD10B00AD1322 = {
CreatedOnToolsVersion = 12.4;
LastSwiftMigration = 1240;
Expand Down Expand Up @@ -232,6 +253,7 @@
851A493A260AD10B00AD1322 /* CiteprocRsKit */,
851A4942260AD10B00AD1322 /* CiteprocRsKitTests */,
85A2F410260AE08400B8DCE6 /* libciteproc_rs */,
8518340126DF7D3000F7A1DE /* CiteprocRs */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -284,22 +306,21 @@
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
8518340626DF7D6600F7A1DE /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 8518340126DF7D3000F7A1DE /* CiteprocRs */;
targetProxy = 8518340526DF7D6600F7A1DE /* PBXContainerItemProxy */;
};
851A4946260AD10B00AD1322 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 851A493A260AD10B00AD1322 /* CiteprocRsKit */;
targetProxy = 851A4945260AD10B00AD1322 /* PBXContainerItemProxy */;
};
85A2F41F260AE1DC00B8DCE6 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 85A2F410260AE08400B8DCE6 /* libciteproc_rs */;
targetProxy = 85A2F41E260AE1DC00B8DCE6 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin XCBuildConfiguration section */
850B71DD26085A0200EB37D0 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 85E4B4E4260D9E1A001B9ED1 /* Debug.xcconfig */;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
Expand Down Expand Up @@ -357,7 +378,6 @@
};
850B71DE26085A0200EB37D0 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 85E4B4D2260D99E4001B9ED1 /* Release.xcconfig */;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
Expand Down Expand Up @@ -408,9 +428,38 @@
};
name = Release;
};
8518340326DF7D3000F7A1DE /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
DEBUGGING_SYMBOLS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "";
OTHER_LDFLAGS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
8518340426DF7D3000F7A1DE /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
OTHER_CFLAGS = "";
OTHER_LDFLAGS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
851A494D260AD10B00AD1322 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 85A2F50D260C38BD00B8DCE6 /* Link-citeproc-rs.xcconfig */;
buildSettings = {
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Manual;
Expand All @@ -419,7 +468,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = CiteprocRsKit/Info.plist;
INFOPLIST_FILE = Sources/CiteprocRsKit/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -439,7 +488,6 @@
};
851A494E260AD10B00AD1322 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 85A2F50D260C38BD00B8DCE6 /* Link-citeproc-rs.xcconfig */;
buildSettings = {
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Manual;
Expand All @@ -448,7 +496,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = CiteprocRsKit/Info.plist;
INFOPLIST_FILE = Sources/CiteprocRsKit/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -474,7 +522,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = CiteprocRsKitTests/Info.plist;
INFOPLIST_FILE = Sources/CiteprocRsKitTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -495,7 +543,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = CiteprocRsKitTests/Info.plist;
INFOPLIST_FILE = Sources/CiteprocRsKitTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -541,6 +589,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
8518340226DF7D3000F7A1DE /* Build configuration list for PBXLegacyTarget "CiteprocRs" */ = {
isa = XCConfigurationList;
buildConfigurations = (
8518340326DF7D3000F7A1DE /* Debug */,
8518340426DF7D3000F7A1DE /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
851A494C260AD10B00AD1322 /* Build configuration list for PBXNativeTarget "CiteprocRsKit" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
// Configuration settings file format documentation can be found at:
// https://help.apple.com/xcode/#/dev745c5c974

SWIFT_VERSION = 5.0
SWIFT_VERSION = 5.4
BUILD_LIBRARY_FOR_DISTRIBUTION = YES

// Makes archive builds in carthage build for all these platforms
// If you want e.g. watchos support, then add handling anywhere $PLATFORM_NAME appears in the build script
Expand All @@ -19,8 +20,8 @@ SUPPORTED_PLATFORMS = iphonesimulator iphoneos macosx
// {aarch64,x86_64}-apple-ios targets with custom LLVM target triples. This is all in the name of avoiding
// a bunch of linker or xcframework creation errors where the static libraries have bad versions embedded
// in the Mach-O load directives. This is only a problem for iphoneos/iphonesimulator.
IPHONEOS_DEPLOYMENT_TARGET = 11.0
MACOSX_DEPLOYMENT_TARGET = 10.13
IPHONEOS_DEPLOYMENT_TARGET = 13.0
MACOSX_DEPLOYMENT_TARGET = 10.10

// Because we set important env variables in this file,
// make sure the external build tool target gets this xcconfig.
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ CLANG_ENABLE_MODULES = YES

// Finding citeproc-rs' ffi static library

// Finds a modulemap file at citeproc-rs/bindings/ffi/module.modulemap
// Finds a modulemap file at citeproc-rs/bindings/ffi/modules/swift/module.modulemap
SWIFT_INCLUDE_PATHS = citeproc-rs/bindings/ffi/modules/swift
// If you're embedding in an objc project, etc, using only headers no modules
// HEADER_SEARCH_PATHS = $(inherited) "$(PROJECT_DIR)/citeproc-rs/bindings/ffi/include"
Expand Down
File renamed without changes.
Loading