Commit Graph

8 Commits

Author SHA1 Message Date
Alexey Khokhlov 108d32b8d4 Squashed commit of the following:
commit e3801f8e04
Author: Alexey Khokhlov <alexeyxo@rocketguys.com>
Date:   Fri Jun 22 22:00:45 2018 +0300

    fix swift4.2 builds
2018-09-25 18:42:24 +03:00
Vincent Flecke 9ad157f2db Add compatibilty versions (#232) 2018-03-02 12:42:38 +03:00
Justin Stinson aa8e667700 Set iOS deployment target to 8.0 (#226) 2018-02-20 13:56:46 +03:00
Alexey Khokhlov 4a1bf608d1 Swift4 2017-11-02 13:43:59 +03:00
Alexey Khokhlov 1e9e97e3c7 Squashed commit of the following:
commit 7c1bb6ce2e
Author: Alexey Khokhlov <alexeyxo@rocketguys.com>
Date:   Wed Nov 1 22:01:27 2017 +0300

    Scheme

commit d94e82e830
Author: Alexey Khokhlov <alexeyxo@rocketguys.com>
Date:   Wed Nov 1 20:38:55 2017 +0300

    Swift4

commit f8eeceb8eb
Author: Alexey Khokhlov <alexeyxo@rocketguys.com>
Date:   Wed Nov 1 19:34:05 2017 +0300

    Squashed commit of the following:

    commit 94ecf0c12d
    Author: Alexey Khokhlov <alexeyxo@rocketguys.com>
    Date:   Wed Nov 1 19:30:15 2017 +0300

        Descripter

    commit f43317fdc8
    Author: Alexey Khokhlov <alexeyxo@rocketguys.com>
    Date:   Sat Oct 28 17:55:18 2017 +0300

        3.0.28

    commit f549653bab
    Author: Alexey Khokhlov <alexeyxo@rocketguys.com>
    Date:   Fri Oct 27 19:54:45 2017 +0300

        Removed

    commit 3fb3ea3d48
    Author: Alexey Khokhlov <alexeyxo@rocketguys.com>
    Date:   Fri Oct 27 16:05:05 2017 +0300

        New Descriptor

    commit c2cb9f4f85
    Author: Alexey Khokhlov <alexeyxo@rocketguys.com>
    Date:   Mon Oct 23 12:26:51 2017 +0300

        3.0.26

    commit baf6117c00
    Author: Alexey Khokhlov <alexeyxo@rocketguys.com>
    Date:   Sun Oct 22 19:48:50 2017 +0300

        Regenerate Descriptor

    commit 249cbb68f9
    Author: Alexey Khokhlov <alexeyxo@rocketguys.com>
    Date:   Fri Oct 6 15:22:33 2017 +0300

        Swift Version

    commit 6b88719bbd
    Author: Alexey Khokhlov <alexeyxo@rocketguys.com>
    Date:   Fri Oct 6 14:47:05 2017 +0300

        Xcode9 3.0.24

commit 67a2ea9520
Author: Alexey Khokhlov <alexeyxo@rocketguys.com>
Date:   Sat Sep 30 16:24:26 2017 +0300

    Swift4

commit cb2036f9d0
Author: Alexey Khokhlov <alexeyxo@rocketguys.com>
Date:   Sat Sep 30 16:10:36 2017 +0300

    Regenerate

commit f14e3c91cd
Merge: ed3ceab 475c6b3
Author: Alexey Khokhlov <alexeyxo@rocketguys.com>
Date:   Sat Sep 30 16:07:20 2017 +0300

    Merge remote-tracking branch 'origin/master' into swift4

    # Conflicts:
    #	Source/Google.Protobuf.Any.proto.swift
    #	Source/Google.Protobuf.Api.proto.swift
    #	Source/Google.Protobuf.Compiler.Plugin.proto.swift
    #	Source/Google.Protobuf.Descriptor.proto.swift
    #	Source/Google.Protobuf.Duration.proto.swift
    #	Source/Google.Protobuf.Empty.proto.swift
    #	Source/Google.Protobuf.FieldMask.proto.swift
    #	Source/Google.Protobuf.SourceContext.proto.swift
    #	Source/Google.Protobuf.Struct.proto.swift
    #	Source/Google.Protobuf.SwiftDescriptor.proto.swift
    #	Source/Google.Protobuf.Timestamp.proto.swift
    #	Source/Google.Protobuf.Type.proto.swift
    #	Source/Google.Protobuf.Wrappers.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/Performance.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Bar.Foo.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Baz.Foo.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Google.Protobuf.NoGenericServicesTest.UnittestNoGenericServices.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Google.Protobuf.UnittestEnormousDescriptor.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto2ArenaUnittest.UnittestArena.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto2ArenaUnittest.UnittestNoArenaImport.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto2NofieldpresenceUnittest.UnittestNoFieldPresence.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto3ArenaUnittest.UnittestProto3Arena.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto3PreserveUnknownEnumUnittest.UnittestPreserveUnknownEnum.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.Unittest.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestCustomOptions.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestEmbedOptimizeFor.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestLite.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestLiteImportsNonlite.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestMset.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestOptimizeFor.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestWellKnownTypes.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestImport.UnittestImport.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestImport.UnittestImportLite.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestImport.UnittestImportPublic.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestImport.UnittestImportPublicLite.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestNoArena.UnittestNoArena.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/SwiftProtobufUnittest.UnittestMaps.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestDropUnknownFields.UnittestDropUnknownFields.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestEmpty.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestErrorType.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestStruct.proto.swift
    #	plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestThreading.proto.swift
    #	plugin/compiler/google/protobuf/descriptor.pb.h
    #	plugin/compiler/google/protobuf/swift-descriptor.pb.h

commit ed3ceabb08
Author: Alexey Khokhlov <alexeyxo@rocketguys.com>
Date:   Wed Aug 16 13:08:06 2017 +0300

    Regen

commit cef4d478bd
Author: Alexey Khokhlov <alexeyxo@rocketguys.com>
Date:   Thu Jul 27 19:55:47 2017 +0300

    Travis

commit baa4b93971
Author: Alexey Khokhlov <alexeyxo@rocketguys.com>
Date:   Thu Jul 27 19:54:29 2017 +0300

    Fix
2017-11-02 13:33:45 +03:00
Alexey Khokhlov f43317fdc8 3.0.28 2017-10-28 18:03:46 +03:00
Alexey Khokhlov baf6117c00 Regenerate Descriptor 2017-10-22 19:48:50 +03:00
Alexey Khokhlov 6b88719bbd Xcode9 3.0.24 2017-10-06 15:02:07 +03:00