Travis-CI

.travis.yml

@@ -0,0 +1,14 @@
+language: objective-c
+osx_image: xcode61
+before_install:
+- brew update
+- brew unlink xctool
+- brew install xctool --HEAD
+- xctool -v
+- brew install automake
+- brew unlink libtool
+- brew install libtool
+- brew install protobuf
+- ./scripts/build.sh
+- ./travis/travis.sh
+script: xctool -project ./src/ProtocolBuffers/ProtocolBuffers.xcodeproj -sdk iphonesimulator -scheme ProtocolBuffers build test

README.md

@@ -1,5 +1,5 @@
 #Protocol Buffers for Swift
-
+[![Build Status](https://travis-ci.org/alexeyxo/protobuf-swift.svg?branch=master)](https://travis-ci.org/alexeyxo/protobuf-swift)
 [![Platform](http://img.shields.io/badge/platform-ios%20%7C%20osx-green.svg)](https://github.com/alexeyxo/protobuf-swift)
 [![Release](http://img.shields.io/github/tag/alexeyxo/protobuf-swift.svg)](https://github.com/alexeyxo/protobuf-swift/releases/tag/v1.0)
 
@@ -24,7 +24,7 @@ This project is based on an implementation of Protocol Buffers from Google.  See
 
 5.`git clone [email protected]:alexeyxo/protobuf-swift.git`
 
-6.`./build.sh`
+6.`./scripts/build.sh`
 
 7.Add `./src/ProtocolBuffers/ProtocolBuffers.xcodeproj` in your project.
 

build.sh → scripts/build.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
 make clean;
-./autogen.sh;
-./configure CXXFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib;
+./autogen.sh && \
+./configure CXXFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib && \
 make -j8 && make install;

scripts/makeDescriptor.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+cd src/ && protoc compiler/swift-descriptor.proto --cpp_out="./" && cd ..;

src/compiler/makeTests.sh → scripts/makeTests.sh

@@ -1,3 +1,4 @@
+cd src/compiler
 protoc  google/protobuf/unittest*.proto --swift_out="./Tests";
 protoc  google/protobuf/descriptor*.proto --swift_out="./Tests";
 cp -f ./Tests/* ../ProtocolBuffers/ProtocolBuffersTests/pbTests/;

src/ProtocolBuffers/ProtocolBuffers.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		3F1422981A07FDBF0090CEE9 /* ProtocolBuffers.framework in Copy Framework */ = {isa = PBXBuildFile; fileRef = 3F85569919C71BCF003802F2 /* ProtocolBuffers.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		3F181E1319D1D83900F7FA0D /* AbstractMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F181E0619D1D83900F7FA0D /* AbstractMessage.swift */; };
 		3F181E1419D1D83900F7FA0D /* CodedInputStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F181E0719D1D83900F7FA0D /* CodedInputStream.swift */; };
 		3F181E1519D1D83900F7FA0D /* CodedOutputStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F181E0819D1D83900F7FA0D /* CodedOutputStream.swift */; };
@@ -54,6 +55,20 @@
 		};
 /* End PBXContainerItemProxy section */
 
+/* Begin PBXCopyFilesBuildPhase section */
+		3F1422971A07FD990090CEE9 /* Copy Framework */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				3F1422981A07FDBF0090CEE9 /* ProtocolBuffers.framework in Copy Framework */,
+			);
+			name = "Copy Framework";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* Begin PBXFileReference section */
 		3F181E0619D1D83900F7FA0D /* AbstractMessage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AbstractMessage.swift; sourceTree = "<group>"; };
 		3F181E0719D1D83900F7FA0D /* CodedInputStream.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CodedInputStream.swift; sourceTree = "<group>"; };
@@ -250,6 +265,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3F8556AF19C71BCF003802F2 /* Build configuration list for PBXNativeTarget "UnitTesting" */;
 			buildPhases = (
+				3F1422971A07FD990090CEE9 /* Copy Framework */,
 				3F8556A019C71BCF003802F2 /* Sources */,
 				3F8556A119C71BCF003802F2 /* Frameworks */,
 				3F8556A219C71BCF003802F2 /* Resources */,

src/ProtocolBuffers/ProtocolBuffers.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme

@@ -20,6 +20,20 @@
                ReferencedContainer = "container:ProtocolBuffers.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "3F8556A319C71BCF003802F2"
+               BuildableName = "ProtocolBuffersTests.xctest"
+               BlueprintName = "UnitTesting"
+               ReferencedContainer = "container:ProtocolBuffers.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction

src/ProtocolBuffers/ProtocolBuffers/runtime-pb-swift/ExtendableMessage.swift

@@ -71,7 +71,7 @@ public class ExtendableMessage : GeneratedMessage
         extensionRegistry[extensions.fieldNumber] = extensions
     }
 
-    public func getExtension(extensions:ConcreateExtensionField) -> ConcreateExtensionField
+    public func getExtension(extensions:ConcreateExtensionField) -> Any
     {
         ensureExtensionIsRegistered(extensions)
         return extensionRegistry[extensions.fieldNumber]!
@@ -280,7 +280,7 @@ public class ExtendableMessageBuilder:GeneratedMessageBuilder
         }
         return super.parseUnknownField(input, unknownFields: unknownFields, extensionRegistry: extensionRegistry, tag: tag)
     }
-    public func getExtension(extensions:ConcreateExtensionField) -> ConcreateExtensionField
+    public func getExtension(extensions:ConcreateExtensionField) -> Any
     {
         return internalGetResult.getExtension(extensions)
     }