1. 17 Nov, 2017 1 commit
    • Thomas Van Lenten's avatar
      Travis config cleanups and move ObjC to Xcode 9.1. · 6700f41c
      Thomas Van Lenten authored
      Stop having travis build the test matrix and make it explicit so extra
      settings are only on the test that need the, this helps make the travis
      UI a little cleaner (linux hosted stuff doesn't list an Xcode version),
      as well as avoid unneeded requirements limiting the travis pool something
      can run on.
      
      Small improvements to objectivec/DevTools/full_mac_build.sh to avoid some
      repeated scripting and hopefully make things more reliable work with Xcode
      9.x.
      
      Don't mark the iOS tests as able to fail, hopefully with the new settings
      they are stable and won't give false signals.
      
      Simplify the case for xcode versions and fixup xcode 9.[0-1].
      6700f41c
  2. 16 Nov, 2017 2 commits
  3. 15 Nov, 2017 14 commits
  4. 14 Nov, 2017 4 commits
  5. 13 Nov, 2017 5 commits
  6. 12 Nov, 2017 4 commits
  7. 10 Nov, 2017 1 commit
  8. 09 Nov, 2017 3 commits
  9. 06 Nov, 2017 1 commit
  10. 03 Nov, 2017 3 commits
  11. 02 Nov, 2017 1 commit
    • Roman Nekhoroshev's avatar
      Fix a typo in WKT's test suite · da3bfa69
      Roman Nekhoroshev authored
      Hi!
      Sorry for bothering with such a minor thing, but I just noticed and fixed one annoying typo in WKT's test suite:
      `"accpets" -> "accepts"`
      
      Thanks!
      da3bfa69
  12. 01 Nov, 2017 1 commit
    • Jon Skeet's avatar
      Fix merging with message-valued oneof · cbe25059
      Jon Skeet authored
      If messages A and B have the same oneof case, which is a message
      type, and we merge B into A, those sub-messages should be merged.
      
      Fixes #3200.
      
      Note that I haven't regenerated all the code, as some of the protos
      have been changed, breaking generation.
      cbe25059