Merge branch 'develop' into master

Author: mickael-menu

opds/.gitattributes

@@ -0,0 +1 @@
+*.pbxproj merge=union

opds/.github/CODEOWNERS

@@ -1,9 +1,9 @@
 language: swift
-osx_image: xcode11
+osx_image: xcode12.5
 xcode_project: readium-opds.xcodeproj
 xcode_scheme: readium-opds
-xcode_destination: platform=iOS Simulator,OS=11.3,name=iPhone X
-xcode_sdk: iphonesimulator13.0
+xcode_destination: platform=iOS Simulator,OS=14.5.1,name=iPhone X
+xcode_sdk: iphonesimulator14.5.1
 
 branches:
   only:
@@ -17,7 +17,12 @@ cache:
 before_install:
   - brew update
   - brew outdated carthage || brew upgrade carthage
-  - carthage bootstrap --verbose --no-use-binaries --platform iOS --cache-builds
+  - carthage bootstrap --verbose --no-use-binaries --use-xcframeworks --platform iOS --cache-builds
+  # The project expects .framework but we can only build XCFrameworks with Carthage on Xcode 12+.
+  # As a workaround, this will extract the .framework generated from the .xcframework files.
+  # See https://github.com/readium/r2-testapp-swift/issues/351#issuecomment-829250100
+  - mkdir -p Carthage/Build/iOS
+  - cp -r Carthage/Build/*.xcframework/ios-arm64_armv7/*.framework Carthage/Build/iOS
 
 script:
   - xcodebuild clean build -quiet

opds/.travis.yml

@@ -0,0 +1,47 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+**Warning:** Features marked as *experimental* may change or be removed in a future release without notice. Use with caution.
+
+<!--## [Unreleased]-->
+
+## [2.0.0]
+
+### Changed
+
+* Upgraded shared dependencies.
+
+## [2.0.0-beta.2]
+
+### Changed
+
+* Upgraded shared dependencies.
+
+
+## [2.0.0-beta.1]
+
+### Changed
+
+* Upgraded shared dependencies.
+
+
+## [2.0.0-alpha.2]
+
+### Changed
+
+* Update internal usage of the `Publication` shared models.
+
+
+## [2.0.0-alpha.1]
+
+### Changed
+
+* Update internal usage of the `Publication` shared models.
+
+[unreleased]: https://github.com/readium/r2-opds-swift/compare/master...HEAD
+[2.0.0-alpha.1]: https://github.com/readium/r2-opds-swift/compare/1.2.3...2.0.0-alpha.1
+[2.0.0-alpha.2]: https://github.com/readium/r2-opds-swift/compare/2.0.0-alpha.1...2.0.0-alpha.2
+[2.0.0-beta.1]: https://github.com/readium/r2-opds-swift/compare/2.0.0-alpha.2...2.0.0-beta.1
+[2.0.0-beta.2]: https://github.com/readium/r2-opds-swift/compare/2.0.0-beta.1...2.0.0-beta.2
+[2.0.0]: https://github.com/readium/r2-opds-swift/compare/2.0.0-beta.2...2.0.0

opds/CHANGELOG.md

@@ -1,2 +1,2 @@
-github "readium/r2-shared-swift" == 1.4.3
-github "cezheng/Fuzi" == 3.1.1
+github "readium/r2-shared-swift" "develop"
+github "cezheng/Fuzi" == 3.1.3

opds/Cartfile

@@ -1,2 +1,3 @@
-github "cezheng/Fuzi" "3.1.1"
-github "readium/r2-shared-swift" "1.4.3"
+github "cezheng/Fuzi" "3.1.3"
+github "dexman/Minizip" "1.4.0"
+github "readium/r2-shared-swift" "4d1735bcf2302570817b1ab239ade24289ff7c7f"

opds/Cartfile.resolved

@@ -1,9 +1,12 @@
 # OPDS Parser (Swift)
+
 [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](/LICENSE)
 
 A parser for OPDS 1.x and 2.0 written in Swift using the [Readium-2 shared model](https://github.com/readium/r2-shared-swift) 
 and [Readium Web Publication Manifest](https://github.com/readium/webpub-manifest).
 
+[Changes and releases are documented in the Changelog](CHANGELOG.md)
+
 ## Features
 
 - [x] Abstract model
@@ -32,48 +35,21 @@ install ReadiumOPDS with Carthage:
  2. Update your Cartfile to include the following:
 
     ```ruby
-    github "readium/r2-opds-swift" ~> 1.0.4
+    github "readium/r2-opds-swift" "develop"
     ```
+    
+ 3. Run:
+    * [`mkdir -p Carthage/Build/iOS`](https://github.com/Carthage/Carthage/issues/3122#issuecomment-784865551)
+    * `carthage update --use-xcframeworks`
 
- 3. Run `carthage update` and
-    [add the appropriate framework][Carthage Usage].
+ 4. [Add the appropriate framework][Carthage Usage].
 
 
 [Carthage]: https://github.com/Carthage/Carthage
 [Carthage Installation]: https://github.com/Carthage/Carthage#installing-carthage
 [Carthage Usage]: https://github.com/Carthage/Carthage#adding-frameworks-to-an-application
 
 
-### CocoaPods
-
-[CocoaPods][] is a dependency manager for Cocoa projects. To install
-ReadiumOPDS with CocoaPods:
-
- 1. Make sure CocoaPods is [installed][CocoaPods Installation]. (ReadiumOPDS
-    requires version 1.0.0 or greater.)
-
-    ```sh
-    # Using the default Ruby install will require you to use sudo when
-    # installing and updating gems.
-    [sudo] gem install cocoapods
-    ```
-
- 2. Update your Podfile to include the following:
-
-    ```ruby
-    use_frameworks!
-
-    target 'YourAppTargetName' do
-        pod 'ReadiumOPDS', :git => 'https://github.com/readium/r2-opds-swift.git'
-    end
-    ```
-
- 3. Run `pod install --repo-update`.
-
-[CocoaPods]: https://cocoapods.org
-[CocoaPods Installation]: https://guides.cocoapods.org/using/getting-started.html#getting-started
-
-
 #### Import
 
 In your Swift files:

opds/README.md

@@ -1,12 +1,12 @@
 Pod::Spec.new do |s|
 
   s.name         = "ReadiumOPDS"
-  s.version       = "1.2.3"
+  s.version       = "2.0.0"
   s.license       = "BSD 3-Clause License"
   s.summary       = "Readium OPDS"
   s.homepage      = "http://readium.github.io"
   s.author        = { "Aferdita Muriqi" => "aferdita.muriqi@gmail.com" }
-  s.source        = { :git => "https://github.com/readium/r2-opds-swift.git", :tag => "1.2.3" }
+  s.source        = { :git => "https://github.com/readium/r2-opds-swift.git", :branch => 'develop' }
   s.exclude_files = ["**/Info*.plist"]
   s.requires_arc  = true
   s.resources     = ['readium-opds/Resources/**']

