-
Notifications
You must be signed in to change notification settings - Fork 414
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into 4.0
Conflicts: Parchment.xcodeproj/project.pbxproj Parchment.xcodeproj/xcshareddata/xcschemes/Example.xcscheme Parchment.xcodeproj/xcshareddata/xcschemes/ExampleSwiftUI.xcscheme Parchment.xcodeproj/xcshareddata/xcschemes/Parchment.xcscheme README.md
- Loading branch information
Showing
11 changed files
with
78 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
5.7 | ||
5.9 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,19 @@ | ||
// swift-tools-version:5.7 | ||
// swift-tools-version:5.9 | ||
import PackageDescription | ||
|
||
let package = Package( | ||
name: "Parchment", | ||
platforms: [.iOS(.v11)], | ||
platforms: [.iOS(.v12)], | ||
products: [ | ||
.library(name: "Parchment", targets: ["Parchment"]), | ||
], | ||
targets: [ | ||
.target( | ||
name: "Parchment", | ||
path: "Parchment" | ||
path: "Parchment", | ||
resources: [ | ||
.copy("PrivacyInfo.xcprivacy") | ||
] | ||
) | ||
] | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,18 @@ | ||
{ | ||
"name": "Parchment", | ||
"version": "3.2.1", | ||
"version": "3.3.0", | ||
"license": "MIT", | ||
"summary": "A flexible paging menu controller with support for infinite data sources.", | ||
"description": "Parchment allows you to page between view controllers while showing menu items that scrolls along with the content. It’s build to be very customizable, it’s well-tested and written fully in Swift.", | ||
"homepage": "https://github.com/rechsteiner/Parchment", | ||
"authors": { | ||
"Martin Rechsteiner": "[email protected]" | ||
}, | ||
"social_media_url": "http://twitter.com/rechsteiner", | ||
"authors": "Martin Rechsteiner", | ||
"source": { | ||
"git": "https://github.com/rechsteiner/Parchment.git", | ||
"tag": "v3.2.1" | ||
"tag": "v3.3.0" | ||
}, | ||
"swift_version": "5.9", | ||
"platforms": { | ||
"ios": "11.0" | ||
"ios": "12.0" | ||
}, | ||
"source_files": [ | ||
"Parchment/**/*.swift", | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
Parchment.xcodeproj/xcshareddata/xcschemes/ExampleSwiftUI.xcscheme
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
<plist version="1.0"> | ||
<dict> | ||
<key>NSPrivacyCollectedDataTypes</key> | ||
<array> | ||
<dict> | ||
<key>NSPrivacyCollectedDataType</key> | ||
<string></string> | ||
<key>NSPrivacyCollectedDataTypeLinked</key> | ||
<false/> | ||
<key>NSPrivacyCollectedDataTypeTracking</key> | ||
<false/> | ||
<key>NSPrivacyCollectedDataTypePurposes</key> | ||
<array> | ||
<string></string> | ||
</array> | ||
</dict> | ||
</array> | ||
<key>NSPrivacyTracking</key> | ||
<false/> | ||
</dict> | ||
</plist> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters