Only include src/objective-c/examples/RemoteTestClient/.. stubs

Reverting other files & removing redundant spaces
pull/19733/head
Tony Lu 6 years ago
parent f00dd31ace
commit f9d9fbd36b
  1. 6
      src/objective-c/examples/RemoteTestClient/RemoteTest.podspec
  2. 30
      src/objective-c/examples/SwiftSample/Images.xcassets/AppIcon.appiconset/Contents.json
  3. 4
      src/objective-c/tests/RemoteTestClient/RemoteTest.podspec
  4. 2
      tools/internal_ci/helper_scripts/prepare_build_macos_rc

@ -45,20 +45,20 @@ Pod::Spec.new do |s|
end end
s.subspec 'Messages' do |ms| s.subspec 'Messages' do |ms|
ms.source_files = '**/*.pbobjc.{h,m}' ms.source_files = 'src/objective-c/examples/RemoteTestClient/*.pbobjc.{h,m}'
ms.header_mappings_dir = '.' ms.header_mappings_dir = '.'
ms.requires_arc = false ms.requires_arc = false
ms.dependency 'Protobuf' ms.dependency 'Protobuf'
end end
s.subspec 'Services' do |ss| s.subspec 'Services' do |ss|
ss.source_files = '**/*.pbrpc.{h,m}' ss.source_files = 'src/objective-c/examples/RemoteTestClient/*.pbrpc.{h,m}'
ss.header_mappings_dir = '.' ss.header_mappings_dir = '.'
ss.requires_arc = true ss.requires_arc = true
ss.dependency 'gRPC-ProtoRPC' ss.dependency 'gRPC-ProtoRPC'
ss.dependency "#{s.name}/Messages" ss.dependency "#{s.name}/Messages"
end end
s.pod_target_xcconfig = { s.pod_target_xcconfig = {
# This is needed by all pods that depend on Protobuf: # This is needed by all pods that depend on Protobuf:
'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1', 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1',

@ -1,15 +1,5 @@
{ {
"images" : [ "images" : [
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "3x"
},
{ {
"idiom" : "iphone", "idiom" : "iphone",
"size" : "29x29", "size" : "29x29",
@ -40,16 +30,6 @@
"size" : "60x60", "size" : "60x60",
"scale" : "3x" "scale" : "3x"
}, },
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "2x"
},
{ {
"idiom" : "ipad", "idiom" : "ipad",
"size" : "29x29", "size" : "29x29",
@ -79,16 +59,6 @@
"idiom" : "ipad", "idiom" : "ipad",
"size" : "76x76", "size" : "76x76",
"scale" : "2x" "scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "83.5x83.5",
"scale" : "2x"
},
{
"idiom" : "ios-marketing",
"size" : "1024x1024",
"scale" : "1x"
} }
], ],
"info" : { "info" : {

@ -45,14 +45,14 @@ Pod::Spec.new do |s|
CMD CMD
s.subspec "Messages" do |ms| s.subspec "Messages" do |ms|
ms.source_files = "**/*.pbobjc.{h,m}" ms.source_files = "src/objective-c/tests/RemoteTestClient/*.pbobjc.{h,m}"
ms.header_mappings_dir = "." ms.header_mappings_dir = "."
ms.requires_arc = false ms.requires_arc = false
ms.dependency "Protobuf" ms.dependency "Protobuf"
end end
s.subspec "Services" do |ss| s.subspec "Services" do |ss|
ss.source_files = "**/*.pbrpc.{h,m}" ss.source_files = "src/objective-c/tests/RemoteTestClient/*.pbrpc.{h,m}"
ss.header_mappings_dir = "." ss.header_mappings_dir = "."
ss.requires_arc = true ss.requires_arc = true
ss.dependency "gRPC-ProtoRPC" ss.dependency "gRPC-ProtoRPC"

@ -37,7 +37,7 @@ set -e # rvm commands are very verbose
time rvm install 2.5.0 time rvm install 2.5.0
rvm use 2.5.0 --default rvm use 2.5.0 --default
time gem install bundler -v 1.17.3 --no-ri --no-doc time gem install bundler -v 1.17.3 --no-ri --no-doc
time gem install cocoapods --version 1.6.1 --no-ri --no-doc time gem install cocoapods --version 1.3.1 --no-ri --no-doc
time gem install rake-compiler --no-ri --no-doc time gem install rake-compiler --no-ri --no-doc
rvm osx-ssl-certs status all rvm osx-ssl-certs status all
rvm osx-ssl-certs update all rvm osx-ssl-certs update all

Loading…
Cancel
Save