opds/ReadiumOPDS.podspec

@@ -7,18 +7,18 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		03C3CC64222DBD2F00A01731 /* R2Shared.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03C3CC63222DBD2F00A01731 /* R2Shared.framework */; };
 		111E54DC2021022700A7FE9A /* OPDS2Parser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 111E54DB2021022700A7FE9A /* OPDS2Parser.swift */; };
 		AE49834720D902710013B912 /* ParseData.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE49834620D902710013B912 /* ParseData.swift */; };
 		AE6B98E020CAB93200117197 /* OPDSParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE6B98DF20CAB93200117197 /* OPDSParser.swift */; };
 		AED681F020A316160090DBCD /* URLHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = AED681EF20A316160090DBCD /* URLHelper.swift */; };
 		CA415ECB221D5307003A0F7F /* Deprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA415EC9221D5182003A0F7F /* Deprecated.swift */; };
+		CA7B77CC263AB97E00260838 /* R2Shared.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CA7B77CB263AB97E00260838 /* R2Shared.framework */; };
+		CA7B77D0263AB98800260838 /* Fuzi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CA7B77CF263AB98800260838 /* Fuzi.framework */; };
 		F34B7E5E1FA35B7900534FD3 /* readium_opds.h in Headers */ = {isa = PBXBuildFile; fileRef = F34B7E501FA35B7900534FD3 /* readium_opds.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		F34B7E691FA35BB100534FD3 /* OPDS1Parser.swift in Sources */ = {isa = PBXBuildFile; fileRef = F34B7E681FA35BB100534FD3 /* OPDS1Parser.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		03C3CC63222DBD2F00A01731 /* R2Shared.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = R2Shared.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		111E54CC201BBD9700A7FE9A /* wiki_1_1.opds */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = wiki_1_1.opds; path = "readium-opdsTests/Samples/wiki_1_1.opds"; sourceTree = SOURCE_ROOT; };
 		111E54D9201FC91600A7FE9A /* feedbooks_catalog.atom */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = feedbooks_catalog.atom; path = "readium-opdsTests/Samples/feedbooks_catalog.atom"; sourceTree = SOURCE_ROOT; };
 		111E54DB2021022700A7FE9A /* OPDS2Parser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OPDS2Parser.swift; sourceTree = "<group>"; };
@@ -28,6 +28,8 @@
 		AE6B98DF20CAB93200117197 /* OPDSParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OPDSParser.swift; sourceTree = "<group>"; };
 		AED681EF20A316160090DBCD /* URLHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLHelper.swift; sourceTree = "<group>"; };
 		CA415EC9221D5182003A0F7F /* Deprecated.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Deprecated.swift; sourceTree = "<group>"; };
+		CA7B77CB263AB97E00260838 /* R2Shared.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = R2Shared.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		CA7B77CF263AB98800260838 /* Fuzi.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Fuzi.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		F34B7E4D1FA35B7900534FD3 /* ReadiumOPDS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ReadiumOPDS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		F34B7E501FA35B7900534FD3 /* readium_opds.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = readium_opds.h; sourceTree = "<group>"; };
 		F34B7E511FA35B7900534FD3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -41,7 +43,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				03C3CC64222DBD2F00A01731 /* R2Shared.framework in Frameworks */,
+				CA7B77D0263AB98800260838 /* Fuzi.framework in Frameworks */,
+				CA7B77CC263AB97E00260838 /* R2Shared.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -105,7 +108,8 @@
 		F34B7E6A1FA35CEA00534FD3 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				03C3CC63222DBD2F00A01731 /* R2Shared.framework */,
+				CA7B77CF263AB98800260838 /* Fuzi.framework */,
+				CA7B77CB263AB97E00260838 /* R2Shared.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -149,7 +153,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0900;
-				LastUpgradeCheck = 0940;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = Readium;
 				TargetAttributes = {
 					F34B7E4C1FA35B7900534FD3 = {
@@ -229,6 +233,7 @@
 				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;
@@ -292,6 +297,7 @@
 				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;
@@ -341,7 +347,7 @@
 				HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
 				INFOPLIST_FILE = "readium-opds/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.readium.readium-opds";
 				PRODUCT_NAME = ReadiumOPDS;
@@ -372,7 +378,7 @@
 				HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
 				INFOPLIST_FILE = "readium-opds/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.readium.readium-opds";
 				PRODUCT_NAME = ReadiumOPDS;

opds/readium-opds.xcodeproj/project.pbxproj

@@ -0,0 +1,8 @@
+<?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>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>