From 31a9044c461c595381e94b8742dda287456ceb3c Mon Sep 17 00:00:00 2001
From: Roy Marmelstein <marmelroy@gmail.com>
Date: Sun, 17 Jan 2016 18:59:49 +0100
Subject: [PATCH] Attempt to fix podspecs

---
 Zip.podspec | 15 ++++++---------
 Zip/minizip |  2 +-
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Zip.podspec b/Zip.podspec
index 230728f..db84f7a 100644
--- a/Zip.podspec
+++ b/Zip.podspec
@@ -30,16 +30,13 @@ Pod::Spec.new do |s|
   s.platform     = :ios, '8.0'
   s.requires_arc = true
 
-  s.source_files = 'Zip'
-  s.xcconfig = {'LIBRARY_SEARCH_PATHS' => '"$(PODS_ROOT)/minzip/"', 'CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES' => 'YES'}
-  # s.public_header_files = 'Pod/Classes/**/*.h'
-  s.libraries = 'libz.tbd'
+  s.source_files = 'Zip/*', 'Zip/minizip/*', 'Zip/minizip/aes/*'
+  s.public_header_files = 'Zip/*.h'
 
-  s.subspec 'minizip' do |ss|
-  ss.source_files = 'Zip/minizip/aes/sha1.h','Zip/minizip/aes/sha1.c','Zip/minizip/aes/prng.h','Zip/minizip/aes/prng.c','Zip/minizip/aes/aeskey.h','Zip/minizip/aes/aeskey.c','Zip/minizip/aes/aestab.h','Zip/minizip/aes/aestab.c','Zip/minizip/aes/hmac.h','Zip/minizip/aes/hmac.c','Zip/minizip/aes/entropy.h','Zip/minizip/aes/entropy.c','Zip/minizip/aes/aescrypt.h','Zip/minizip/aes/aescrypt.c','Zip/minizip/aes/fileenc.h','Zip/minizip/aes/fileenc.c','Zip/minizip/aes/pwd2key.h','Zip/minizip/aes/pwd2key.c','Zip/minizip/crypt.h','Zip/minizip/ioapi.h','Zip/minizip/ioapi.c','Zip/minizip/unzip.h','Zip/minizip/unzip.c','Zip/minizip/zip.h','Zip/minizip/zip.c'
-  ss.private_header_files = 'Zip/minizip/aes/sha1.h','Zip/minizip/aes/sha1.c','Zip/minizip/aes/prng.h','Zip/minizip/aes/prng.c','Zip/minizip/aes/aeskey.h','Zip/minizip/aes/aeskey.c','Zip/minizip/aes/aestab.h','Zip/minizip/aes/aestab.c','Zip/minizip/aes/hmac.h','Zip/minizip/aes/hmac.c','Zip/minizip/aes/entropy.h','Zip/minizip/aes/entropy.c','Zip/minizip/aes/aescrypt.h','Zip/minizip/aes/aescrypt.c','Zip/minizip/aes/fileenc.h','Zip/minizip/aes/fileenc.c','Zip/minizip/aes/pwd2key.h','Zip/minizip/aes/pwd2key.c','Zip/minizip/crypt.h','Zip/minizip/ioapi.h','Zip/minizip/ioapi.c','Zip/minizip/unzip.h','Zip/minizip/unzip.c','Zip/minizip/zip.h','Zip/minizip/zip.c'
-  ss.frameworks = 'Security'
-  end
+  s.xcconfig = {'LIBRARY_SEARCH_PATHS' => '"$(SRCROOT)/Zip/minizip/module.modulemap"', 'SWIFT_INCLUDE_PATHS' => '"$(SRCROOT)/Zip/minizip/module.modulemap"', 'CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES' => 'YES'}
+  # s.public_header_files = 'Pod/Classes/**/*.h'
+  s.libraries = 'z'
+  s.preserve_paths  = 'Zip/minizip/module.modulemap'
 
   # s.dependency 'AFNetworking', '~> 2.3'
 end
diff --git a/Zip/minizip b/Zip/minizip
index f427cd6..382767d 160000
--- a/Zip/minizip
+++ b/Zip/minizip
@@ -1 +1 @@
-Subproject commit f427cd69c91e32bbd0b6b558751be199aefb8a41
+Subproject commit 382767db3a0aa0f0f53c7cec88a53e4e6ad068ee
-- 
2.26.2