Skip to content
This repository has been archived by the owner on Oct 2, 2021. It is now read-only.

Update GCDWebServer to latest version. #31

Closed
wants to merge 2 commits into from

Conversation

abernix
Copy link
Contributor

@abernix abernix commented Jul 19, 2017

In an effort to bring the iOS GCDWebServer tree up to date, this PR is a result of running:

git subtree pull --prefix src/ios/GCDWebServer https://github.com/swisspol/GCDWebServer.git master --squash

I'm currently ✈️ and unable to test this properly, but I hope that this will make it more reasonable to review and land #30. Comments / critique / testing, very welcome!

/cc @macrozone

ac788ca Increased CocoaLumberjack dependency to 3.x
9f9509a Bumped version
48777cc Change minimal iOS version to 8.0
c35d514 Allow to customiz mime types used by GCDWebServerFileResponse
a013f9c Fixed data race issue inside GCDWebServerGetMimeTypeForExtension()
1e28aef Enable address sanitizer by default for Mac unit tests
09851dd Modernize ObjC
23f77b5 Set default Xcode indentation to 2 spaces
7de8b0c Updated to Xcode 8.3
2685819 Updated to latest clang-format
fbcf3fa Fix build warning
0f8e4f5 Increased minimal iOS deployment target to 8.0
750214b Updated Travis CI to Xcode 8.2
ce5310f Resolves signing and building issue of dynamic frameworks
83f1c06 Use clang-formatter to format source code
0c51a9b Updated Xcode project format to 8.0
3b5bc40 Updated to Xcode 8.2
3178baa Update README.md
9a97e44 Made "GCDWebUploader.bundle" non-flat to improve code-signing on OS X
6c2b11e Updated for Xcode 8
56b8e1b Removed executable bit from test files
4231465 Removed executable bit from GCDWebUploader.bundle files
4958eb8 Bumped version
43555c6 Merge pull request #272 from bizz84/master
7c08c54 Removed cs.default_subspec from subspecs as this is now disallowed in Cocoapods
5834770 Removed exception handling which was only partial anyway
52406a1 Merge pull request #267 from hsin919/master
e83814b Merge pull request #269 from opsGavin/patch-1
fba593a Typo in GCDWebServerGZipDecoder:open
eec17d5 Fix the typo in swift samples
32bc721 Merge pull request #266 from DD-P/read-me-typo-fix
200d21c Minor documentation fix: "owns" -> "own"
3042b85 Fix
50eb043 Updated for Xcode 7.3
00cc560 Merge pull request #264 from AmpMe/refacor/add-queue-priorty-as-an-option
fa41f26 Add an option to set the priority of the dispatch queue
845969e Merge pull request #262 from pra85/patch-1
629df78 Fix a typo in Readme
55104e5 Update README.md
fcc95fd Merge pull request #260 from jjrscott/master
10a94e3 Removed guards around __kindof usage as the project is Xcode 7 only.
010ef9b Added __kindof keyword where appropriate to avoid errors of the form "incompatible block pointer types sending 'GCDWebServerResponse *(^)(GCDWebServerDataRequest *__strong)' to parameter of type 'GCDWebServerProcessBlock' (aka 'GCDWebServerResponse *(^)(GCDWebServerRequest *__strong)')"
5ca7c27 Bumped version
c663263 Disabled address sanitizer
5b6eebb Fixed build warning
a4c61bd Bumped version
2543279 Merge pull request #256 from anton-matosov/master
95231b1 Fixed CocoaLumberjack deps
5f2877b Merge pull request #255 from iosphere/check-range-location
47a51c3 Fix NSRangeException by checking range of NSTextCheckingResult
3873dd1 Merge pull request #248 from dcrawshay/master
2ff1025 Fixed WebDAV test response files to correctly represent the requested byte-range response instead of the entire file.
4360c4f Support WebDAV GET request byte ranges

git-subtree-dir: src/ios/GCDWebServer
git-subtree-split: ac788ca906385dd2718e8071de129860c9de3d88
@macrozone
Copy link
Contributor

@abernix does it include swisspol/GCDWebServer#299 ?

unforunatly, this has not been merged yet

@abernix
Copy link
Contributor Author

abernix commented Aug 23, 2017

@macrozone No, it doesn't include it. This was just to get us out of the backlog of fixes first, before applying new logic of our own. I'm not comfortable backporting swisspol/GCDWebServer#299 without bringing (and preserving) all the other (unrelated) history which was required to make #30 work. I think we'll be in a much better position to consider #30 when this is done.

As you probably have a more active developer experience with Cordova than I do, if you could help test this, I'd really appreciate it. I think you should be able to:

meteor add cordova:cordova-plugin-meteor-webapp@https://github.com/meteor/cordova-plugin-meteor-webapp.git#cf35f09321096dd4292fb1e6e633aec9c2860e45

And then run things as usual?

@abernix
Copy link
Contributor Author

abernix commented Aug 23, 2017

I had a little extra time to try my own suggestion above, but it failed due to a number of Swift compilation errors, so I guess this needs further investigation. Please do try to take a peak if you get a chance!

@abernix
Copy link
Contributor Author

abernix commented Sep 14, 2017

If anyone is more inclined to jump into Swift code than I am, I would encourage them to tackle my suggestion above (which I had to walk away from, for the time being at least).

@macrozone
Copy link
Contributor

@abernix anyone on the mdg team who could help on this?

Also can you try to reactive swisspol/GCDWebServer#299 ?

@abernix
Copy link
Contributor Author

abernix commented Sep 14, 2017

@macrozone At the current time, there is not. (Just because of limited resources.) I'd say this is very close to getting merged, but there were some symbols that were renamed, etc. for compatibility. They can be seen when running meteor run ios-device and building in XCode, and if I recall, there were not heaps of problems, just a few blockers.

@KoenLav
Copy link

KoenLav commented Jan 17, 2018

Suggest closing this PR and moving the discussion to https://github.com/meteor/GCDWebServer

@benjamn
Copy link
Contributor

benjamn commented Jan 17, 2018

Superseded by #45.

@benjamn benjamn closed this Jan 17, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants