From d1ce71425c1a147d499f5273dba9dd535a392601 Mon Sep 17 00:00:00 2001 From: Aferdita Muriqi Date: Tue, 12 Mar 2019 16:49:32 -0400 Subject: [PATCH 1/5] updated carthage dependency and added swift version to pod spec --- Cartfile.resolved | 2 +- r2-streamer-swift.podspec | 18 +++--------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/Cartfile.resolved b/Cartfile.resolved index dbdcdc96..1626fd2a 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,6 +1,6 @@ github "cezheng/Fuzi" "2.1.0" github "dexman/Minizip" "1.4.0" github "krzyzanowskim/CryptoSwift" "0.14.0" -github "readium/r2-shared-swift" "d9f2321cc55e17cbe3fe9031515f51a38751449a" +github "readium/r2-shared-swift" "a2b14aac194c286fc88efc27be288c06ad9a8f6b" github "swisspol/GCDWebServer" "3.5.2" github "tadija/AEXML" "4.3.3" diff --git a/r2-streamer-swift.podspec b/r2-streamer-swift.podspec index ff4e2f65..b15c5195 100644 --- a/r2-streamer-swift.podspec +++ b/r2-streamer-swift.podspec @@ -1,19 +1,8 @@ -# -# Be sure to run `pod spec lint r2-streamer-swift.podspec' to ensure this is a -# valid spec and to remove all comments including this before submitting the spec. -# -# To learn more about Podspec attributes see http://docs.cocoapods.org/specification.html -# To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/ -# - Pod::Spec.new do |s| - s.name = "R2Streamer" - s.version = "1.0.6" + s.name = "r2-streamer-swift" + s.version = "1.0.7" s.summary = "R2 Streamer" - s.description = <<-DESC - R2 Streamer - DESC s.homepage = "http://readium.github.io" s.license = "BSD 3-Clause License" s.author = { "Aferdita Muriqi" => "aferdita.muriqi@gmail.com" } @@ -22,10 +11,9 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/readium/r2-streamer-swift.git", :branch => "develop" } s.source_files = ["R2Streamer/**/*.{m,h,swift}", "Sources/**/*.{m,h,swift}"] s.exclude_files = ["**/Info*.plist","**/Carthage/*"] - s.preserve_paths = 'R2Streamer.framework' - s.vendored_frameworks = 'R2Streamer.framework' s.xcconfig = { 'FRAMEWORK_SEARCH_PATHS' => '"$(PODS_ROOT)/R2Streamer/**"' , 'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2'} + s.swift_version = "4.2" s.libraries = 'z' From dbf937ba182581f2392eb1ec8e84fd598b25f041 Mon Sep 17 00:00:00 2001 From: Aferdita Muriqi Date: Tue, 12 Mar 2019 17:21:21 -0400 Subject: [PATCH 2/5] renamed pod spec --- r2-streamer-swift.podspec => R2Streamer.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename r2-streamer-swift.podspec => R2Streamer.podspec (95%) diff --git a/r2-streamer-swift.podspec b/R2Streamer.podspec similarity index 95% rename from r2-streamer-swift.podspec rename to R2Streamer.podspec index b15c5195..bb15c736 100644 --- a/r2-streamer-swift.podspec +++ b/R2Streamer.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| - s.name = "r2-streamer-swift" + s.name = "R2Streamer" s.version = "1.0.7" s.summary = "R2 Streamer" s.homepage = "http://readium.github.io" From 203e9aeb270d2b0d288ed9b3a4de376528bfe36e Mon Sep 17 00:00:00 2001 From: Aferdita Muriqi Date: Tue, 12 Mar 2019 17:21:47 -0400 Subject: [PATCH 3/5] updated carthage dependencies --- Cartfile.resolved | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cartfile.resolved b/Cartfile.resolved index 1626fd2a..d84fe2db 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,6 +1,6 @@ github "cezheng/Fuzi" "2.1.0" github "dexman/Minizip" "1.4.0" github "krzyzanowskim/CryptoSwift" "0.14.0" -github "readium/r2-shared-swift" "a2b14aac194c286fc88efc27be288c06ad9a8f6b" +github "readium/r2-shared-swift" "29884d8ff23dceca50b2329b4a590195bac68387" github "swisspol/GCDWebServer" "3.5.2" github "tadija/AEXML" "4.3.3" From f75f82c6d292639bea5fc9ead51f4ae77f4d4958 Mon Sep 17 00:00:00 2001 From: Aferdita Muriqi Date: Tue, 12 Mar 2019 17:25:02 -0400 Subject: [PATCH 4/5] updated dependencies --- Cartfile.resolved | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cartfile.resolved b/Cartfile.resolved index d84fe2db..bec13fd9 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,6 +1,6 @@ github "cezheng/Fuzi" "2.1.0" github "dexman/Minizip" "1.4.0" github "krzyzanowskim/CryptoSwift" "0.14.0" -github "readium/r2-shared-swift" "29884d8ff23dceca50b2329b4a590195bac68387" +github "readium/r2-shared-swift" "678dbfede1e24ea5b924955176a331206b1a4450" github "swisspol/GCDWebServer" "3.5.2" github "tadija/AEXML" "4.3.3" From d1a380cb0f416df711241adbf3d8f975ae5f14d6 Mon Sep 17 00:00:00 2001 From: Aferdita Muriqi Date: Tue, 12 Mar 2019 17:25:23 -0400 Subject: [PATCH 5/5] changed run schema to debug --- .../xcshareddata/xcschemes/r2-streamer-swift.xcscheme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/r2-streamer-swift.xcodeproj/xcshareddata/xcschemes/r2-streamer-swift.xcscheme b/r2-streamer-swift.xcodeproj/xcshareddata/xcschemes/r2-streamer-swift.xcscheme index b68bd4b0..f4c4d88e 100644 --- a/r2-streamer-swift.xcodeproj/xcshareddata/xcschemes/r2-streamer-swift.xcscheme +++ b/r2-streamer-swift.xcodeproj/xcshareddata/xcschemes/r2-streamer-swift.xcscheme @@ -52,7 +52,7 @@