Skip to content

Commit 3fb0ed0

Browse files
authored
Disable project generation for watchOS (#4597)
1 parent da4819b commit 3fb0ed0

File tree

4 files changed

+7
-2
lines changed

4 files changed

+7
-2
lines changed

GoogleDataTransport.podspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ Shared library for iOS SDK data transport needs.
4646
# Test app specs
4747
if ENV['GDT_DEV'] && ENV['GDT_DEV'] == '1' then
4848
s.app_spec 'TestApp' do |app_spec|
49+
app_spec.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}
4950
app_spec.source_files = 'GoogleDataTransport/GDTTestApp/*.swift'
5051
app_spec.ios.resources = ['GoogleDataTransport/GDTTestApp/ios/*.storyboard']
5152
app_spec.macos.resources = ['GoogleDataTransport/GDTTestApp/macos/*.storyboard']

GoogleDataTransport/generate_project.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
# From https://stackoverflow.com/questions/59895/getting-the-source-directory-of-a-bash-script-from-within
1919
readonly DIR="$(git rev-parse --show-toplevel)"
2020

21-
pod gen "$DIR/GoogleDataTransport.podspec" --auto-open --gen-directory="$DIR/gen" --clean
21+
pod gen "$DIR/GoogleDataTransport.podspec" --auto-open --gen-directory="$DIR/gen" --platforms=ios,macos,tvos --clean

GoogleDataTransportCCTSupport.podspec

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ Support library to provide event prioritization and uploading for the GoogleData
5454
# Test app specs
5555
if ENV['GDT_DEV'] && ENV['GDT_DEV'] == '1' then
5656
s.app_spec 'TestApp' do |app_spec|
57+
app_spec.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}
5758
app_spec.source_files = 'GoogleDataTransportCCTSupport/GDTCCTTestApp/**/*.swift'
5859
app_spec.ios.resources = ['GoogleDataTransportCCTSupport/GDTCCTTestApp/ios/*.storyboard']
5960
app_spec.macos.resources = ['GoogleDataTransportCCTSupport/GDTCCTTestApp/macos/*.storyboard']
@@ -69,6 +70,7 @@ Support library to provide event prioritization and uploading for the GoogleData
6970

7071
# Test specs
7172
s.test_spec 'Tests-Unit' do |test_spec|
73+
test_spec.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}
7274
test_spec.requires_app_host = false
7375
test_spec.source_files = 'GoogleDataTransportCCTSupport/GDTCCTTests/Unit/**/*.{h,m}'
7476
test_spec.resources = ['GoogleDataTransportCCTSupport/GDTCCTTests/Data/**/*']
@@ -77,6 +79,7 @@ Support library to provide event prioritization and uploading for the GoogleData
7779
end
7880

7981
s.test_spec 'Tests-Integration' do |test_spec|
82+
test_spec.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}
8083
test_spec.requires_app_host = false
8184
test_spec.source_files = 'GoogleDataTransportCCTSupport/GDTCCTTests/Integration/**/*.{h,m}'
8285
test_spec.resources = ['GoogleDataTransportCCTSupport/GDTCCTTests/Data/**/*']
@@ -86,6 +89,7 @@ Support library to provide event prioritization and uploading for the GoogleData
8689
# Monkey test specs, only enabled for development.
8790
if ENV['GDT_DEV'] && ENV['GDT_DEV'] == '1' then
8891
s.test_spec 'Tests-Monkey' do |test_spec|
92+
test_spec.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}
8993
test_spec.requires_app_host = true
9094
test_spec.app_host_name = 'GoogleDataTransportCCTSupport/TestApp'
9195
test_spec.dependency 'GoogleDataTransportCCTSupport/TestApp'

GoogleDataTransportCCTSupport/generate_project.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ readonly DIR="$( git rev-parse --show-toplevel )"
1919

2020
"$DIR/GoogleDataTransportCCTSupport/ProtoSupport/generate_cct_protos.sh" || echo "Something went wrong generating protos.";
2121

22-
pod gen "${DIR}/GoogleDataTransportCCTSupport.podspec" --auto-open --gen-directory="${DIR}/gen" --local-sources="${DIR}" --clean
22+
pod gen "${DIR}/GoogleDataTransportCCTSupport.podspec" --auto-open --gen-directory="${DIR}/gen" --local-sources="${DIR}" --platforms=ios,macos,tvos --clean

0 commit comments

Comments
 (0)