Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: SwiftyJSON/SwiftyJSON
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: SwiftyJSON/SwiftyJSON
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fix-swift-test
Choose a head ref
  • 11 commits
  • 18 files changed
  • 1 contributor

Commits on Nov 7, 2016

  1. Configuration menu
    Copy the full SHA
    14a7e7a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f4b832a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    777ba81 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'master' of https://github.com/SwiftyJSON/SwiftyJSON int…

    …o fix-swift-test
    
    * 'master' of https://github.com/SwiftyJSON/SwiftyJSON:
      Re-organize tests to satisfy SPM
    wongzigii committed Nov 7, 2016
    Configuration menu
    Copy the full SHA
    cfb9104 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c275421 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2016

  1. Make swift test works

    wongzigii committed Nov 22, 2016
    Configuration menu
    Copy the full SHA
    04ed388 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' of https://github.com/SwiftyJSON/SwiftyJSON int…

    …o fix-swift-test
    
    * 'master' of https://github.com/SwiftyJSON/SwiftyJSON:
      update Integration section of README to reflect latest version in SPM usage subsection
      Fix duplicate comma typo
      update readme
      make casting nil to nsnull optional
      represent strings with nil as if it was nsnull
      Instead of checking for the Int8 type explicitly when setting 'object', cast the Int8 value to an Int and pass that into an NSNumber when setting 'int8' or 'int8Value'
      Update version in pod spec
      Add performance test
      Attemp to fix #697
      Fix 'AnyObject' in comment and README.md
      The ‘isBool’ function on the NSNumber extension uses ‘trueObjCType’, which represents the type encoding for ‘true’ represented as an NSNumber, and ‘falseObjCType’, which represents the type encoding for ‘false’ represented as an NSNumber. Both type encodings are equal to ‘c’. However, an NSNumber that wraps around a value of type Int8 also has a type encoding of ‘c’. Therefore, a user who passes in a value of 0 or 1 (of type Int8) into JSON will expect to see the numbers 0 or 1 as the output because that was the intent. Unfortunately, that value will be wrapped into NSNumber and be considered a bool, so the user will see ‘true’ or ‘false’ instead.
      Fix typo in README.md
      Turn on render documentation mode.
      Finish subscript part. Add descriptions.
      Add getting a string using a path to the element.
      Updating subscript section in playground
      Added check for pre-escaped URLs to prevent double-escaping of % character
    
    # Conflicts:
    #	Tests/SwiftyJSONTests/SequenceTypeTests.swift
    wongzigii committed Nov 22, 2016
    Configuration menu
    Copy the full SHA
    4a7a06f View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2016

  1. Add missing tests

    wongzigii committed Nov 25, 2016
    Configuration menu
    Copy the full SHA
    18f44fe View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' of https://github.com/SwiftyJSON/SwiftyJSON int…

    …o fix-swift-test
    
    * 'master' of https://github.com/SwiftyJSON/SwiftyJSON:
      Fix travis_retry command not found
      Update scripts
      Fix all compilation warnings
    
    # Conflicts:
    #	Tests/SwiftyJSONTests/NumberTests.swift
    #	Tests/SwiftyJSONTests/RawTests.swift
    wongzigii committed Nov 25, 2016
    Configuration menu
    Copy the full SHA
    9ff56db View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2016

  1. Add .build to .gitignore

    wongzigii committed Nov 27, 2016
    Configuration menu
    Copy the full SHA
    06b2518 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2016

  1. Configuration menu
    Copy the full SHA
    625e932 View commit details
    Browse the repository at this point in the history
Loading