Commit Graph

332 Commits

Author SHA1 Message Date
Joshua Hudson b89bc45c57 Fix podspec, it would not validate for OSX part of validation. See comment by @krzyzanowskim at https://github.com/CocoaPods/CocoaPods/issues/3638 2016-01-27 09:38:00 -08:00
Joshua Hudson 057c493755 Disabled Truncated File Fix since it is not yet in AES version of mini zip lib v1.1 2016-01-27 09:04:43 -08:00
Joshua Hudson e6fb3f79fd Tests were trying to cast unsigned long long to NSInt and causing tests to fail reporting progress 2016-01-27 09:00:58 -08:00
Joshua Hudson fe1d90c173 Working on fixing tests 2016-01-26 17:59:45 -08:00
Joshua Hudson 1f45f3316e Merge pull request #227 from LootApp/mac-target
Mac target added + fix carthage support
2016-01-18 12:25:05 -08:00
Kyle McAlpine 8ebad1d54f Mac target and scheme added. Changed iOS target name. Module/Product Names remain project name. 2016-01-01 21:44:37 +00:00
Stuart Clift 5d7b8d8158 Configure for non-local Carthage build. 2015-12-21 13:44:15 +00:00
Stuart Clift 46ee64b2da Add minimal installation instructions. 2015-12-21 13:33:41 +00:00
Stu 508963a2fc Conditionally import due to module name differences. 2015-12-16 08:33:20 +00:00
Stu b4f17fd6d6 Integrate Carthage built framework 2015-12-16 08:14:08 +00:00
Stu bec7858cf8 Fix incorrect method signature in header 2015-12-16 07:44:03 +00:00
Joshua Hudson 2b751f36d9 Merge pull request #216 from lagapollo/patch-1
update SSZipArchive.h
2015-12-15 09:34:07 -08:00
Joshua Hudson 7ee91f6d86 Merge pull request #221 from wooga/master
error properly when crc check fails
2015-12-15 09:33:23 -08:00
Nick Jensen 7c60734bcc error properly when crc check fails 2015-12-15 15:16:02 +01:00
Joshua Hudson 578a157d88 Merge pull request #218 from smumryak/master
Added carthage support
2015-12-12 14:47:44 -08:00
Sergiy Mumryak 2078ed2565 Added carthage support 2015-12-13 00:01:51 +02:00
lagapollo 098a1ffa62 forgot semi-colon 2015-12-07 09:37:56 +01:00
lagapollo 6abbd98082 update SSZipArchive.h
For a project, I need to write a folder into the zip archive.
The method writeFolderAtPath: withFolderName: is only private and I need it from outside. 

I can't use class method because i'm creating the archive manually, i have multiple folders and multiples files to zip.
2015-12-07 09:36:17 +01:00
Joshua Hudson 9d277af7e9 Merge pull request #213 from AlexUnique/master
Mitigate potential memory-allocation related flaws
2015-12-02 13:07:31 -08:00
Alex Kalinichenko e97354433e Merge branch 'feature/Eliminate_unchecked_malloc_calls' into develop 2015-11-26 11:22:20 -05:00
Alex Kalinichenko 35fe9b6af4 Add guards for the malloc calls in zip.c file. 2015-11-26 11:11:01 -05:00
Alex Kalinichenko 744822d595 Add guards for the malloc calls in SSZipArchive.m file. 2015-11-26 10:47:55 -05:00
Joshua Hudson 644dedb048 Manually merged in AES support. #207, #199. Original PRs had errors. 2015-11-24 10:31:51 -08:00
Joshua Hudson 158f5747a8 Merge pull request #208 from ClementPadovani/patch-1
Added getters.
2015-11-17 09:13:36 -08:00
ClementPadovani 03f70718a2 Added getters.
Updated `BOOL` getters for `open` and `close`.
2015-11-17 15:17:13 +01:00
Joshua Hudson 7b2ccbb2b6 Update example podspecs (fixes #171) 2015-11-16 10:53:27 -08:00
Joshua Hudson 268556e8cf Merge pull request #206 from ZipArchive/revert-199-master
Revert "support aes,compatible old way for zip"
2015-11-16 10:47:12 -08:00
Joshua Hudson c466f6bd99 Revert "support aes,compatible old way for zip" 2015-11-16 10:46:30 -08:00
Joshua Hudson 964eb630e6 Merge pull request #199 from SLboat/master
support aes,compatible old way for zip
2015-11-16 10:41:18 -08:00
Joshua Hudson 812be0abb2 Merge pull request #188 from ANNotunzdY/master
comment typo
2015-11-16 10:40:28 -08:00
Joshua Hudson d2799f60a8 Merge branch 'master' of https://github.com/ZipArchive/ZipArchive v1.0.1 2015-11-16 10:04:02 -08:00
Joshua Hudson f984dad1c0 Bump spec to 1.0.1 per #184 2015-11-16 10:03:50 -08:00
Joshua Hudson 8cc285d1fc Update Readme 2015-11-11 07:25:13 -08:00
Joshua Hudson ed97cf82e3 Update Readme.md 2015-11-07 08:48:00 -08:00
Sen c2bd1bd51b AES FIX 2015-10-29 10:14:32 +08:00
Sen c601929993 compatible old way for zip 2015-10-29 06:57:03 +08:00
Sen f9b0642936 Merge branch 'minizip-aes' 2015-10-28 20:49:46 +08:00
Sen de2c1fe2f3 support password zip 2015-10-28 20:48:53 +08:00
Sen a523114ea1 update mini zip 1.1 to support aes... 2015-10-28 18:23:17 +08:00
Joshua Hudson 1bb8a98d51 Add's back change from #189
To merge in a bunch of greate changes I had to revert #189. Now that those are in I can roll that change back in.
v0.4.0
2015-10-24 15:40:46 -07:00
Joshua Hudson 662da2d427 Merge pull request #194 from WPMedia/feature/ssziparchive
@ssoper enhancements.
2015-10-24 15:36:00 -07:00
Joshua Hudson 3a222d9155 Merge pull request #192 from ZipArchive/revert-187-patch-2
Revert "Update SSZipArchive.podspec"
2015-10-24 15:33:24 -07:00
Joshua Hudson ab7eb21412 Merge pull request #193 from ZipArchive/revert-189-master
Revert "Close file pointer after adding to archive"
2015-10-24 15:33:02 -07:00
Joshua Hudson 40229f248b Revert "Close file pointer after adding to archive" 2015-10-24 15:29:11 -07:00
Joshua Hudson a7b0ae8f35 Revert "Update SSZipArchive.podspec" 2015-10-24 15:28:41 -07:00
Sean Soper 9ab5928c55 bumping podspec to 0.4.0, minor edits to README 2015-10-24 17:25:50 -04:00
Joshua Hudson 5bdd904a38 Merge pull request #187 from scamps88/patch-2
Update SSZipArchive.podspec
2015-10-23 15:10:24 -07:00
Joshua Hudson 489bd49cb4 Merge pull request #189 from colincameron/master
Close file pointer after adding to archive
2015-10-23 15:07:21 -07:00
Sean Soper 67cef95bb6 updated doc 2015-10-23 14:23:12 -04:00
Sean Soper 5a422fc833 Roll back changes made since 0.3.3 which was last known working version, move C libs around to get working in Pods 0.39 space, add Swift example, add Objective-C example, move tests and ensure they pass 2015-10-23 14:15:31 -04:00