GDT: test app fixes (#6897)

* Add bridging header to GDTTestApp to expose private API

* Update OS versions of test apps

* Use spec OS vesrions for tests and apps

* Use local variables for deployment targets

Author: maksymmalyhin

GoogleDataTransport.podspec

@@ -15,10 +15,15 @@ Shared library for iOS SDK data transport needs.
     :tag => 'DataTransport-' + s.version.to_s
   }
 
-  s.ios.deployment_target = '9.0'
-  s.osx.deployment_target = '10.12'
-  s.tvos.deployment_target = '10.0'
-  s.watchos.deployment_target = '6.0'
+  ios_deployment_target = '9.0'
+  osx_deployment_target = '10.12'
+  tvos_deployment_target = '10.0'
+  watchos_deployment_target = '6.0'
+
+  s.ios.deployment_target = ios_deployment_target
+  s.osx.deployment_target = osx_deployment_target
+  s.tvos.deployment_target = tvos_deployment_target
+  s.watchos.deployment_target = watchos_deployment_target
 
   # To develop or run the tests, >= 1.8.0 must be installed.
   s.cocoapods_version = '>= 1.4.0'
@@ -55,7 +60,7 @@ Shared library for iOS SDK data transport needs.
   # Test app specs
   if ENV['GDT_DEV'] && ENV['GDT_DEV'] == '1' then
     s.app_spec 'TestApp' do |app_spec|
-      app_spec.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}
+      app_spec.platforms =  {:ios => ios_deployment_target, :osx => osx_deployment_target, :tvos => tvos_deployment_target}
       app_spec.source_files = [
         'GoogleDataTransport/GDTTestApp/*.swift',
         'GoogleDataTransport/GDTCORLibrary/Internal/GDTCORRegistrar.h',
@@ -80,22 +85,22 @@ Shared library for iOS SDK data transport needs.
 
   # Unit test specs
   s.test_spec 'Tests-Unit' do |test_spec|
-    test_spec.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}
+    test_spec.platforms = {:ios => ios_deployment_target, :osx => osx_deployment_target, :tvos => tvos_deployment_target}
     test_spec.requires_app_host = false
     test_spec.source_files = ['GoogleDataTransport/GDTCORTests/Unit/**/*.{h,m}'] + common_test_sources
     test_spec.pod_target_xcconfig = header_search_paths
   end
 
   s.test_spec 'Tests-Lifecycle' do |test_spec|
-    test_spec.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}
+    test_spec.platforms = {:ios => ios_deployment_target, :osx => osx_deployment_target, :tvos => tvos_deployment_target}
     test_spec.requires_app_host = false
     test_spec.source_files = ['GoogleDataTransport/GDTCORTests/Lifecycle/**/*.{h,m}'] + common_test_sources
     test_spec.pod_target_xcconfig = header_search_paths
   end
 
   # Integration test specs
   s.test_spec 'Tests-Integration' do |test_spec|
-    test_spec.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}
+    test_spec.platforms = {:ios => ios_deployment_target, :osx => osx_deployment_target, :tvos => tvos_deployment_target}
     test_spec.requires_app_host = false
     test_spec.source_files = ['GoogleDataTransport/GDTCORTests/Integration/**/*.{h,m}'] + common_test_sources
     test_spec.pod_target_xcconfig = header_search_paths
@@ -105,7 +110,7 @@ Shared library for iOS SDK data transport needs.
   # Monkey test specs TODO(mikehaney24): Uncomment when travis is running >= cocoapods-1.8.0
   if ENV['GDT_DEV'] && ENV['GDT_DEV'] == '1' then
     s.test_spec 'Tests-Monkey' do |test_spec|
-      test_spec.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}
+      test_spec.platforms = {:ios => ios_deployment_target, :osx => osx_deployment_target, :tvos => tvos_deployment_target}
       test_spec.requires_app_host = true
       test_spec.app_host_name = 'GoogleDataTransport/TestApp'
       test_spec.dependency 'GoogleDataTransport/TestApp'
@@ -119,7 +124,7 @@ Shared library for iOS SDK data transport needs.
   # CCT Tests follow
   if ENV['GDT_DEV'] && ENV['GDT_DEV'] == '1' then
     s.app_spec 'CCTTestApp' do |app_spec|
-      app_spec.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}
+      app_spec.platforms = {:ios => ios_deployment_target, :osx => osx_deployment_target, :tvos => tvos_deployment_target}
       app_spec.source_files = 'GoogleDataTransport/GDTCCTTestApp/**/*.swift'
       app_spec.ios.resources = ['GoogleDataTransport/GDTCCTTestApp/ios/*.storyboard']
       app_spec.macos.resources = ['GoogleDataTransport/GDTCCTTestApp/macos/*.storyboard']
@@ -137,7 +142,7 @@ Shared library for iOS SDK data transport needs.
 
   # Test specs
   s.test_spec 'CCT-Tests-Unit' do |test_spec|
-    test_spec.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}
+    test_spec.platforms = {:ios => ios_deployment_target, :osx => osx_deployment_target, :tvos => tvos_deployment_target}
     test_spec.requires_app_host = false
     test_spec.source_files = ['GoogleDataTransport/GDTCCTTests/Unit/**/*.{h,m}'] + common_cct_test_sources + common_test_sources
     test_spec.resources = ['GoogleDataTransport/GDTCCTTests/Data/**/*']
@@ -146,7 +151,7 @@ Shared library for iOS SDK data transport needs.
   end
 
   s.test_spec 'CCT-Tests-Integration' do |test_spec|
-    test_spec.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}
+    test_spec.platforms = {:ios => ios_deployment_target, :osx => osx_deployment_target, :tvos => tvos_deployment_target}
     test_spec.requires_app_host = false
     test_spec.source_files = ['GoogleDataTransport/GDTCCTTests/Integration/**/*.{h,m}'] + common_cct_test_sources
     test_spec.resources = ['GoogleDataTransport/GDTCCTTests/Data/**/*']
@@ -156,7 +161,7 @@ Shared library for iOS SDK data transport needs.
   # Monkey test specs, only enabled for development.
   if ENV['GDT_DEV'] && ENV['GDT_DEV'] == '1' then
     s.test_spec 'CCT-Tests-Monkey' do |test_spec|
-      test_spec.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}
+      test_spec.platforms = {:ios => ios_deployment_target, :osx => osx_deployment_target, :tvos => tvos_deployment_target}
       test_spec.requires_app_host = true
       test_spec.app_host_name = 'GoogleDataTransport/CCTTestApp'
       test_spec.dependency 'GoogleDataTransport/CCTTestApp'

GoogleDataTransport/GDTTestApp/Bridging-Header.h

@@ -0,0 +1,16 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORUploader.h"
+#import "GoogleDataTransport/GDTCORLibrary/Private/GDTCORUploadCoordinator.h"