1. 22 Jul, 2016 1 commit
  2. 21 Jul, 2016 2 commits
    • Feng Xiao's avatar
      Merge pull request #1822 from xfxyjwf/java6 · 2ba058c6
      Feng Xiao authored
      Update travis tests for Java.
      2ba058c6
    • Feng Xiao's avatar
      Update travis tests for Java. · ad49ed78
      Feng Xiao authored
      1. Set JAVA_HOME so mvn can pick up the correct java version.
      2. Remove jdk6 tests. It has been broken for a while and remain undetected as
         mvn is actually using java 7 to build the code. Given that we have
         set -source and -target to 6 in the pom.xml and the built .jar
         should be usable by java 6, having a dedicated java 6 test doesn't
         seem necessary (assuming very few Java 6 users want to compile protobuf
         Java from source).
      
      Change-Id: I4f14da772632df3e47801f180198242b306c3f0f
      ad49ed78
  3. 20 Jul, 2016 7 commits
  4. 19 Jul, 2016 9 commits
  5. 18 Jul, 2016 8 commits
  6. 15 Jul, 2016 5 commits
  7. 14 Jul, 2016 8 commits
    • Feng Xiao's avatar
      Fix compatiblity issues. · 1bce70dd
      Feng Xiao authored
      Currently some public API methods are defined in GenreatedMessage.java
      and they have a generric return type:
        class GeneratedMessage {
          class Builder<BuilderType extends Builder<BuilderType>> {
            public BuilderType setField(...);
            public BuilderType setExtension(...);
          }
        }
      With these definitions, the compiled byte code of a callsite will have
      a direct reference to GeneratedMessage. For example:
        fooBuilder.setField(...);
      becomes:
        ##: invokevirtual // Method Builder.setField:(...)LGeneratedMessage.Builder
        ##: checkcast     // class Builder
      
      This will prevent us from updating generated classes to subclass a
      different versioned GeneratedMessageV3 class in the future (we can't do
      it in a binary compatible way).
      
      This change addresses the problem by overriding these methods directly
      in the generated class:
        class Foo {
          class Builder extends GeneratedMessage.Builder<Builder> {
            public Builder setField(...) {
              return super.setField(...);
            }
          }
        }
      After this, fooBuilder.setField(...) will be compiled to:
        ##: invokevirtual // Method Builder.setField:(...)LFoo.Builder
      
      The callsites will no longer reference GeneratedMessage directly and we
      can change Foo to subclass GeneratedMessageV3 without breaking binary
      compatiblity.
      
      The downside of this change is:
        1. It increases generated code size (though it saves some instructions
           on the callsites).
        2. We can never stop generating these overrides because doing that
           will break binary compatibility.
      
      Change-Id: I879afbbc1325a66324a51565e017143489b06e97
      1bce70dd
    • Feng Xiao's avatar
      Add missing golden test file. · 0b682551
      Feng Xiao authored
      0b682551
    • Jon Skeet's avatar
      Merge pull request #1785 from jskeet/merge-csharp · e1f146bc
      Jon Skeet authored
      Merge C# changes from master to 3.0.0-beta4
      e1f146bc
    • Jon Skeet's avatar
      Move to dotnet cli for building, and .NET Core (netstandard1.0) as target platform (#1727) · b5ce5251
      Jon Skeet authored
      This also updates the version number to 3.0.0-beta4
      b5ce5251
    • Jon Skeet's avatar
      Remove the overload for Add(RepeatedField<T>) · 5e0de1eb
      Jon Skeet authored
      We now just perform the optimization within AddRange itself.
      
      This is a breaking change in terms of "drop in the DLL", but is
      source compatible, which should be fine.
      5e0de1eb
    • Jon Skeet's avatar
      Optimize AddRange for sequences implementing ICollection · 2ee1e523
      Jon Skeet authored
      (Also fix a few more C# 6-isms.)
      2ee1e523
    • Jon Skeet's avatar
      Implement RepeatedField.AddRange. · b053b921
      Jon Skeet authored
      This fixes issue #1730.
      b053b921
    • Jon Skeet's avatar
      d9334ea8