From 4c755a2300ef38763809e063641567cfba4a929d Mon Sep 17 00:00:00 2001 From: Philip Niedertscheider Date: Sun, 11 Oct 2026 18:46:26 +0200 Subject: [PATCH] chore: Remove Carthage integration support --- .gitignore | 9 - .swiftlint.yml | 1 - Dangerfile.swift | 8 - Documentation/Installation.md | 23 +- Example iOS-Carthage/Cartfile | 1 - Example iOS-Carthage/Example/Info.plist | 41 -- .../project.pbxproj | 599 ------------------ .../contents.xcworkspacedata | 7 - .../xcshareddata/IDEWorkspaceChecks.plist | 8 - .../xcschemes/Example iOS (Carthage).xcscheme | 78 --- README.md | 1 - Shared iOS/Assets/Base.lproj/Main.storyboard | 4 +- scripts/carthage.sh | 23 - 13 files changed, 4 insertions(+), 799 deletions(-) delete mode 100644 Example iOS-Carthage/Cartfile delete mode 100644 Example iOS-Carthage/Example/Info.plist delete mode 100644 Example iOS-Carthage/Example_iOS-Carthage.xcodeproj/project.pbxproj delete mode 100644 Example iOS-Carthage/Example_iOS-Carthage.xcodeproj/project.xcworkspace/contents.xcworkspacedata delete mode 100644 Example iOS-Carthage/Example_iOS-Carthage.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 Example iOS-Carthage/Example_iOS-Carthage.xcodeproj/xcshareddata/xcschemes/Example iOS (Carthage).xcscheme delete mode 100755 scripts/carthage.sh diff --git a/.gitignore b/.gitignore index 6a0173ea9..945ea5888 100644 --- a/.gitignore +++ b/.gitignore @@ -42,18 +42,9 @@ Example*/dependencies-state.json Example*/manifest.db Exampl*/repositories -# Carthage -Example*/Carthage -Example*/derived_data -Example*/Cartfile.resolved - # Swift Package Manager .swiftpm -# Xcode Schemes, so Carthage doesn't complain -!Example iOS/TPPDF.xcodeproj/xcsharedata/xcschemes/TPPDF.xcscheme -!Example iOS/TPPDF.xcodeproj/xcsharedata/xcschemes/TPPDF-Example.xcscheme - # Ruby Gems vendor diff --git a/.swiftlint.yml b/.swiftlint.yml index 2e9e79907..c3846797d 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -5,7 +5,6 @@ disabled_rules: - inclusive_language - trailing_comma excluded: - - Carthage - Dangerfile.swift opt_in_rules: - array_init diff --git a/Dangerfile.swift b/Dangerfile.swift index 385dbfa71..37cadcd30 100644 --- a/Dangerfile.swift +++ b/Dangerfile.swift @@ -17,14 +17,6 @@ if (danger.github.pullRequest.additions ?? 0) > 500 { warn("Big PR, try to keep changes smaller if you can") } -// Added (or removed) library files need to be added (or removed) from the -// Xcode project to avoid breaking things for our Carthage/manual framework. -let addedSwiftLibraryFiles = danger.git.createdFiles.contains { $0.fileType == .swift && $0.hasPrefix("Source") } -let deletedSwiftLibraryFiles = danger.git.deletedFiles.contains { $0.fileType == .swift && $0.hasPrefix("Source") } -if addedSwiftLibraryFiles || deletedSwiftLibraryFiles { - fail("Added or removed library files require the Carthage Xcode project to be updated.") -} - // Warning message for not updated package manifest(s) let manifests = [ "Package.swift", diff --git a/Documentation/Installation.md b/Documentation/Installation.md index a2f752333..63e74871b 100644 --- a/Documentation/Installation.md +++ b/Documentation/Installation.md @@ -12,30 +12,11 @@ As of TPPDF 2.0 and Swift 5.2, we do not actively support older Swift versions a | Swift 2.3 | [swift-2.3](https://github.com/techprimate/TPPDF/tree/swift-2.3) | Xcode 8, Xcode 7.3.x | iOS 8.0+ | | Swift 2.2 | [swift-2.2](https://github.com/techprimate/TPPDF/tree/swift-2.3) | Xcode 7.3.x | iOS 8.0+ | -## Carthage - -[Carthage](https://github.com/Carthage/Carthage) is a decentralized dependency manager that builds your dependencies and provides you with binary frameworks. - -You can install Carthage with [Homebrew](http://brew.sh/) using the following command: - -```bash -$ brew update -$ brew install carthage -``` - -To integrate TPPDF into your Xcode project using Carthage, specify it in your `Cartfile`: - -```ogdl -github "techprimate/TPPDF" ~> 1.4 -``` - -Run `carthage update` to build the framework and drag the built `TPPDF.framework` into your Xcode project - ## Swift Package Manager -Swift Package Manager is now supported for iOS. macOS support is a requested feature and work-in-progress. +Swift Package Manager is the supported dependency manager for TPPDF on iOS, macOS, Mac Catalyst, tvOS, watchOS, and visionOS. -Linux support is not available, as `UIKit` is not available on linux. +Linux is not supported because TPPDF depends on Apple graphics frameworks. Once you have your Swift package set up, adding TPPDF as a dependency is as easy as adding it to the `dependencies` value of your `Package.swift`. diff --git a/Example iOS-Carthage/Cartfile b/Example iOS-Carthage/Cartfile deleted file mode 100644 index edcac16dc..000000000 --- a/Example iOS-Carthage/Cartfile +++ /dev/null @@ -1 +0,0 @@ -github "techprimate/TPPDF" "main" diff --git a/Example iOS-Carthage/Example/Info.plist b/Example iOS-Carthage/Example/Info.plist deleted file mode 100644 index 938144460..000000000 --- a/Example iOS-Carthage/Example/Info.plist +++ /dev/null @@ -1,41 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleDisplayName - TPPDF - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - LSRequiresIPhoneOS - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - - - diff --git a/Example iOS-Carthage/Example_iOS-Carthage.xcodeproj/project.pbxproj b/Example iOS-Carthage/Example_iOS-Carthage.xcodeproj/project.pbxproj deleted file mode 100644 index b5c21d3dd..000000000 --- a/Example iOS-Carthage/Example_iOS-Carthage.xcodeproj/project.pbxproj +++ /dev/null @@ -1,599 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 54; - objects = { - -/* Begin PBXBuildFile section */ - 607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD51AFB9204008FA782 /* AppDelegate.swift */; }; - 607FACD81AFB9204008FA782 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD71AFB9204008FA782 /* ViewController.swift */; }; - 607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 607FACD91AFB9204008FA782 /* Main.storyboard */; }; - 607FACDD1AFB9204008FA782 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDC1AFB9204008FA782 /* Images.xcassets */; }; - 607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDE1AFB9204008FA782 /* LaunchScreen.xib */; }; - D49855392461FB0B00D54270 /* ExampleFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = D49855182461FB0B00D54270 /* ExampleFactory.swift */; }; - D498553A2461FB0B00D54270 /* TimeUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = D49855192461FB0B00D54270 /* TimeUtils.swift */; }; - D498553B2461FB0B00D54270 /* LoremIpsum.swift in Sources */ = {isa = PBXBuildFile; fileRef = D498551A2461FB0B00D54270 /* LoremIpsum.swift */; }; - D498553D2461FB0B00D54270 /* PaginationExampleFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = D498551E2461FB0B00D54270 /* PaginationExampleFactory.swift */; }; - D498553E2461FB0B00D54270 /* TableOfContentsExampleFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = D498551F2461FB0B00D54270 /* TableOfContentsExampleFactory.swift */; }; - D498553F2461FB0B00D54270 /* TableExampleFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = D49855202461FB0B00D54270 /* TableExampleFactory.swift */; }; - D49855402461FB0B00D54270 /* LineSeparatorExampleFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = D49855212461FB0B00D54270 /* LineSeparatorExampleFactory.swift */; }; - D49855412461FB0B00D54270 /* TextStylesExampleFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = D49855222461FB0B00D54270 /* TextStylesExampleFactory.swift */; }; - D49855422461FB0B00D54270 /* MultiSectionExampleFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = D49855232461FB0B00D54270 /* MultiSectionExampleFactory.swift */; }; - D49855432461FB0B00D54270 /* GroupExampleFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = D49855242461FB0B00D54270 /* GroupExampleFactory.swift */; }; - D49855442461FB0B00D54270 /* HeaderFooterExampleFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = D49855252461FB0B00D54270 /* HeaderFooterExampleFactory.swift */; }; - D49855452461FB0B00D54270 /* ExternalDocumentExampleFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = D49855262461FB0B00D54270 /* ExternalDocumentExampleFactory.swift */; }; - D49855462461FB0B00D54270 /* MultipleDocumentsExampleFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = D49855272461FB0B00D54270 /* MultipleDocumentsExampleFactory.swift */; }; - D49855472461FB0B00D54270 /* ListExampleFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = D49855282461FB0B00D54270 /* ListExampleFactory.swift */; }; - D49855482461FB0B00D54270 /* TextExampleFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = D49855292461FB0B00D54270 /* TextExampleFactory.swift */; }; - D49855492461FB0B00D54270 /* ObjectAttributesExampleFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = D498552A2461FB0B00D54270 /* ObjectAttributesExampleFactory.swift */; }; - D498554A2461FB0B00D54270 /* ExperimentFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = D498552B2461FB0B00D54270 /* ExperimentFactory.swift */; }; - D498554B2461FB0B00D54270 /* ImageExampleFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = D498552C2461FB0B00D54270 /* ImageExampleFactory.swift */; }; - D498554C2461FB0B00D54270 /* MetadataExampleFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = D498552D2461FB0B00D54270 /* MetadataExampleFactory.swift */; }; - D498554D2461FB0B00D54270 /* sample.pdf in Resources */ = {isa = PBXBuildFile; fileRef = D49855302461FB0B00D54270 /* sample.pdf */; }; - D498554E2461FB0B00D54270 /* Image-2.jpg in Resources */ = {isa = PBXBuildFile; fileRef = D49855322461FB0B00D54270 /* Image-2.jpg */; }; - D498554F2461FB0B00D54270 /* PortraitImage.jpg in Resources */ = {isa = PBXBuildFile; fileRef = D49855332461FB0B00D54270 /* PortraitImage.jpg */; }; - D49855502461FB0B00D54270 /* Image.jpg in Resources */ = {isa = PBXBuildFile; fileRef = D49855342461FB0B00D54270 /* Image.jpg */; }; - D49855512461FB0B00D54270 /* Image-3.jpg in Resources */ = {isa = PBXBuildFile; fileRef = D49855352461FB0B00D54270 /* Image-3.jpg */; }; - D49855522461FB0B00D54270 /* Image-1.jpg in Resources */ = {isa = PBXBuildFile; fileRef = D49855362461FB0B00D54270 /* Image-1.jpg */; }; - D49855532461FB0B00D54270 /* Image-4.jpg in Resources */ = {isa = PBXBuildFile; fileRef = D49855372461FB0B00D54270 /* Image-4.jpg */; }; - D49855542461FB0B00D54270 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = D49855382461FB0B00D54270 /* Icon.png */; }; - D49855562461FB9A00D54270 /* Examples.swift in Sources */ = {isa = PBXBuildFile; fileRef = D49855552461FB9A00D54270 /* Examples.swift */; }; - D49B06002658E7FD0084A0B7 /* DocumentSettingsExampleFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = D49B05FF2658E7FD0084A0B7 /* DocumentSettingsExampleFactory.swift */; }; - D4D28D2323AA1A6D00028D5A /* ExamplesListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4D28D2223AA1A6D00028D5A /* ExamplesListViewController.swift */; }; - D4FF9A28249A488A006FF2ED /* TPPDF.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4FF9A27249A488A006FF2ED /* TPPDF.framework */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - 607FACD01AFB9204008FA782 /* Example_iOS-Carthage.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Example_iOS-Carthage.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 607FACD41AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 607FACD51AFB9204008FA782 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 607FACD71AFB9204008FA782 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; - 607FACDA1AFB9204008FA782 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 607FACDC1AFB9204008FA782 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; - 607FACDF1AFB9204008FA782 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; - D49855182461FB0B00D54270 /* ExampleFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExampleFactory.swift; sourceTree = ""; }; - D49855192461FB0B00D54270 /* TimeUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TimeUtils.swift; sourceTree = ""; }; - D498551A2461FB0B00D54270 /* LoremIpsum.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoremIpsum.swift; sourceTree = ""; }; - D498551E2461FB0B00D54270 /* PaginationExampleFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PaginationExampleFactory.swift; sourceTree = ""; }; - D498551F2461FB0B00D54270 /* TableOfContentsExampleFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableOfContentsExampleFactory.swift; sourceTree = ""; }; - D49855202461FB0B00D54270 /* TableExampleFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableExampleFactory.swift; sourceTree = ""; }; - D49855212461FB0B00D54270 /* LineSeparatorExampleFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LineSeparatorExampleFactory.swift; sourceTree = ""; }; - D49855222461FB0B00D54270 /* TextStylesExampleFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextStylesExampleFactory.swift; sourceTree = ""; }; - D49855232461FB0B00D54270 /* MultiSectionExampleFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MultiSectionExampleFactory.swift; sourceTree = ""; }; - D49855242461FB0B00D54270 /* GroupExampleFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GroupExampleFactory.swift; sourceTree = ""; }; - D49855252461FB0B00D54270 /* HeaderFooterExampleFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HeaderFooterExampleFactory.swift; sourceTree = ""; }; - D49855262461FB0B00D54270 /* ExternalDocumentExampleFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExternalDocumentExampleFactory.swift; sourceTree = ""; }; - D49855272461FB0B00D54270 /* MultipleDocumentsExampleFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MultipleDocumentsExampleFactory.swift; sourceTree = ""; }; - D49855282461FB0B00D54270 /* ListExampleFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListExampleFactory.swift; sourceTree = ""; }; - D49855292461FB0B00D54270 /* TextExampleFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextExampleFactory.swift; sourceTree = ""; }; - D498552A2461FB0B00D54270 /* ObjectAttributesExampleFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObjectAttributesExampleFactory.swift; sourceTree = ""; }; - D498552B2461FB0B00D54270 /* ExperimentFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExperimentFactory.swift; sourceTree = ""; }; - D498552C2461FB0B00D54270 /* ImageExampleFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageExampleFactory.swift; sourceTree = ""; }; - D498552D2461FB0B00D54270 /* MetadataExampleFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MetadataExampleFactory.swift; sourceTree = ""; }; - D49855302461FB0B00D54270 /* sample.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = sample.pdf; sourceTree = ""; }; - D49855322461FB0B00D54270 /* Image-2.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "Image-2.jpg"; sourceTree = ""; }; - D49855332461FB0B00D54270 /* PortraitImage.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = PortraitImage.jpg; sourceTree = ""; }; - D49855342461FB0B00D54270 /* Image.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = Image.jpg; sourceTree = ""; }; - D49855352461FB0B00D54270 /* Image-3.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "Image-3.jpg"; sourceTree = ""; }; - D49855362461FB0B00D54270 /* Image-1.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "Image-1.jpg"; sourceTree = ""; }; - D49855372461FB0B00D54270 /* Image-4.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "Image-4.jpg"; sourceTree = ""; }; - D49855382461FB0B00D54270 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = ""; }; - D49855552461FB9A00D54270 /* Examples.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Examples.swift; sourceTree = ""; }; - D49B05FF2658E7FD0084A0B7 /* DocumentSettingsExampleFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DocumentSettingsExampleFactory.swift; sourceTree = ""; }; - D4D28D2223AA1A6D00028D5A /* ExamplesListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExamplesListViewController.swift; sourceTree = ""; }; - D4FF9A27249A488A006FF2ED /* TPPDF.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TPPDF.framework; path = Carthage/Build/iOS/TPPDF.framework; sourceTree = SOURCE_ROOT; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 607FACCD1AFB9204008FA782 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - D4FF9A28249A488A006FF2ED /* TPPDF.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 607FACC71AFB9204008FA782 = { - isa = PBXGroup; - children = ( - D4FF9A26249A487B006FF2ED /* Frameworks */, - 607FACD21AFB9204008FA782 /* Example */, - 607FACD11AFB9204008FA782 /* Products */, - ); - sourceTree = ""; - }; - 607FACD11AFB9204008FA782 /* Products */ = { - isa = PBXGroup; - children = ( - 607FACD01AFB9204008FA782 /* Example_iOS-Carthage.app */, - ); - name = Products; - sourceTree = ""; - }; - 607FACD21AFB9204008FA782 /* Example */ = { - isa = PBXGroup; - children = ( - D49855162461FB0B00D54270 /* Shared */, - D4D28D3923AA289500028D5A /* UI */, - D4B0D6C524629CBB00493C91 /* Assets */, - 607FACD31AFB9204008FA782 /* Supporting Files */, - ); - path = Example; - sourceTree = ""; - }; - 607FACD31AFB9204008FA782 /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 607FACD41AFB9204008FA782 /* Info.plist */, - ); - name = "Supporting Files"; - path = Example; - sourceTree = SOURCE_ROOT; - }; - D49855162461FB0B00D54270 /* Shared */ = { - isa = PBXGroup; - children = ( - D49855172461FB0B00D54270 /* Util */, - D498551D2461FB0B00D54270 /* Examples */, - D498552E2461FB0B00D54270 /* Data */, - ); - name = Shared; - path = ../../Shared; - sourceTree = ""; - }; - D49855172461FB0B00D54270 /* Util */ = { - isa = PBXGroup; - children = ( - D49855182461FB0B00D54270 /* ExampleFactory.swift */, - D49855192461FB0B00D54270 /* TimeUtils.swift */, - D498551A2461FB0B00D54270 /* LoremIpsum.swift */, - ); - path = Util; - sourceTree = ""; - }; - D498551D2461FB0B00D54270 /* Examples */ = { - isa = PBXGroup; - children = ( - D49B05FF2658E7FD0084A0B7 /* DocumentSettingsExampleFactory.swift */, - D498551E2461FB0B00D54270 /* PaginationExampleFactory.swift */, - D498551F2461FB0B00D54270 /* TableOfContentsExampleFactory.swift */, - D49855202461FB0B00D54270 /* TableExampleFactory.swift */, - D49855212461FB0B00D54270 /* LineSeparatorExampleFactory.swift */, - D49855222461FB0B00D54270 /* TextStylesExampleFactory.swift */, - D49855232461FB0B00D54270 /* MultiSectionExampleFactory.swift */, - D49855242461FB0B00D54270 /* GroupExampleFactory.swift */, - D49855252461FB0B00D54270 /* HeaderFooterExampleFactory.swift */, - D49855262461FB0B00D54270 /* ExternalDocumentExampleFactory.swift */, - D49855272461FB0B00D54270 /* MultipleDocumentsExampleFactory.swift */, - D49855282461FB0B00D54270 /* ListExampleFactory.swift */, - D49855292461FB0B00D54270 /* TextExampleFactory.swift */, - D498552A2461FB0B00D54270 /* ObjectAttributesExampleFactory.swift */, - D498552B2461FB0B00D54270 /* ExperimentFactory.swift */, - D498552C2461FB0B00D54270 /* ImageExampleFactory.swift */, - D498552D2461FB0B00D54270 /* MetadataExampleFactory.swift */, - D49855552461FB9A00D54270 /* Examples.swift */, - ); - path = Examples; - sourceTree = ""; - }; - D498552E2461FB0B00D54270 /* Data */ = { - isa = PBXGroup; - children = ( - D498552F2461FB0B00D54270 /* Documents */, - D49855312461FB0B00D54270 /* Images */, - ); - path = Data; - sourceTree = ""; - }; - D498552F2461FB0B00D54270 /* Documents */ = { - isa = PBXGroup; - children = ( - D49855302461FB0B00D54270 /* sample.pdf */, - ); - path = Documents; - sourceTree = ""; - }; - D49855312461FB0B00D54270 /* Images */ = { - isa = PBXGroup; - children = ( - D49855322461FB0B00D54270 /* Image-2.jpg */, - D49855332461FB0B00D54270 /* PortraitImage.jpg */, - D49855342461FB0B00D54270 /* Image.jpg */, - D49855352461FB0B00D54270 /* Image-3.jpg */, - D49855362461FB0B00D54270 /* Image-1.jpg */, - D49855372461FB0B00D54270 /* Image-4.jpg */, - D49855382461FB0B00D54270 /* Icon.png */, - ); - path = Images; - sourceTree = ""; - }; - D4B0D6C524629CBB00493C91 /* Assets */ = { - isa = PBXGroup; - children = ( - 607FACD91AFB9204008FA782 /* Main.storyboard */, - 607FACDC1AFB9204008FA782 /* Images.xcassets */, - 607FACDE1AFB9204008FA782 /* LaunchScreen.xib */, - ); - name = Assets; - path = "../../Shared iOS/Assets"; - sourceTree = ""; - }; - D4D28D3923AA289500028D5A /* UI */ = { - isa = PBXGroup; - children = ( - 607FACD51AFB9204008FA782 /* AppDelegate.swift */, - 607FACD71AFB9204008FA782 /* ViewController.swift */, - D4D28D2223AA1A6D00028D5A /* ExamplesListViewController.swift */, - ); - name = UI; - path = "../../Shared iOS/UI"; - sourceTree = ""; - }; - D4FF9A26249A487B006FF2ED /* Frameworks */ = { - isa = PBXGroup; - children = ( - D4FF9A27249A488A006FF2ED /* TPPDF.framework */, - ); - name = Frameworks; - path = Example; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 607FACCF1AFB9204008FA782 /* Example_iOS-Carthage */ = { - isa = PBXNativeTarget; - buildConfigurationList = 607FACEF1AFB9204008FA782 /* Build configuration list for PBXNativeTarget "Example_iOS-Carthage" */; - buildPhases = ( - 607FACCC1AFB9204008FA782 /* Sources */, - 607FACCD1AFB9204008FA782 /* Frameworks */, - 607FACCE1AFB9204008FA782 /* Resources */, - D4FF9A2A249A489C006FF2ED /* Carthage */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "Example_iOS-Carthage"; - packageProductDependencies = ( - ); - productName = TPPDF; - productReference = 607FACD01AFB9204008FA782 /* Example_iOS-Carthage.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 607FACC81AFB9204008FA782 /* Project object */ = { - isa = PBXProject; - attributes = { - BuildIndependentTargetsInParallel = YES; - LastSwiftUpdateCheck = 1010; - LastUpgradeCheck = 2620; - ORGANIZATIONNAME = "techprimate GmbH"; - TargetAttributes = { - 607FACCF1AFB9204008FA782 = { - CreatedOnToolsVersion = 6.3.1; - LastSwiftMigration = 1020; - ProvisioningStyle = Manual; - }; - }; - }; - buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "Example_iOS-Carthage" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 607FACC71AFB9204008FA782; - packageReferences = ( - ); - productRefGroup = 607FACD11AFB9204008FA782 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 607FACCF1AFB9204008FA782 /* Example_iOS-Carthage */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 607FACCE1AFB9204008FA782 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - D49855502461FB0B00D54270 /* Image.jpg in Resources */, - D498554D2461FB0B00D54270 /* sample.pdf in Resources */, - D49855532461FB0B00D54270 /* Image-4.jpg in Resources */, - 607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */, - 607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */, - 607FACDD1AFB9204008FA782 /* Images.xcassets in Resources */, - D49855512461FB0B00D54270 /* Image-3.jpg in Resources */, - D498554F2461FB0B00D54270 /* PortraitImage.jpg in Resources */, - D49855542461FB0B00D54270 /* Icon.png in Resources */, - D49855522461FB0B00D54270 /* Image-1.jpg in Resources */, - D498554E2461FB0B00D54270 /* Image-2.jpg in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - D4FF9A2A249A489C006FF2ED /* Carthage */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "$(SRCROOT)/Carthage/Build/iOS/TPPDF.framework", - ); - name = Carthage; - outputFileListPaths = ( - ); - outputPaths = ( - "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/TPPDF.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/usr/local/bin/carthage copy-frameworks\n"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 607FACCC1AFB9204008FA782 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - D498553E2461FB0B00D54270 /* TableOfContentsExampleFactory.swift in Sources */, - 607FACD81AFB9204008FA782 /* ViewController.swift in Sources */, - D498553A2461FB0B00D54270 /* TimeUtils.swift in Sources */, - D49855462461FB0B00D54270 /* MultipleDocumentsExampleFactory.swift in Sources */, - 607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */, - D49855562461FB9A00D54270 /* Examples.swift in Sources */, - D49855492461FB0B00D54270 /* ObjectAttributesExampleFactory.swift in Sources */, - D49855452461FB0B00D54270 /* ExternalDocumentExampleFactory.swift in Sources */, - D49855442461FB0B00D54270 /* HeaderFooterExampleFactory.swift in Sources */, - D4D28D2323AA1A6D00028D5A /* ExamplesListViewController.swift in Sources */, - D49855402461FB0B00D54270 /* LineSeparatorExampleFactory.swift in Sources */, - D49855432461FB0B00D54270 /* GroupExampleFactory.swift in Sources */, - D498553F2461FB0B00D54270 /* TableExampleFactory.swift in Sources */, - D498554A2461FB0B00D54270 /* ExperimentFactory.swift in Sources */, - D49855482461FB0B00D54270 /* TextExampleFactory.swift in Sources */, - D498553B2461FB0B00D54270 /* LoremIpsum.swift in Sources */, - D49855392461FB0B00D54270 /* ExampleFactory.swift in Sources */, - D498554C2461FB0B00D54270 /* MetadataExampleFactory.swift in Sources */, - D49855412461FB0B00D54270 /* TextStylesExampleFactory.swift in Sources */, - D49B06002658E7FD0084A0B7 /* DocumentSettingsExampleFactory.swift in Sources */, - D49855472461FB0B00D54270 /* ListExampleFactory.swift in Sources */, - D498553D2461FB0B00D54270 /* PaginationExampleFactory.swift in Sources */, - D49855422461FB0B00D54270 /* MultiSectionExampleFactory.swift in Sources */, - D498554B2461FB0B00D54270 /* ImageExampleFactory.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXVariantGroup section */ - 607FACD91AFB9204008FA782 /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 607FACDA1AFB9204008FA782 /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; - 607FACDE1AFB9204008FA782 /* LaunchScreen.xib */ = { - isa = PBXVariantGroup; - children = ( - 607FACDF1AFB9204008FA782 /* Base */, - ); - name = LaunchScreen.xib; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 607FACED1AFB9204008FA782 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - STRING_CATALOG_GENERATE_SYMBOLS = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; - }; - name = Debug; - }; - 607FACEE1AFB9204008FA782 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; - STRING_CATALOG_GENERATE_SYMBOLS = YES; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 4.2; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - 607FACF01AFB9204008FA782 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", - ); - GCC_WARN_UNUSED_LABEL = YES; - GCC_WARN_UNUSED_PARAMETER = YES; - INFOPLIST_FILE = Example/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - MODULE_NAME = ExampleApp; - PRODUCT_BUNDLE_IDENTIFIER = com.techprimate.tppdf.example; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; - }; - name = Debug; - }; - 607FACF11AFB9204008FA782 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", - ); - GCC_WARN_UNUSED_LABEL = YES; - GCC_WARN_UNUSED_PARAMETER = YES; - INFOPLIST_FILE = Example/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - MODULE_NAME = ExampleApp; - PRODUCT_BUNDLE_IDENTIFIER = com.techprimate.tppdf.example; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "Example_iOS-Carthage" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 607FACED1AFB9204008FA782 /* Debug */, - 607FACEE1AFB9204008FA782 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 607FACEF1AFB9204008FA782 /* Build configuration list for PBXNativeTarget "Example_iOS-Carthage" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 607FACF01AFB9204008FA782 /* Debug */, - 607FACF11AFB9204008FA782 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 607FACC81AFB9204008FA782 /* Project object */; -} diff --git a/Example iOS-Carthage/Example_iOS-Carthage.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Example iOS-Carthage/Example_iOS-Carthage.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 919434a62..000000000 --- a/Example iOS-Carthage/Example_iOS-Carthage.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/Example iOS-Carthage/Example_iOS-Carthage.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Example iOS-Carthage/Example_iOS-Carthage.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003..000000000 --- a/Example iOS-Carthage/Example_iOS-Carthage.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/Example iOS-Carthage/Example_iOS-Carthage.xcodeproj/xcshareddata/xcschemes/Example iOS (Carthage).xcscheme b/Example iOS-Carthage/Example_iOS-Carthage.xcodeproj/xcshareddata/xcschemes/Example iOS (Carthage).xcscheme deleted file mode 100644 index acd4fb996..000000000 --- a/Example iOS-Carthage/Example_iOS-Carthage.xcodeproj/xcshareddata/xcschemes/Example iOS (Carthage).xcscheme +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/README.md b/README.md index c093faa1c..aadcef66c 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,6 @@
Swift Package Manager - Carthage

