Browse Source

Replace libz link dependency with a reference to an external source package.

Tim Burks 8 years ago
parent
commit
b75af1674c

+ 1 - 1
Examples/Datastore/PackageManager/Package.swift

@@ -17,7 +17,7 @@ import PackageDescription
 let package = Package (
     name: "Datastore",
     dependencies: [
-        .Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,1,10)),
+        .Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,1,12)),
         .Package(url: "https://github.com/apple/swift-protobuf.git", Version(0,9,901)),
     ]
 )

+ 1 - 3
Examples/Echo/PackageManager/Makefile

@@ -1,8 +1,6 @@
 
-LDFLAGS = -Xlinker -lz 
-
 all:
-	swift build -v $(LDFLAGS)
+	swift build
 
 clean :
 	rm -rf Packages

+ 1 - 1
Examples/Echo/PackageManager/Package.swift

@@ -17,7 +17,7 @@ import PackageDescription
 let package = Package (
     name: "Echo",
     dependencies: [
-        .Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,1,10)),
+        .Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,1,12)),
         .Package(url: "https://github.com/apple/swift-protobuf.git", Version(0,9,903)),
     ]
 )

+ 1 - 1
Examples/Simple/PackageManager/Package.swift

@@ -17,6 +17,6 @@ import PackageDescription
 let package = Package (
     name: "Simple",
     dependencies: [
-        .Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,1,10)),
+        .Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,1,12)),
     ]
 )

+ 1 - 1
Makefile

@@ -1,7 +1,7 @@
 
 CFLAGS = -Xcc -ISources/BoringSSL/include
 
-LDFLAGS = -Xlinker -lz 
+#LDFLAGS = -Xlinker -lz 
 
 all:
 	swift package generate-xcodeproj

+ 3 - 0
Package.swift

@@ -22,5 +22,8 @@ let package = Package(
            dependencies: ["CgRPC"]),
     Target(name: "CgRPC",
            dependencies: ["BoringSSL"]),
+  ],
+  dependencies: [
+    .Package(url: "https://github.com/Zewo/zlib.git", majorVersion: 0, minor: 4),
   ]
 )