kylefang/Alamofire-SwiftyJSON
1
0
Fork 0
mirror of https://github.com/SwiftyJSON/Alamofire-SwiftyJSON.git synced 2026-01-12 15:34:03 +08:00
Code Issues Packages Projects Releases Wiki Activity
67 Commits 2 Branches 4 Tags
master
Commit Graph

67 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rnitta
64b4c1e710 fix README.md 2019-04-05 22:08:09 +08:00
Doruk
3e6d3254a4 add additional info to readme (#69) 2018-09-27 09:56:30 +08:00
Nico Kuhn
6892dd17a9 [FIX] CFBundleShortVersionString set to 3.0.0 (#72) 2018-09-27 09:54:23 +08:00
Zigii Wong
33f7652ee8 Version bump to 3.0.0 2017-11-08 18:00:53 +08:00
Zigii Wong
7f823102df Merge pull request #65 from SwiftyJSON/readme 
Update README.md
 2017-09-29 10:02:48 +08:00
Zigii Wong
044dbf566e Update README.md 2017-09-28 21:48:22 +08:00
Zigii Wong
0678ddbb94 Merge pull request #64 from SwiftyJSON/Swift4-Xcode9 
Swift 4 and Xcode 9
 2017-09-28 21:26:21 +08:00
Zigii Wong
ea756b5218 Update os_image to 9 2017-09-28 21:18:17 +08:00
Zigii Wong
4b8d0c27e6 Update Recommend settings 2017-09-28 21:13:53 +08:00
Zigii Wong
19375ec4a6 Update submodule Alamofire = 4.5.0 and SwiftyJSON = 4.0.0-alpha.1 2017-09-28 21:11:44 +08:00
Zigii Wong
32ebe5c916 Merge pull request #58 from perryprog/patch-1 
Add Carthage install instructions
 2017-05-16 18:38:26 +08:00
Perry Fraser
7ad9dc5ef3 Add Carthage install instructions 2017-05-16 06:31:25 -04:00
Zigii Wong
5fe59acd5c Merge pull request #56 from wongzigii/master 
Update git submodule to latest
 2017-04-18 10:37:12 +08:00
Zigii Wong
0dba87fdd4 Update .travis.yml 2017-04-18 10:30:04 +08:00
Zigii Wong
5c5021d9ab Update .travis.yml 2017-04-18 10:22:50 +08:00
Zigii Wong
1473239ce0 Update README.md 2017-03-30 12:22:29 +08:00
Zigii Wong
c93900855e Merge pull request #54 from wongzigii/podspec 
[Podspec] Update Podspec
2.0.0-beta.1 		2017-02-26 00:45:22 +08:00
Zigii Wong
a8a7cf7cab Merge pull request #53 from wongzigii/build-setting 
[Settings] Set COPY_PHASE_STRIP to NO to prevent Carthage build warnings
 2017-02-26 00:39:16 +08:00
Zigii Wong
12ded98d6d Merge pull request #52 from wongzigii/swift-version 
Add .swift-version file
 2017-02-26 00:39:06 +08:00
Zigii Wong
6392e15540 Update pod spec to make pod lib lint happy 2017-02-26 00:35:52 +08:00
Zigii Wong
3e07da2e30 Add .swift-version file 2017-02-26 00:22:17 +08:00
Zigii Wong
58c6e10c93 [Settins] Set COPY_PHASE_STRIP to NO to prevent Carthage build warnings 2017-02-25 23:36:27 +08:00
Zigii Wong
1517f11fc7 Merge pull request #51 from wongzigii/readme 
Update README.md
 2017-02-25 22:54:54 +08:00
Zigii Wong
c1d00d5822 Update README.md 2017-02-25 22:48:52 +08:00
Zigii Wong
17b204403d Merge pull request #50 from SwiftyJSON/alamofire4 
Alamofire 4.0.0 + Swift 3.0
 2017-02-25 22:33:58 +08:00
Zigii Wong
3a3d2b0a45 Fix test issue 2017-02-25 22:25:04 +08:00
Zigii Wong
04c2f40820 Remove custom framework_search_paths to get rid of warning 2017-02-25 22:01:52 +08:00
Zigii Wong
f32be43471 Update .travis.yml 2017-02-25 21:54:40 +08:00
Zigii Wong
3cf38fc4f0 Add .travis.yml file 2017-02-25 21:45:26 +08:00
Zigii Wong
746a638bc0 Fix broken testcase 2017-02-25 21:37:46 +08:00
Zigii Wong
f936cbb05a Update Project settings to recommend settings 2017-02-19 23:05:35 +08:00
Zigii Wong
77af21c61a Update SwiftyJSON submodule to master 2017-02-19 22:49:19 +08:00
Zigii Wong
d6a4a5e4f5 Update Alamofire submodule to master 2017-02-19 22:48:43 +08:00
Rok Gregorič
4a3a160e0f Added support for Alamofire 4 & SwiftyJSON 3. 2016-10-04 14:20:09 +02:00
Julien Regnauld
8cb1e134b2 Fixes #35, Update response for Alamofire 3. completionHandler returns a Response struct instead of request, response, result. 2015-09-27 11:20:49 +02:00
Julien Regnauld
c43bba8d13 Switch git branch to master for submodule Alamofire and SwiftyJSON 2015-09-27 10:31:59 +02:00
Pinglin Tang
edee0486d6 Merge pull request #28 from trungung/patch-1 
Update Alamofire-SwiftyJSON.podspec
 2015-09-18 11:35:44 +08:00
Pinglin Tang
4e77f0b9e7 Merge pull request #30 from jregnauld/swift-2.0 
Fixing responseSwiftyJSON because Alamofire returns ErrorType instead of NSError
 2015-09-18 11:19:30 +08:00
Julien Regnauld
ce3abd70a5 Update Alamofire - xcode 7.0 beta 6 2015-08-27 14:49:14 -06:00
Julien Regnauld
9cb5a7759d update readme 2015-08-24 16:41:18 -06:00
Julien Regnauld
db57a74db1 Update Alamofire NSError -> ErrorType and SwiftyJson 2015-08-24 16:26:16 -06:00
Pinglin Tang
cf3e6388fa Merge pull request #29 from jregnauld/swift-2.0 
Swift 2.0 #25
 2015-08-20 10:01:05 +08:00
Julien Regnauld
8cc2d83901 Update readme and podspec and version 2015-08-19 18:24:58 -06:00
Julien Regnauld
07060e155e Alamofire-SwiftyJSON for swift 2.0 
Switching  master branch of Alamofire and SwiftyJSON to swift 2.0 branch
Update Alamofire-SwiftyJSON code in swift 2.0
 2015-08-19 18:04:48 -06:00
trungung
a8f59623f2 Update Alamofire-SwiftyJSON.podspec 2015-08-18 09:16:23 +07:00
Pinglin Tang
e9d4acdc30 Merge pull request #27 from thomasdegry/master 
Updated for Almofire 1.3.0
 2015-08-01 22:04:41 +08:00
thomas
be095c5387 Updated for Almofire 1.3 2015-07-29 21:12:52 -04:00
tangplin
eda9c507db Merge pull request #16 from rromanchuk/master 
Update remotes to latest, add support for carthage
 2015-06-03 11:02:35 +08:00
tangplin
074a52b4d4 Merge pull request #22 from alexpls/patch-1 
Provide code example that works with Xcode 6.3
 2015-06-03 11:01:13 +08:00
alexpls
a4cba4c750 Provide code example that works with Xcode 6.3 
Per issue #21, the Xcode 6.3 compiler will throw an "Ambiguous use of 'responseSwiftyJSON'" error using the original code sample provided. Simply adding parentheses around the callback method seems to keep the compiler happy.
 2015-05-22 20:33:06 +10:00