diff --git a/Shared iOS/Assets/Base.lproj/Main.storyboard b/Shared iOS/Assets/Base.lproj/Main.storyboard index dc08e690d..dcb411723 100644 --- a/Shared iOS/Assets/Base.lproj/Main.storyboard +++ b/Shared iOS/Assets/Base.lproj/Main.storyboard @@ -10,7 +10,7 @@ - + @@ -59,7 +59,7 @@ - + diff --git a/scripts/carthage.sh b/scripts/carthage.sh deleted file mode 100755 index 1a9b0663f..000000000 --- a/scripts/carthage.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -# carthage.sh -# Usage example: ./carthage.sh build --platform iOS - -# Documentation: https://github.com/Carthage/Carthage/blob/main/Documentation/Xcode12Workaround.md - -set -euo pipefail - -xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX) -trap 'rm -f "$xcconfig"' INT TERM HUP EXIT - -# For Xcode 12 make sure EXCLUDED_ARCHS is set to arm architectures otherwise -# the build will fail on lipo due to duplicate architectures. - -CURRENT_XCODE_VERSION=$(xcodebuild -version | grep "Build version" | cut -d' ' -f3) -{ - echo "EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_$CURRENT_XCODE_VERSION = arm64 arm64e armv7 armv7s armv6 armv8" - echo "EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200 = \$(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_\$(XCODE_PRODUCT_BUILD_VERSION))" - echo "EXCLUDED_ARCHS = \$(inherited) \$(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_\$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_\$(NATIVE_ARCH_64_BIT)__XCODE_\$(XCODE_VERSION_MAJOR))" -} >>"$xcconfig" - -export XCODE_XCCONFIG_FILE="$xcconfig" -carthage "$@"