Skip to content

Commit

Permalink
Update the minimum OS versions.
Browse files Browse the repository at this point in the history
New values: iOS 9.0, macOS 10.12, tvOS 10.0, watchOS 6.0

Assuming Xcode 11.7

- Update the gtm-session-fetcher submodule to get matching mins.
- Update the Xcode projects.
- Update the podspec.
- Update the examples' Podfiles.
- Update the tests.
  • Loading branch information
thomasvl committed Jun 24, 2021
1 parent c0562f8 commit e8e7844
Show file tree
Hide file tree
Showing 15 changed files with 53 additions and 49 deletions.
2 changes: 1 addition & 1 deletion Deps/gtm-session-fetcher
Submodule gtm-session-fetcher updated 42 files
+56 −0 .github/workflows/main.yml
+0 −96 .travis.sh
+0 −18 .travis.yml
+4 −4 GTMSessionFetcher.podspec
+1 −1 README.md
+11 −10 Source/GTMGatherInputStream.h
+7 −7 Source/GTMGatherInputStream.m
+53 −52 Source/GTMMIMEDocument.h
+47 −64 Source/GTMMIMEDocument.m
+17 −13 Source/GTMReadMonitorInputStream.h
+8 −12 Source/GTMReadMonitorInputStream.m
+267 −246 Source/GTMSessionFetcher.h
+656 −657 Source/GTMSessionFetcher.m
+8 −10 Source/GTMSessionFetcherCore.xcodeproj/project.pbxproj
+4 −7 Source/GTMSessionFetcherIOS/GTMSessionFetcherIOS.h
+1 −2 Source/GTMSessionFetcherLogViewController.h
+27 −34 Source/GTMSessionFetcherLogViewController.m
+81 −98 Source/GTMSessionFetcherLogging.m
+4 −7 Source/GTMSessionFetcherOSX/GTMSessionFetcherOSX.h
+37 −33 Source/GTMSessionFetcherService.h
+143 −174 Source/GTMSessionFetcherService.m
+4 −5 Source/GTMSessionFetchertvOS/GTMSessionFetchertvOS.h
+4 −5 Source/GTMSessionFetcherwatchOS/GTMSessionFetcherwatchOS.h
+27 −29 Source/GTMSessionUploadFetcher.h
+291 −279 Source/GTMSessionUploadFetcher.m
+2 −3 Source/TestApps/FetcherOSXTestApp/FTAAppDelegate.m
+1 −3 Source/TestApps/FetcherOSXTestApp/main.m
+49 −57 Source/TestApps/FetcheriOSTestApp/FTAIOSAppDelegate.m
+1 −1 Source/TestApps/FetcheriOSTestApp/main.m
+1 −5 Source/UnitTests/GTMGatherInputStreamTest.m
+12 −11 Source/UnitTests/GTMHTTPServer.h
+29 −43 Source/UnitTests/GTMHTTPServer.m
+146 −220 Source/UnitTests/GTMMIMEDocumentTest.m
+2 −5 Source/UnitTests/GTMReadMonitorInputStreamTest.m
+357 −322 Source/UnitTests/GTMSessionFetcherChunkedUploadTest.m
+3 −3 Source/UnitTests/GTMSessionFetcherCookieTest.m
+16 −21 Source/UnitTests/GTMSessionFetcherFetchingTest.h
+874 −696 Source/UnitTests/GTMSessionFetcherFetchingTest.m
+235 −174 Source/UnitTests/GTMSessionFetcherServiceTest.m
+4 −4 Source/UnitTests/GTMSessionFetcherTestServer.h
+43 −52 Source/UnitTests/GTMSessionFetcherTestServer.m
+12 −13 Source/UnitTests/GTMSessionFetcherUtilityTest.m
Expand Up @@ -366,7 +366,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.9;
MACOSX_DEPLOYMENT_TARGET = 10.12;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
WARNING_CFLAGS = (
Expand Down Expand Up @@ -408,7 +408,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.9;
MACOSX_DEPLOYMENT_TARGET = 10.12;
SDKROOT = macosx;
WARNING_CFLAGS = (
"-Wall",
Expand Down
7 changes: 4 additions & 3 deletions Examples/CalendarSample/Podfile
@@ -1,13 +1,14 @@
target 'CalendarSample' do
platform :osx, '10.9'
platform :osx, '10.12'

# Pods for GTMAppAuth development
pod 'GoogleAPIClientForREST/Calendar', :path => '../../'
# In production, you would use:
# pod 'GoogleAPIClientForREST/Calendar'

# Also use GTMAppAuth. See the project wiki, you can use this or Google
# SignIn.
# Also use GTMAppAuth & AppAuth. See the project wiki, you can use this or
# Google SignIn.
pod 'GTMAppAuth'
pod 'AppAuth'

end
4 changes: 2 additions & 2 deletions Examples/DriveSample/DriveSample.xcodeproj/project.pbxproj
Expand Up @@ -351,7 +351,7 @@
../../Source/OAuth2/Mac,
../../Source/Objects,
);
MACOSX_DEPLOYMENT_TARGET = 10.9;
MACOSX_DEPLOYMENT_TARGET = 10.12;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
WARNING_CFLAGS = (
Expand Down Expand Up @@ -400,7 +400,7 @@
../../Source/OAuth2/Mac,
../../Source/Objects,
);
MACOSX_DEPLOYMENT_TARGET = 10.9;
MACOSX_DEPLOYMENT_TARGET = 10.12;
SDKROOT = macosx;
WARNING_CFLAGS = (
"-Wall",
Expand Down
7 changes: 4 additions & 3 deletions Examples/DriveSample/Podfile
@@ -1,12 +1,13 @@
target 'DriveSample' do
platform :osx, '10.9'
platform :osx, '10.12'

pod 'GoogleAPIClientForREST/Drive', :path => '../../'
# In production, you would use:
# pod 'GoogleAPIClientForREST/Drive'

# Also use GTMAppAuth. See the project wiki, you can use this or Google
# SignIn.
# Also use GTMAppAuth & AppAuth. See the project wiki, you can use this or
# Google SignIn.
pod 'GTMAppAuth'
pod 'AppAuth'

end
7 changes: 4 additions & 3 deletions Examples/StorageSample/Podfile
@@ -1,12 +1,13 @@
target 'StorageSample' do
platform :osx, '10.9'
platform :osx, '10.12'

pod 'GoogleAPIClientForREST/Storage', :path => '../../'
# In production, you would use:
# pod 'GoogleAPIClientForREST/Storage'

# Also use GTMAppAuth. See the project wiki, you can use this or Google
# SignIn.
# Also use GTMAppAuth & AppAuth. See the project wiki, you can use this or
# Google SignIn.
pod 'GTMAppAuth'
pod 'AppAuth'

end
Expand Up @@ -351,7 +351,7 @@
../../Source/OAuth2/Mac,
../../Source/Objects,
);
MACOSX_DEPLOYMENT_TARGET = 10.9;
MACOSX_DEPLOYMENT_TARGET = 10.12;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
WARNING_CFLAGS = (
Expand Down Expand Up @@ -400,7 +400,7 @@
../../Source/OAuth2/Mac,
../../Source/Objects,
);
MACOSX_DEPLOYMENT_TARGET = 10.9;
MACOSX_DEPLOYMENT_TARGET = 10.12;
SDKROOT = macosx;
WARNING_CFLAGS = (
"-Wall",
Expand Down
7 changes: 4 additions & 3 deletions Examples/YouTubeSample/Podfile
@@ -1,12 +1,13 @@
target 'YouTubeSample' do
platform :osx, '10.9'
platform :osx, '10.12'

pod 'GoogleAPIClientForREST/YouTube', :path => '../../'
# In production, you would use:
# pod 'GoogleAPIClientForREST/YouTube'

# Also use GTMAppAuth. See the project wiki, you can use this or Google
# SignIn.
# Also use GTMAppAuth & AppAuth. See the project wiki, you can use this or
# Google SignIn.
pod 'GTMAppAuth'
pod 'AppAuth'

end
Expand Up @@ -335,7 +335,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.9;
MACOSX_DEPLOYMENT_TARGET = 10.12;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
WARNING_CFLAGS = (
Expand Down Expand Up @@ -376,7 +376,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.9;
MACOSX_DEPLOYMENT_TARGET = 10.12;
SDKROOT = macosx;
WARNING_CFLAGS = (
"-Wall",
Expand Down
14 changes: 7 additions & 7 deletions GoogleAPIClientForREST.podspec
Expand Up @@ -12,17 +12,17 @@ Pod::Spec.new do |s|
framework for accessing JSON REST APIs. This is the recommended library
for accessing JSON-based Google APIs for iOS, OS X, and tvOS applications.
This version can be used with iOS ≥ 9.0, OS X ≥ 10.9, tvOS ≥ 9.0, watchOS ≥ 2.0.
This version can be used with iOS ≥ 9.0, OS X ≥ 10.9, tvOS ≥ 10.0, watchOS ≥ 6.0.
DESC

s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.9'
s.tvos.deployment_target = '9.0'
s.watchos.deployment_target = '2.0'
s.osx.deployment_target = '10.12'
s.tvos.deployment_target = '10.0'
s.watchos.deployment_target = '6.0'

# Require at least 1.1.7 of the SessionFetcher for some changes in that
# project's headers.
s.dependency 'GTMSessionFetcher', '>= 1.1.7'
# Require at least 1.6.1 of the SessionFetcher since it has the same
# deployment targets.
s.dependency 'GTMSessionFetcher', '>= 1.6.1'

s.subspec 'Core' do |sp|
sp.source_files = 'Source/GTLRDefines.h',
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -10,7 +10,7 @@ framework for accessing JSON APIs.

This is the recommended library for accessing JSON-based Google APIs for iOS and
Mac OS X applications. The library is compatible with applications built for
iOS 7 and later, and Mac OS X 10.9 and later.
iOS 9 and later, and Mac OS X 10.12 and later.

**To get started** with Google APIs and the Objective-C client library, Read the
[wiki](https://github.com/google/google-api-objectivec-client-for-rest/wiki).
Expand Down
24 changes: 12 additions & 12 deletions Source/GTLRCore.xcodeproj/project.pbxproj
Expand Up @@ -1621,7 +1621,7 @@
GCC_WARN_UNUSED_LABEL = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MACOSX_DEPLOYMENT_TARGET = 10.9;
MACOSX_DEPLOYMENT_TARGET = 10.12;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "-DDEBUG=1";
SDKROOT = macosx;
Expand Down Expand Up @@ -1705,7 +1705,7 @@
GCC_WARN_UNUSED_LABEL = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MACOSX_DEPLOYMENT_TARGET = 10.9;
MACOSX_DEPLOYMENT_TARGET = 10.12;
SDKROOT = macosx;
WARNING_CFLAGS = (
"-Wall",
Expand Down Expand Up @@ -1735,7 +1735,7 @@
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = "Resources/GTLRUnitTests-Info.plist";
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.12;
PRODUCT_BUNDLE_IDENTIFIER = com.google.GTLRUnitTests;
PRODUCT_NAME = GTLROSXUnitTests;
RUN_CLANG_STATIC_ANALYZER = YES;
Expand All @@ -1748,7 +1748,7 @@
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = "Resources/GTLRUnitTests-Info.plist";
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.12;
PRODUCT_BUNDLE_IDENTIFIER = com.google.GTLRUnitTests;
PRODUCT_NAME = GTLROSXUnitTests;
RUN_CLANG_STATIC_ANALYZER = YES;
Expand All @@ -1760,7 +1760,7 @@
isa = XCBuildConfiguration;
buildSettings = {
INFOPLIST_FILE = "Resources/DevTestTool-Info.plist";
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.12;
PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.DevelopmentTestApplication;
PRODUCT_NAME = OSXDevTool;
};
Expand All @@ -1770,7 +1770,7 @@
isa = XCBuildConfiguration;
buildSettings = {
INFOPLIST_FILE = "Resources/DevTestTool-Info.plist";
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.12;
PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.DevelopmentTestApplication;
PRODUCT_NAME = OSXDevTool;
};
Expand Down Expand Up @@ -1884,7 +1884,7 @@
SKIP_INSTALL = YES;
STRIP_STYLE = "non-global";
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0;
TVOS_DEPLOYMENT_TARGET = 10.0;
};
name = Debug;
};
Expand All @@ -1902,7 +1902,7 @@
SKIP_INSTALL = YES;
STRIP_STYLE = "non-global";
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0;
TVOS_DEPLOYMENT_TARGET = 10.0;
};
name = Release;
};
Expand All @@ -1914,7 +1914,7 @@
PRODUCT_NAME = GTLRtvOSUnitTests;
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = appletvos;
TVOS_DEPLOYMENT_TARGET = 9.0;
TVOS_DEPLOYMENT_TARGET = 10.0;
};
name = Debug;
};
Expand All @@ -1926,7 +1926,7 @@
PRODUCT_NAME = GTLRtvOSUnitTests;
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = appletvos;
TVOS_DEPLOYMENT_TARGET = 9.0;
TVOS_DEPLOYMENT_TARGET = 10.0;
};
name = Release;
};
Expand All @@ -1944,7 +1944,7 @@
SKIP_INSTALL = YES;
STRIP_STYLE = "non-global";
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.0;
WATCHOS_DEPLOYMENT_TARGET = 6.0;
};
name = Debug;
};
Expand All @@ -1962,7 +1962,7 @@
SKIP_INSTALL = YES;
STRIP_STYLE = "non-global";
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.0;
WATCHOS_DEPLOYMENT_TARGET = 6.0;
};
name = Release;
};
Expand Down
Expand Up @@ -412,7 +412,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_LABEL = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.12;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"-Wformat",
Expand Down Expand Up @@ -469,7 +469,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_LABEL = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.12;
OTHER_CFLAGS = (
"-Wformat",
"-Wall",
Expand Down
8 changes: 4 additions & 4 deletions Tests/PodTests.xcodeproj/project.pbxproj
Expand Up @@ -401,7 +401,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0;
TVOS_DEPLOYMENT_TARGET = 10.0;
};
name = Debug;
};
Expand All @@ -416,15 +416,15 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0;
TVOS_DEPLOYMENT_TARGET = 10.0;
};
name = Release;
};
2D27198C1ED8BC5000B5D42A /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "-";
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.12;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
};
Expand All @@ -434,7 +434,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "-";
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.12;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
};
Expand Down
4 changes: 2 additions & 2 deletions Tests/pod_integration_tests.sh
Expand Up @@ -31,12 +31,12 @@ case "${PLATFORM}" in
;;
osx)
TARGET_NAME=macOSPodTests
DEPLOYMENT_TARGET=10.9
DEPLOYMENT_TARGET=10.12
SDK=macosx
;;
tvos)
TARGET_NAME=tvOSPodTests
DEPLOYMENT_TARGET=9.0
DEPLOYMENT_TARGET=10.0
SDK=appletvsimulator
;;
*)
Expand Down

0 comments on commit e8e7844

Please sign in to comment.