Răsfoiți Sursa

Support tvOS (#446)

* Adds tvos deployment target to the podspec

* Deletes BoringSSL dependency

* Adds TVOS_DEPLOYMENT_TARGET for each target in Carthage project

* Runs make project-carthage
Enric Macias 6 ani în urmă
părinte
comite
79ecfa5dc9

+ 1 - 1
SwiftGRPC-Carthage.xcodeproj/GeneratedModuleMap/CNIONghttp2/module.modulemap

@@ -1,4 +1,4 @@
 module CNIONghttp2 {
-    umbrella "/Users/William/Documents/work/clients/perceptolab/safehome/grpc-swift/.build/checkouts/swift-nio-http2.git--6139390414245659487/Sources/CNIONghttp2/include"
+    umbrella "/Users/a40903/Documents/dev/ios/grpc-swift/.build/checkouts/swift-nio-http2.git-8902869069529343296/Sources/CNIONghttp2/include"
     export *
 }

Fișier diff suprimat deoarece este prea mare
+ 713 - 713
SwiftGRPC-Carthage.xcodeproj/project.pbxproj


+ 2 - 2
SwiftGRPC-Carthage.xcodeproj/xcshareddata/xcschemes/Echo.xcscheme

@@ -24,7 +24,7 @@
           <BuildableReference
             BuildableIdentifier = "primary"
             BuildableName = "'$(TARGET_NAME)'"
-            BlueprintName = "SwiftGRPCTests"
+            BlueprintName = "SwiftGRPCNIOTests"
             ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
           </BuildableReference>
         </TestableReference>
@@ -33,7 +33,7 @@
           <BuildableReference
             BuildableIdentifier = "primary"
             BuildableName = "'$(TARGET_NAME)'"
-            BlueprintName = "SwiftGRPCNIOTests"
+            BlueprintName = "SwiftGRPCTests"
             ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
           </BuildableReference>
         </TestableReference>

+ 2 - 2
SwiftGRPC-Carthage.xcodeproj/xcshareddata/xcschemes/EchoNIO.xcscheme

@@ -24,7 +24,7 @@
           <BuildableReference
             BuildableIdentifier = "primary"
             BuildableName = "'$(TARGET_NAME)'"
-            BlueprintName = "SwiftGRPCTests"
+            BlueprintName = "SwiftGRPCNIOTests"
             ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
           </BuildableReference>
         </TestableReference>
@@ -33,7 +33,7 @@
           <BuildableReference
             BuildableIdentifier = "primary"
             BuildableName = "'$(TARGET_NAME)'"
-            BlueprintName = "SwiftGRPCNIOTests"
+            BlueprintName = "SwiftGRPCTests"
             ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
           </BuildableReference>
         </TestableReference>

+ 2 - 2
SwiftGRPC-Carthage.xcodeproj/xcshareddata/xcschemes/RootsEncoder.xcscheme

@@ -24,7 +24,7 @@
           <BuildableReference
             BuildableIdentifier = "primary"
             BuildableName = "'$(TARGET_NAME)'"
-            BlueprintName = "SwiftGRPCTests"
+            BlueprintName = "SwiftGRPCNIOTests"
             ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
           </BuildableReference>
         </TestableReference>
@@ -33,7 +33,7 @@
           <BuildableReference
             BuildableIdentifier = "primary"
             BuildableName = "'$(TARGET_NAME)'"
-            BlueprintName = "SwiftGRPCNIOTests"
+            BlueprintName = "SwiftGRPCTests"
             ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
           </BuildableReference>
         </TestableReference>

+ 2 - 2
SwiftGRPC-Carthage.xcodeproj/xcshareddata/xcschemes/Simple.xcscheme

@@ -24,7 +24,7 @@
           <BuildableReference
             BuildableIdentifier = "primary"
             BuildableName = "'$(TARGET_NAME)'"
-            BlueprintName = "SwiftGRPCTests"
+            BlueprintName = "SwiftGRPCNIOTests"
             ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
           </BuildableReference>
         </TestableReference>
@@ -33,7 +33,7 @@
           <BuildableReference
             BuildableIdentifier = "primary"
             BuildableName = "'$(TARGET_NAME)'"
-            BlueprintName = "SwiftGRPCNIOTests"
+            BlueprintName = "SwiftGRPCTests"
             ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
           </BuildableReference>
         </TestableReference>

+ 22 - 21
SwiftGRPC-Carthage.xcodeproj/xcshareddata/xcschemes/SwiftGRPC-Package.xcscheme

@@ -32,8 +32,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BuildableName = "&apos;$(TARGET_NAME)&apos;"
-               BlueprintName = "RootsEncoder"
+               BlueprintIdentifier = "SwiftGRPC::BoringSSL"
+               BuildableName = "BoringSSL.framework"
+               BlueprintName = "BoringSSL"
                ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -45,9 +46,8 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "SwiftGRPC::SwiftGRPC"
-               BuildableName = "SwiftGRPC.framework"
-               BlueprintName = "SwiftGRPC"
+               BuildableName = "&apos;$(TARGET_NAME)&apos;"
+               BlueprintName = "protoc-gen-swiftgrpc"
                ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -59,8 +59,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BuildableName = "&apos;$(TARGET_NAME)&apos;"
-               BlueprintName = "EchoNIO"
+               BlueprintIdentifier = "SwiftGRPC::SwiftGRPC"
+               BuildableName = "SwiftGRPC.framework"
+               BlueprintName = "SwiftGRPC"
                ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -72,8 +73,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BuildableName = "&apos;$(TARGET_NAME)&apos;"
-               BlueprintName = "Simple"
+               BlueprintIdentifier = "SwiftGRPC::CgRPC"
+               BuildableName = "CgRPC.framework"
+               BlueprintName = "CgRPC"
                ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -86,7 +88,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BuildableName = "&apos;$(TARGET_NAME)&apos;"
-               BlueprintName = "Echo"
+               BlueprintName = "EchoNIO"
                ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -99,7 +101,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BuildableName = "&apos;$(TARGET_NAME)&apos;"
-               BlueprintName = "protoc-gen-swiftgrpc"
+               BlueprintName = "Simple"
                ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -111,9 +113,8 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "SwiftGRPC::BoringSSL"
-               BuildableName = "BoringSSL.framework"
-               BlueprintName = "BoringSSL"
+               BuildableName = "&apos;$(TARGET_NAME)&apos;"
+               BlueprintName = "Echo"
                ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -125,9 +126,8 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "SwiftGRPC::CgRPC"
-               BuildableName = "CgRPC.framework"
-               BlueprintName = "CgRPC"
+               BuildableName = "&apos;$(TARGET_NAME)&apos;"
+               BlueprintName = "RootsEncoder"
                ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -171,7 +171,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BuildableName = "&apos;$(TARGET_NAME)&apos;"
-               BlueprintName = "SwiftGRPCTests"
+               BlueprintName = "SwiftGRPCNIOTests"
                ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
             </BuildableReference>
          </TestableReference>
@@ -180,7 +180,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BuildableName = "&apos;$(TARGET_NAME)&apos;"
-               BlueprintName = "SwiftGRPCNIOTests"
+               BlueprintName = "SwiftGRPCTests"
                ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
             </BuildableReference>
          </TestableReference>
@@ -201,8 +201,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BuildableName = "&apos;$(TARGET_NAME)&apos;"
-            BlueprintName = "RootsEncoder"
+            BlueprintIdentifier = "SwiftGRPC::BoringSSL"
+            BuildableName = "BoringSSL.framework"
+            BlueprintName = "BoringSSL"
             ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

+ 2 - 2
SwiftGRPC-Carthage.xcodeproj/xcshareddata/xcschemes/protoc-gen-swiftgrpc.xcscheme

@@ -24,7 +24,7 @@
           <BuildableReference
             BuildableIdentifier = "primary"
             BuildableName = "'$(TARGET_NAME)'"
-            BlueprintName = "SwiftGRPCTests"
+            BlueprintName = "SwiftGRPCNIOTests"
             ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
           </BuildableReference>
         </TestableReference>
@@ -33,7 +33,7 @@
           <BuildableReference
             BuildableIdentifier = "primary"
             BuildableName = "'$(TARGET_NAME)'"
-            BlueprintName = "SwiftGRPCNIOTests"
+            BlueprintName = "SwiftGRPCTests"
             ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
           </BuildableReference>
         </TestableReference>

+ 1 - 1
SwiftGRPC.podspec

@@ -35,11 +35,11 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.ios.deployment_target = '8.0'
   s.osx.deployment_target = '10.10'
+  s.tvos.deployment_target = '10.0'
 
   s.source_files = 'Sources/SwiftGRPC/*.swift', 'Sources/SwiftGRPC/**/*.swift', 'Sources/CgRPC/shim/*.[ch]'
   s.public_header_files = 'Sources/CgRPC/shim/cgrpc.h'
 
   s.dependency 'gRPC-Core', '~> 1.19.0'
-  s.dependency 'BoringSSL', '~> 10.0'
   s.dependency 'SwiftProtobuf', '~> 1.5.0'
 end

+ 1 - 0
fix-project-settings.rb

@@ -28,6 +28,7 @@ cgrpc_header.settings = { 'ATTRIBUTES' => ['Public'] }
 project.targets.each do |target|
   target.build_configurations.each do |config|
     config.build_settings["IPHONEOS_DEPLOYMENT_TARGET"] = "9.0"
+    config.build_settings["TVOS_DEPLOYMENT_TARGET"] = "10.0"
     if config.build_settings["PRODUCT_BUNDLE_IDENTIFIER"] then
       config.build_settings["PRODUCT_BUNDLE_IDENTIFIER"] = "io.grpc." + config.build_settings["PRODUCT_BUNDLE_IDENTIFIER"]
     end

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff