Fix dependency issue and move InteropTestsMultipleChannels to CronetTests

gRPC-RxLibrary.podspec

@@ -42,6 +42,23 @@ Pod::Spec.new do |s|
   s.module_name = name
   s.header_dir = name
 
+  s.default_subspec = 'Interface', 'Implementation'
+
+  src_dir = 'src/objective-c/RxLibrary'
+  s.subspec 'Interface' do |ss|
+    ss.header_mappings_dir = "#{src_dir}"
+    ss.source_files = "#{src_dir}/*.h"
+    ss.public_header_files = "#{src_dir}/*.h"
+  end
+
+  s.subspec 'Implementation' do |ss|
+    ss.header_mappings_dir = "#{src_dir}"
+    ss.source_files = "#{src_dir}/*.m", "#{src_dir}/**/*.{h,m}"
+    ss.private_header_files = "#{src_dir}/**/*.h"
+
+    ss.dependency "#{s.name}/Interface"
+  end
+
   src_dir = 'src/objective-c/RxLibrary'
   s.source_files = "#{src_dir}/*.{h,m}", "#{src_dir}/**/*.{h,m}"
   s.private_header_files = "#{src_dir}/private/*.h"

gRPC.podspec

@@ -67,6 +67,7 @@ Pod::Spec.new do |s|
                       "GRPCClient/GRPCCall+Tests.h",
                       "src/objective-c/GRPCClient/GRPCCallLegacy.h",
                       "src/objective-c/GRPCClient/GRPCTypes.h"
+    ss.dependency "gRPC-RxLibrary/Interface", version
   end
 
   s.subspec 'Interface' do |ss|

src/objective-c/examples/tvOS-sample/tvOS-sample/ViewController.m

@@ -25,8 +25,8 @@
 #import "src/objective-c/examples/RemoteTestClient/Messages.pbobjc.h"
 #import "src/objective-c/examples/RemoteTestClient/Test.pbrpc.h"
 #endif
-#import <ProtoRPC/ProtoRPC.h>
 #import <GRPCClient/GRPCCallOptions.h>
+#import <ProtoRPC/ProtoRPC.h>
 
 @interface ViewController ()<GRPCProtoResponseHandler>
 

src/objective-c/examples/watchOS-sample/WatchKit-Extension/InterfaceController.m

@@ -24,8 +24,8 @@
 #import "src/objective-c/examples/RemoteTestClient/Messages.pbobjc.h"
 #import "src/objective-c/examples/RemoteTestClient/Test.pbrpc.h"
 #endif
-#import <ProtoRPC/ProtoRPC.h>
 #import <GRPCClient/GRPCCallOptions.h>
+#import <ProtoRPC/ProtoRPC.h>
 
 @interface InterfaceController ()<GRPCProtoResponseHandler>
 

src/objective-c/tests/Podfile

@@ -30,25 +30,25 @@ target 'MacTests' do
   grpc_deps
 end
 
-target 'UnitTests' do 
-  platform :ios, '8.0'
-  grpc_deps
-end
-
 %w(
+  UnitTests
   InteropTests
-  CronetTests
 ).each do |target_name|
   target target_name do
     platform :ios, '8.0'
     grpc_deps
-
-    pod 'gRPC/GRPCCoreCronet',           :path => GRPC_LOCAL_SRC
-    pod 'CronetFramework', :podspec => "#{GRPC_LOCAL_SRC}/src/objective-c"
-    pod 'gRPC-Core/Tests', :path => GRPC_LOCAL_SRC, :inhibit_warnings => true
   end
 end
 
+target 'CronetTests' do
+  platform :ios, '8.0'
+  grpc_deps
+
+  pod 'gRPC/GRPCCoreCronet',           :path => GRPC_LOCAL_SRC
+  pod 'CronetFramework', :podspec => "#{GRPC_LOCAL_SRC}/src/objective-c"
+  pod 'gRPC-Core/Tests', :path => GRPC_LOCAL_SRC, :inhibit_warnings => true
+end
+
 # gRPC-Core.podspec needs to be modified to be successfully used for local development. A Podfile's
 # pre_install hook lets us do that. The block passed to it runs after the podspecs are downloaded
 # and before they are installed in the user project.

src/objective-c/tests/Tests.xcodeproj/project.pbxproj

@@ -8,15 +8,14 @@
 
 /* Begin PBXBuildFile section */
 		5E0282E9215AA697007AC99D /* NSErrorUnitTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E0282E8215AA697007AC99D /* NSErrorUnitTests.m */; };
+		5E08D07023021E3B006D76EA /* InteropTestsMultipleChannels.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E7F487722778226006656AD /* InteropTestsMultipleChannels.m */; };
 		5E3F14842278B461007C6D90 /* InteropTestsBlockCallbacks.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E3F14832278B461007C6D90 /* InteropTestsBlockCallbacks.m */; };
 		5E3F14852278BF5D007C6D90 /* InteropTestsBlockCallbacks.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E3F14832278B461007C6D90 /* InteropTestsBlockCallbacks.m */; };
 		5E3F14862278BFFF007C6D90 /* InteropTestsBlockCallbacks.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E3F14832278B461007C6D90 /* InteropTestsBlockCallbacks.m */; };
 		5E3F148D22792856007C6D90 /* ConfigureCronet.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E3F1487227918AA007C6D90 /* ConfigureCronet.m */; };
-		5E3F148E22792AF5007C6D90 /* ConfigureCronet.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E3F1487227918AA007C6D90 /* ConfigureCronet.m */; };
 		5E7F486422775B37006656AD /* InteropTestsRemoteWithCronet.m in Sources */ = {isa = PBXBuildFile; fileRef = 5EE84BF31D4717E40050C6CC /* InteropTestsRemoteWithCronet.m */; };
 		5E7F486522775B41006656AD /* CronetUnitTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5EAD6D261E27047400002378 /* CronetUnitTests.mm */; };
 		5E7F486E22778086006656AD /* CoreCronetEnd2EndTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5E7F486D22778086006656AD /* CoreCronetEnd2EndTests.mm */; };
-		5E7F487922778226006656AD /* InteropTestsMultipleChannels.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E7F487722778226006656AD /* InteropTestsMultipleChannels.m */; };
 		5E7F487D22778256006656AD /* ChannelPoolTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E7F487B22778256006656AD /* ChannelPoolTest.m */; };
 		5E7F487E22778256006656AD /* ChannelTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E7F487C22778256006656AD /* ChannelTests.m */; };
 		5E7F4880227782C1006656AD /* APIv2Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E7F487F227782C1006656AD /* APIv2Tests.m */; };
@@ -514,7 +513,6 @@
 				5EA476F12272816A000F72FC /* Frameworks */,
 				5EA476F22272816A000F72FC /* Resources */,
 				D11CB94CF56A1E53760D29D8 /* [CP] Copy Pods Resources */,
-				0FEFD5FC6B323AC95549AE4A /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -676,24 +674,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		0FEFD5FC6B323AC95549AE4A /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-InteropTests/Pods-InteropTests-frameworks.sh",
-				"${PODS_ROOT}/CronetFramework/Cronet.framework",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Cronet.framework",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-InteropTests/Pods-InteropTests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		292EA42A76AC7933A37235FD /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -827,7 +807,7 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-InteropTests/Pods-InteropTests-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/gRPC.default-GRPCCoreCronet/gRPCCertificates.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/gRPC-iOS/gRPCCertificates.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
@@ -896,6 +876,7 @@
 			files = (
 				5E3F14852278BF5D007C6D90 /* InteropTestsBlockCallbacks.m in Sources */,
 				5E3F148D22792856007C6D90 /* ConfigureCronet.m in Sources */,
+				5E08D07023021E3B006D76EA /* InteropTestsMultipleChannels.m in Sources */,
 				5E7F486E22778086006656AD /* CoreCronetEnd2EndTests.mm in Sources */,
 				5E7F488522778A88006656AD /* InteropTests.m in Sources */,
 				5E7F486422775B37006656AD /* InteropTestsRemoteWithCronet.m in Sources */,
@@ -908,9 +889,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				5E3F14842278B461007C6D90 /* InteropTestsBlockCallbacks.m in Sources */,
-				5E3F148E22792AF5007C6D90 /* ConfigureCronet.m in Sources */,
 				5E7F488922778B04006656AD /* InteropTestsRemote.m in Sources */,
-				5E7F487922778226006656AD /* InteropTestsMultipleChannels.m in Sources */,
 				5EA477042273617B000F72FC /* InteropTestsLocalCleartext.m in Sources */,
 				5EA4770322736178000F72FC /* InteropTestsLocalSSL.m in Sources */,
 				5E7F488422778A88006656AD /* InteropTests.m in Sources */,

src/objective-c/tests/Tests.xcodeproj/xcshareddata/xcschemes/InteropTests.xcscheme

@@ -23,7 +23,7 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration = "Cronet"
+      buildConfiguration = "Test"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
@@ -48,7 +48,7 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Cronet"
+      buildConfiguration = "Test"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
@@ -70,7 +70,7 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Test"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
@@ -86,7 +86,7 @@
       </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
-      buildConfiguration = "Cronet">
+      buildConfiguration = "Test">
    </AnalyzeAction>
    <ArchiveAction
       buildConfiguration = "Release"

templates/gRPC-RxLibrary.podspec.template

@@ -44,6 +44,23 @@
     s.module_name = name
     s.header_dir = name
 
+    s.default_subspec = 'Interface', 'Implementation'
+
+    src_dir = 'src/objective-c/RxLibrary'
+    s.subspec 'Interface' do |ss|
+      ss.header_mappings_dir = "#{src_dir}"
+      ss.source_files = "#{src_dir}/*.h"
+      ss.public_header_files = "#{src_dir}/*.h"
+    end
+
+    s.subspec 'Implementation' do |ss|
+      ss.header_mappings_dir = "#{src_dir}"
+      ss.source_files = "#{src_dir}/*.m", "#{src_dir}/**/*.{h,m}"
+      ss.private_header_files = "#{src_dir}/**/*.h"
+
+      ss.dependency "#{s.name}/Interface"
+    end
+
     src_dir = 'src/objective-c/RxLibrary'
     s.source_files = "#{src_dir}/*.{h,m}", "#{src_dir}/**/*.{h,m}"
     s.private_header_files = "#{src_dir}/private/*.h"

templates/gRPC.podspec.template

@@ -69,6 +69,7 @@
                         "GRPCClient/GRPCCall+Tests.h",
                         "src/objective-c/GRPCClient/GRPCCallLegacy.h",
                         "src/objective-c/GRPCClient/GRPCTypes.h"
+      ss.dependency "gRPC-RxLibrary/Interface", version
     end
 
     s.subspec 'Interface' do |ss|