GitHub user ankon opened a pull request: https://github.com/apache/cordova-plugins/pull/23
CB-10956: Update the GCDWebServer These are multiple parts: 1. Fix the README.md 2. Drop the existing GCDWebServer subtree, and readd it at the new path, with the same revision as before 3. Follow the README.md instructions to update it It's hard to squash these together (besides, I think it is easier to follow the changes this way), and my git-foo isn't enough to modify the commit messages to include the ticket number unfortunately. You can merge this pull request into a Git repository by running: $ git pull https://github.com/ankon/cordova-plugins improvement/update-gcdwebserver Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cordova-plugins/pull/23.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #23 ---- commit d9d12af9ee6386a8e1d2df241c25287f39f19f51 Author: Andreas Kohn <andreas.k...@gmail.com> Date: 2016-03-24T11:28:13Z Remove old GCDWebServer commit 65207dca6f2e6d096d7992464dc1e182be6502cb Author: Andreas Kohn <andreas.k...@gmail.com> Date: 2016-03-24T11:31:04Z Update README.md After the plugin moved into the cordova-plugins repository the instructions for updating GCDWebServer did no longer work. commit 1547b6bcc17fad312449c2d522935370e0552b77 Author: Andreas Kohn <andreas.k...@gmail.com> Date: 2016-03-24T11:39:29Z Squashed 'local-webserver/src/ios/GCDWebServer/' content from commit 15caa9c git-subtree-dir: local-webserver/src/ios/GCDWebServer git-subtree-split: 15caa9cd20ed6b32bd69704a90261efe1ca71b77 commit 9f15b12f9ea14728179f827c47b776792a1801c5 Author: Andreas Kohn <andreas.k...@gmail.com> Date: 2016-03-24T11:39:29Z Merge commit '1547b6bcc17fad312449c2d522935370e0552b77' as 'local-webserver/src/ios/GCDWebServer' commit 394cfb12f80de35255a506c0dcbf4a21910e849a Author: Andreas Kohn <andreas.k...@gmail.com> Date: 2016-03-24T11:42:43Z Squashed 'local-webserver/src/ios/GCDWebServer/' changes from 15caa9c..55104e5 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 8a6a139 Merge pull request #236 from maeldur/master 4eba86f Merge pull request #238 from bendytree/master ea97373 Also set CFBundleVersion in Info.plist 5707076 Updated to Xcode 7.2 e1fb807 Bumped version 7157572 Added libz and header instructions to readme 94e30f6 Added libz and header instructions to readme c989411 Use Xcode 7.1 in Travis CI 4ee9c30 Fixed build script 48cf20b Updated iOS app to latest best practices ac9b8a5 Added support for tvOS cad428c Removed deprecation warnings on tvOS bb5c1a5 No need to link explicitly to Foundation bef9523 Updated for Xcode 7.1 0192c36 Fix 062a0dc allow serverURL to be assigned on tvOS with wifi connection 21d9fc2 Merge pull request #228 from CrossWaterBridge/tvos 614ff58 Enable support for tvOS. 7b0477b Merge pull request #219 from macdrevx/pods-use-frameworks a674614 Enable support for Podfiles with use_frameworks! b549f11 Merge pull request #218 from tifroz/master 9d38bb4 Workaround for Swift2 which apparently fails to retain the completion blocks passed as parameters 44c6a8a Update README.md aaf8679 Increased Bonjour resolution timeout to 5 seconds 81d74b4 Fix f7de5ca Fix a1c6835 Bumped version to 3.3 e70a333 Added support for NAT port mapping 3c33e9f Bumped version to 3.2.7 d160e5f Merge pull request #213 from 0xpablo/master 2d2343a Turn 'buildForRunning' on for 'GCDWebServers' iOS and Mac Schemes f6783da Updated test script to run built-in tests 99cae36 Added minimal tests for Mac framework b292710 Fix b8b4a35 Add version to framework Info.plist ecc572a Bumped version to 3.2.6 3a02341 Disable testing and running in shared schemes for frameworks e792fe8 Fixes 4c8ec1d Removed unnecessary files from Xcode project f7bb5ba Bumped copyright year ae88198 Update README.md d71c0d4 Update README.md d611ae0 Merge pull request #187 from lfaoro/patch-2 93287ed Update README.md dc28790 Merge pull request #186 from lfaoro/patch-1 ab9459a Update README.md aa8fc97 Fixed buffer overflow when retrieving socket addresses 863febe Updated for Xcode 7 2ff117d Merge pull request #183 from guidomb/patch-1 4838d0d Fixes error in Carthage documentation c394ae8 Update README.md bdfe672 Bumped version b1ab747 Update README.md 03a0ac3 Added Carthage support bd2c292 Generating Frameworks e8b6726 Bumped version 3d5fd0b Update README.md 9524d31 Allow harmless 'Content-Type' headers on requests a3606d6 Don't start a background task while the app is already in background 00b2c38 Bumped version 0a9d310 Fixed -serverURL not taking into account GCDWebServerOption_BindToLocalhost 0f0a984 Fixed Xcode 6.3 warnings 047fddd Merge pull request #155 from sergiou87/master 79d6075 Add remote and local addresses to GCDWebServerRequest 594497d Updated for CocoaLumberJack 2.0 1f7c036 Removed Bot scheme fe472cd Update README.md 9c33c83 Handle starting the server with nil options 9719406 Made _CompareResources() easier to read 0b8f7ff Merge remote-tracking branch 'origin/master' 71c08cf Update README.md 1a67864 Bumped version 472c785 Only wipe GCDWebUploader.bundle on Debug to avoid issues on Xcode bot 2fdeb95 Added Xcode bot scheme c4310fc Addressed static analyzer warnings 33645d3 Fixed incorrect documentation for GCDWebServerAsyncStreamBlock 3618dca Added asyncResponse2 mode 432e382 Update README.md 4e31508 Removed invalid check 628f667 Bumped version 1944cd8 Fixed tests d2001e3 Fixes 1888979 Fixed behavior of GCDWebServerOption_BonjourName option 14d538b Added GCDWebServerOption_BindToLocalhost option 3b7198b Merge pull request #105 from nickgravelyn/fix-crash-in-ios-unit-test abb8913 Adding check to _endBackgroundTask to verify the application exists before calling GWS_DNOT_REACHED. 059f5c8 Update README.md 9d9546b Bumped version 2ff05b1 Bumped version bf2c9a1 Workaround Firefox and IE not showing file selection dialog git-subtree-dir: local-webserver/src/ios/GCDWebServer git-subtree-split: 55104e5b1ea7ac84e8a42263750b6f7973f5da20 commit 36f1a43e29c3e49c9c2cab7af6fb3909ddfc74df Author: Andreas Kohn <andreas.k...@gmail.com> Date: 2016-03-24T11:42:43Z Merge commit '394cfb12f80de35255a506c0dcbf4a21910e849a' ---- --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org