Merge pull request #65 from readium/develop

V1.2.2

Author: aferditamuriqi

opds/.travis.yml

@@ -1,5 +1,9 @@
 language: swift
-osx_image: xcode10.1
+osx_image: xcode11
+xcode_project: readium-opds.xcodeproj
+xcode_scheme: readium-opds
+xcode_destination: platform=iOS Simulator,OS=11.3,name=iPhone X
+xcode_sdk: iphonesimulator13.0
 
 branches:
   only:
@@ -13,7 +17,8 @@ cache:
 before_install:
   - brew update
   - brew outdated carthage || brew upgrade carthage
-  - carthage update --verbose --no-use-binaries --platform iOS --cache-builds
+  - carthage bootstrap --verbose --no-use-binaries --platform iOS --cache-builds
 
 script:
-  - xcodebuild clean build -project readium-opds.xcodeproj -scheme readium-opds -destination "platform=iOS Simulator,name=iPhone 8,OS=11.3" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO -quiet
+  - xcodebuild clean build -quiet
+

opds/Cartfile

@@ -1,2 +1,2 @@
-github "readium/r2-shared-swift" == 1.3.4
-github "edrlab/Fuzi" == 2.2.2
+github "readium/r2-shared-swift" == 1.4.2
+github "cezheng/Fuzi" == 3.1.1

opds/Cartfile.resolved

@@ -1,2 +1,2 @@
-github "edrlab/Fuzi" "2.2.2"
-github "readium/r2-shared-swift" "1.3.4"
+github "cezheng/Fuzi" "3.1.1"
+github "readium/r2-shared-swift" "1.4.2"

opds/ReadiumOPDS.podspec

@@ -1,19 +1,19 @@
 Pod::Spec.new do |s|
 
   s.name         = "ReadiumOPDS"
-  s.version      = "1.0.4"
-  s.summary      = "Readium OPDS"
-  s.homepage     = "http://readium.github.io"
-  s.license      = "BSD 3-Clause License"
-  s.author       = { "Aferdita Muriqi" => "aferdita.muriqi@gmail.com" }
-  s.platform     = :ios
-  s.ios.deployment_target = "9.0"
-  s.source       = { :git => "https://github.com/readium/r2-opds-swift.git", :branch => "develop" }
+  s.version       = "1.2.2"
+  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.2" }
+  s.exclude_files = ["**/Info*.plist"]
+  s.requires_arc  = true
+  s.resources     = ['readium-opds/Resources/**']
   s.source_files  = "readium-opds/**/*.{m,h,swift}"
-  s.exclude_files = ["**/Info*.plist","**/Carthage/*"]
-  s.xcconfig            = { 'FRAMEWORK_SEARCH_PATHS' => '"$(PODS_ROOT)/ReadiumOPDS/**"' ,
-  'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2'}
-  s.swift_version  = "4.2"
+  s.platform      = :ios
+  s.ios.deployment_target = "10.0"
+  s.xcconfig      = { 'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2' }
 
   s.dependency 'R2Shared'
   s.dependency 'Fuzi'

opds/readium-opds.xcodeproj/project.pbxproj

@@ -261,7 +261,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -316,7 +316,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -347,8 +347,9 @@
 				PRODUCT_NAME = ReadiumOPDS;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
+				SUPPORTS_MACCATALYST = NO;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -377,7 +378,8 @@
 				PRODUCT_NAME = ReadiumOPDS;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
+				SUPPORTS_MACCATALYST = NO;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;