Skip to content

Commit

Permalink
Merge pull request #361 from adamsousa/xcode-14.3
Browse files Browse the repository at this point in the history
Updated ios min deployment target to 11 for xcode 14.3 support.
  • Loading branch information
Liquidsoul authored Mar 7, 2024
2 parents 1543f53 + c167c67 commit c582400
Show file tree
Hide file tree
Showing 15 changed files with 47 additions and 42 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

## Master

* Set minimum iOS deployment version to 11.0 to fix [Xcode 14.3 compilation issue #358](https://github.com/AliSoftware/OHHTTPStubs/issues/358)
[@adamsousa](https://github.com/adamsousa)

## [9.1.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/9.1.0)

* Added `hasFormBody(_:)` matcher.
[@417-72KI](https://github.com/417-72KI)
* Added fix for Xcode 12 - Warnings related to iOS 8 support (Swift Package Manager) #328
Expand Down
4 changes: 2 additions & 2 deletions Examples/ObjC/OHHTTPStubsDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@
GCC_WARN_UNKNOWN_PRAGMAS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos;
Expand Down Expand Up @@ -332,7 +332,7 @@
GCC_WARN_UNKNOWN_PRAGMAS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos;
Expand Down
2 changes: 1 addition & 1 deletion Examples/ObjC/Podfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://github.com/CocoaPods/Specs.git'

project 'OHHTTPStubsDemo.xcodeproj'
platform :ios, '8.0'
platform :ios, '11.0'

target 'OHHTTPStubsDemo' do
pod 'OHHTTPStubs', :path => '../..'
Expand Down
4 changes: 2 additions & 2 deletions Examples/ObjC/Pods/Local Podspecs/OHHTTPStubs.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Examples/ObjC/Pods/Pods.xcodeproj/project.pbxproj

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Examples/Swift/OHHTTPStubsDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.alisoftware.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -369,7 +369,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.alisoftware.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
2 changes: 1 addition & 1 deletion Examples/Swift/Podfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://github.com/CocoaPods/Specs.git'

project 'OHHTTPStubsDemo.xcodeproj'
platform :ios, '8.0'
platform :ios, '11.0'
use_frameworks!

target 'OHHTTPStubsDemo' do
Expand Down
4 changes: 2 additions & 2 deletions Examples/Swift/Pods/Local Podspecs/OHHTTPStubs.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Examples/Swift/Pods/Pods.xcodeproj/project.pbxproj

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions OHHTTPStubs.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Pod::Spec.new do |s|
s.frameworks = 'Foundation', 'CFNetwork'

s.requires_arc = true
s.ios.deployment_target = '8.0'
s.ios.deployment_target = '11.0'
s.osx.deployment_target = '10.9'
s.watchos.deployment_target = '2.0'
s.tvos.deployment_target = '9.0'
Expand Down Expand Up @@ -76,7 +76,7 @@ Pod::Spec.new do |s|
end

s.subspec 'Swift' do |swift|
swift.ios.deployment_target = '8.0'
swift.ios.deployment_target = '11.0'
swift.osx.deployment_target = '10.9'
swift.watchos.deployment_target = '2.0'
swift.tvos.deployment_target = '9.0'
Expand Down
12 changes: 6 additions & 6 deletions OHHTTPStubs.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1206,7 +1206,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MACOSX_DEPLOYMENT_TARGET = 10.9;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -1261,7 +1261,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MACOSX_DEPLOYMENT_TARGET = 10.9;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
Expand All @@ -1277,7 +1277,7 @@
isa = XCBuildConfiguration;
buildSettings = {
DSTROOT = /tmp/OHHTTPStubs.dst;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = OHHTTPStubs;
SKIP_INSTALL = YES;
Expand All @@ -1288,7 +1288,7 @@
isa = XCBuildConfiguration;
buildSettings = {
DSTROOT = /tmp/OHHTTPStubs.dst;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = OHHTTPStubs;
SKIP_INSTALL = YES;
Expand All @@ -1306,7 +1306,7 @@
"OHHTTPSTUBS_USE_STATIC_LIBRARY=1",
);
INFOPLIST_FILE = "Tests/Supporting Files/UnitTests-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -1329,7 +1329,7 @@
"OHHTTPSTUBS_USE_STATIC_LIBRARY=1",
);
INFOPLIST_FILE = "Tests/Supporting Files/UnitTests-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down
2 changes: 1 addition & 1 deletion [email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import PackageDescription
let package = Package(
name: "OHHTTPStubs",
platforms: [
.macOS(.v10_10), .iOS(.v9), .watchOS(.v2), .tvOS(.v9)
.macOS(.v10_10), .iOS(.v11), .watchOS(.v2), .tvOS(.v9)
],
products: [
.library(
Expand Down
4 changes: 2 additions & 2 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ abstract_target 'TestingPods' do
pod 'AFNetworking', '~> 3.0'

target 'OHHTTPStubs iOS Lib Tests' do
platform :ios, '8.0'
platform :ios, '11.0'
end

target 'OHHTTPStubs iOS Fmk Tests' do
platform :ios, '8.0'
platform :ios, '11.0'
end

target 'OHHTTPStubs Mac Tests' do
Expand Down
2 changes: 1 addition & 1 deletion Pods/AFNetworking/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions Pods/Pods.xcodeproj/project.pbxproj

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c582400

Please sign in to comment.