Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
029f359
Added local implementation of parts of NSJSONSerialization for use on…
shmuelk Feb 10, 2016
79fdddb
Changes to get the code to run on Linux with the current Development …
shmuelk Feb 10, 2016
582736b
IBM-Swift/Kitura#328 swiftyJson changes to work on Linux with 3/24 Sw…
tfrank64 Mar 30, 2016
772ce02
created OS X branch with swift 3_24 changes
tfrank64 Mar 31, 2016
c571c7f
updated branch with latest from SwiftyJson/SwiftyJson
tfrank64 Mar 31, 2016
c4d27a7
IBM-Swift/Kitura#328 merging linux and OS X source code
tfrank64 Apr 1, 2016
e57295e
Merge pull request #1 from IBM-Swift/3_24_migration
tfrank64 Apr 4, 2016
6aa99bb
IBM-Swift/Kitura#361 upgraded to compile with 4/12 binaries
dfirsht Apr 13, 2016
4beecfa
IBM-Swift/Kitura#418 upgraded to compile with 4/25 binaries
dfirsht Apr 27, 2016
cd3a31e
IBM-Swift/Kitura#432 updated to compile with 5/3 binaries
dfirsht May 5, 2016
f140eb2
IBM-Swift/Kitura#432 compiles on Linux with 5/3 binaries
dfirsht May 5, 2016
cd8b108
IBM-Swift/Kitura#432 Additional changes for Linux
dfirsht May 5, 2016
255f9c5
IBM-Swift/Kitura#469 migrated to 05-09 snapshot
NikitaSullivan May 12, 2016
e4f8595
0509 migration (#4)
NikitaSullivan Jun 3, 2016
3dc35da
IBM-Swift/Kitura#504 updates to work on linux os for 31-05 migration …
NikitaSullivan Jun 10, 2016
606caea
IBM-Swift/Kitura#590 Migrate to 06/20 binaries (#8)
irar2 Jul 15, 2016
54165c7
IBM-Swift/Kitura#616 Changed == to != (#9)
irar2 Jul 17, 2016
d046668
IBM-Swift/Kitura#529 updated and fixed SwiftyJSON tests (#7)
NikitaSullivan Jul 25, 2016
42aef1a
IBM-Swift/Kitura#580 Fix subscript set with empty path (#11)
irar2 Jul 26, 2016
e8772b5
Merge PR https://github.com/IBM-Swift/SwiftyJSON/pull/6
irar2 Jul 27, 2016
9b27920
inital setup of CI
dfirsht Jul 27, 2016
1eec775
Added Package info
dfirsht Jul 27, 2016
57621b4
Migration 0725 (#12)
shmuelk Aug 8, 2016
260cea9
Renamed the Kitura-Build repo to Package-Builder
BDHernand Aug 10, 2016
1163fac
Merge pull request #14 from BDHernand/master
ianpartridge Aug 11, 2016
ef8582b
Updated travis file to point to new code
BDHernand Aug 23, 2016
3f2a638
Merge pull request #15 from BDHernand/master
ianpartridge Aug 24, 2016
60588a0
Migration 0807 (#16)
shmuelk Aug 26, 2016
37b4f20
Migration 0823 (#17)
shmuelk Aug 28, 2016
9f1f612
DEVELOPMENT-SNAPSHOT-2016-08-29-a
vadimeisenbergibm Aug 31, 2016
46324eb
DEVELOPMENT-SNAPSHOT-2016-09-07-a (#18)
shmuelk Sep 8, 2016
ef67e24
Renaming KITURA_CI_BUILD_SCRIPTS_DIR to BUILDER_SCRIPTS_DIR (#20)
BDHernand Sep 13, 2016
21e2e6b
DEVELOPMENT-SNAPSHOT-2016-09-12-a
shmuelk Sep 13, 2016
4209be7
3.0-RELEASE
shmuelk Sep 14, 2016
895fe9f
DEVELOPMENT-SNAPSHOT-2016-09-12-a
shmuelk Sep 14, 2016
a5e2691
3.0-RELEASE
shmuelk Sep 14, 2016
73b523a
3.0
shmuelk Sep 14, 2016
6c79d5b
IBM-Swift/Kitura#788 Copied code from JSONSerialization master branch
shmuelk Oct 6, 2016
f002dcc
IBM-Swift/Kitura#788 Remove use of mirror on Linux when creating a JS…
shmuelk Oct 9, 2016
f87c272
IBM-Swift/Kitura#788 Convert JSON from string to Data in one call, ra…
shmuelk Oct 9, 2016
032ceae
Add .sandbox-sample file
ianpartridge Oct 10, 2016
7fbd384
Merge pull request #21 from IBM-Swift/sandbox
ianpartridge Oct 10, 2016
4ec75fd
Avoid memory leak in String.cString() (#22)
djones6 Oct 13, 2016
d8de7c8
Merge pull request #23 from IBM-Swift/issue_788
ianpartridge Oct 13, 2016
28ba41b
Remove travis branch from travis file
BDHernand Oct 28, 2016
e332d9c
Merge pull request #24 from BDHernand/master
ianpartridge Oct 28, 2016
f5e165e
Added back the ignore = all for the gitmodule file
BDHernand Nov 2, 2016
7fd1b19
IBM-Swift/Kitura#832 Swift version 3.0.1
shmuelk Nov 3, 2016
099c666
IBM-Swift/Kitura#832 Eliminated warning in build
shmuelk Nov 3, 2016
48523f0
IBM-Swift/Kitura#832 Eliminated warning
shmuelk Nov 3, 2016
ba99cbf
Merge pull request #26 from IBM-Swift/issue_832
ianpartridge Nov 3, 2016
9b339c1
Merge pull request #25 from BDHernand/master
ianpartridge Nov 4, 2016
f3fb856
IBM-Swift/Kitura#846 Have Bool serialized as true/false
shmuelk Nov 16, 2016
64b0910
Merge pull request #27 from IBM-Swift/issue_846
kweinmeister Nov 16, 2016
c5c4084
Remove submodule
BDHernand Nov 30, 2016
9c8a8a0
Merge pull request #28 from BDHernand/master
ianpartridge Dec 1, 2016
2a0bcad
Parameterize parameters to Package-Builder
BDHernand Dec 7, 2016
60930b4
Merge pull request #29 from BDHernand/master
irar2 Dec 8, 2016
0a2357e
Support Swift 3.0.2
shmuelk Dec 16, 2016
551fe92
Migrated to XCode 8.2
shmuelk Dec 16, 2016
90fcabf
Disabled code coverage
shmuelk Dec 16, 2016
865683c
IBM-Swift/Kitura#939 Read files in relative to source file in tests
shmuelk Dec 19, 2016
da73139
IBM-Swift/Kitura#939 Re-enabl code coverage
shmuelk Dec 19, 2016
7abdfe3
IBM-Swift/Kitura#939 Simplify code after review
shmuelk Dec 19, 2016
5ca3f00
Merge pull request #30 from IBM-Swift/issue_939
youming-lin Dec 19, 2016
7d78e6a
Conditional Swift 3.1 support
Mar 16, 2017
d5f2741
IBM-Swift/Kitura#1047 Swift 3.1 changes
Mar 28, 2017
4c57d46
Swift 4 support (#33)
quanvo87 Jun 19, 2017
cc47ffc
Fix spacing in README
Jun 29, 2017
0ccbc9b
Merge pull request #34 from jkingoliver/master
kweinmeister Jul 11, 2017
ded2700
Update to Swift 3.1.1; add 6/29 snapshot builds to Travis; IBM-Swift/…
quanvo87 Jul 11, 2017
2bdc9d1
Update copyright year
quanvo87 Jul 11, 2017
b0b655e
Cleanup repo; restructure for Swift 4
youming-lin Aug 30, 2017
b41f430
Fix warnings and failures on Swift 4
youming-lin Aug 30, 2017
b50ddc6
Fix warnings and errors on Linux
youming-lin Sep 7, 2017
5b9f21d
Update README
youming-lin Sep 7, 2017
1190845
Merge pull request #36 from IBM-Swift/swift-4
quanvo87 Sep 8, 2017
6e718ef
Updates travis to use swift 4.0 release (#38)
Oct 2, 2017
ed09345
Removed _incremental protocol from JSONIndex struct
KyeMaloy97 Feb 4, 2018
7eb6c83
Merge pull request #39 from KyeMaloy97/issue.removeIncremental
Feb 7, 2018
54b8eb6
Rename package for Swift 4.1, add 4.1 to Travis (#40)
djones6 Mar 20, 2018
693d2d2
Rename Package@swift-4.swift to Package@Swift-4.swift (#41)
KyeMaloy97 Aug 8, 2018
c687182
Tolerate Swift 5 (#42)
djones6 Dec 14, 2018
f2612ea
Fixes for Swift 4.2 on Linux (#43)
sportlabsMike Dec 20, 2018
f9b4754
Tolerate Swift 5.1 (#44)
djones6 Jul 16, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Xcode
.DS_Store
SwiftyJSON.xcodeproj
*/build/*
*.pbxuser
!default.pbxuser
Expand All @@ -22,3 +23,4 @@ Pods

#Carthage
Carthage/Build
.build
1 change: 1 addition & 0 deletions .swift-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5.0.1
65 changes: 61 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,64 @@
language: objective-c
# Travis CI build file.

osx_image: xcode7.1
xcode_sdk: iphonesimulator9.0
# whitelist (branches that should be built)
branches:
only:
- master
- /^issue.*$/

script: 'sh scripts/ci.sh'
# the matrix of builds should cover each combination of Swift version
# and platform that is supported. The version of Swift used is specified
# by .swift-version, unless SWIFT_SNAPSHOT is specified.
matrix:
include:
- os: linux
dist: xenial
sudo: required
services: docker
env: DOCKER_IMAGE=swift:4.0.3 SWIFT_SNAPSHOT=4.0.3
- os: linux
dist: xenial
sudo: required
services: docker
env: DOCKER_IMAGE=swift:4.1.3 SWIFT_SNAPSHOT=4.1.3
- os: linux
dist: xenial
sudo: required
services: docker
env: DOCKER_IMAGE=swift:4.2.4 SWIFT_SNAPSHOT=4.2.4
- os: linux
dist: xenial
sudo: required
services: docker
env: DOCKER_IMAGE=swift:5.0.1-xenial
- os: linux
dist: xenial
sudo: required
services: docker
env: DOCKER_IMAGE=swift:5.0.1 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
- os: osx
osx_image: xcode9.2
sudo: required
env: SWIFT_SNAPSHOT=4.0.3
- os: osx
osx_image: xcode9.4
sudo: required
env: SWIFT_SNAPSHOT=4.1.2 JAZZY_ELIGIBLE=true
- os: osx
osx_image: xcode10.1
sudo: required
env: SWIFT_SNAPSHOT=4.2.1
- os: osx
osx_image: xcode10.2
sudo: required
# Pending Travis Xcode 11 image
# - os: osx
# osx_image: xcode11
# sudo: required
# env: SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT

before_install:
- git clone https://github.com/IBM-Swift/Package-Builder.git

script:
- ./Package-Builder/build-package.sh -projectDir $TRAVIS_BUILD_DIR
439 changes: 0 additions & 439 deletions CHANGELOG.md

This file was deleted.

Loading