Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update tooling (Ruby, Pods, Deployment Targets) #368

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.2.2
27 changes: 18 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,33 @@
## 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)
[@adamsousa](https://github.com/adamsousa)
* OHHTTPStubs frameworks: Put Headers phase before Sources phase.
[@byohay](https://github.com/byohay)
[#350](https://github.com/AliSoftware/OHHTTPStubs/pull/350)
* Export OHHTTPStubs from OHHTTPStubsSwift so that SwiftPM users don't need to import both of them.
[@manicmaniac](https://github.com/manicmaniac)
[#353](https://github.com/AliSoftware/OHHTTPStubs/pull/353)
* Update minimum deployment versions (iOS: 12.0, osx: 10.13, tvos: 12.0, watchos: 4.0).
[@AliSoftware](https://github.com/AliSoftware)
[#368](https://github.com/AliSoftware/OHHTTPStubs/pull/368)
* [Internal] Remove deprecated `NSURLSession` code from Unit Tests and Example projects.
[@AliSoftware](https://github.com/AliSoftware)
[#368](https://github.com/AliSoftware/OHHTTPStubs/pull/368)

## [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
[@kikeenrique](https://github.com/kikeenrique)
* OHHTPStubs frameworks: Put Headers phase before Sources phase.
[@byohay](https://github.com/byohay)
* Export OHHTTPStubs from OHHTTPStubsSwift so that SwiftPM users don't need to import both of them #353 [@manicmaniac](https://github.com/manicmaniac)
[@417-72KI](https://github.com/417-72KI)
* Added fix for Xcode 12 - Warnings related to iOS 8 support (Swift Package Manager).
[@kikeenrique](https://github.com/kikeenrique)
[#328](https://github.com/AliSoftware/OHHTTPStubs/pull/328)

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

* Added support for Swift Package Manager and dropped OH from all class names.
* Added support for Swift Package Manager and dropped OH from all class names.
[@jeffctown](https://github.com/jeffctown)


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

* Update default Swift Version to 5.0
Expand Down
28 changes: 13 additions & 15 deletions Examples/ObjC/MainViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@ - (IBAction)downloadText:(UIButton*)sender
NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:urlString]];

// This is a very handy way to send an asynchronous method, but only available in iOS5+
[NSURLConnection sendAsynchronousRequest:req
queue:[NSOperationQueue mainQueue]
completionHandler:^(NSURLResponse* resp, NSData* data, NSError* error)
{
sender.enabled = YES;
NSString* receivedText = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding];
self.textView.text = receivedText;
}];
[[[NSURLSession sharedSession] dataTaskWithRequest:req
completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
dispatch_async(dispatch_get_main_queue(), ^{
sender.enabled = YES;
NSString* receivedText = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding];
self.textView.text = receivedText;
});
}] resume];
}


Expand Down Expand Up @@ -124,15 +124,13 @@ - (IBAction)downloadImage:(UIButton*)sender
NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:urlString]];

// This is a very handy way to send an asynchronous method, but only available in iOS5+
[NSURLConnection sendAsynchronousRequest:req
queue:[NSOperationQueue mainQueue]
completionHandler:^(NSURLResponse* resp, NSData* data, NSError* error)
{
dispatch_async(dispatch_get_main_queue(), ^{
[[[NSURLSession sharedSession] dataTaskWithRequest:req
completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
dispatch_async(dispatch_get_main_queue(), ^{
sender.enabled = YES;
self.imageView.image = [UIImage imageWithData:data];
});
}];
});
}] resume];
}

- (IBAction)installImageStub:(UISwitch *)sender
Expand Down
15 changes: 11 additions & 4 deletions Examples/ObjC/OHHTTPStubsDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -157,7 +157,8 @@
098FBDC615D704E800623941 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1020;
BuildIndependentTargetsInParallel = YES;
LastUpgradeCheck = 1520;
ORGANIZATIONNAME = AliSoftware;
TargetAttributes = {
098FBDCE15D704E800623941 = {
Expand Down Expand Up @@ -249,6 +250,7 @@
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
Expand All @@ -259,6 +261,7 @@
COPY_PHASE_STRIP = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
Expand All @@ -282,7 +285,7 @@
GCC_WARN_UNKNOWN_PRAGMAS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos;
Expand All @@ -307,6 +310,7 @@
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
Expand All @@ -316,6 +320,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
Expand All @@ -332,7 +337,7 @@
GCC_WARN_UNKNOWN_PRAGMAS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos;
Expand All @@ -348,6 +353,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Supporting Files/OHHTTPStubsDemo-Prefix.pch";
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/OHHTTPStubsDemo-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.alisoftware.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
Expand All @@ -362,6 +368,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Supporting Files/OHHTTPStubsDemo-Prefix.pch";
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/OHHTTPStubsDemo-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.alisoftware.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1020"
LastUpgradeVersion = "1520"
version = "2.0">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
4 changes: 2 additions & 2 deletions Examples/ObjC/Podfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://github.com/CocoaPods/Specs.git'
source 'https://cdn.cocoapods.org/'

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

target 'OHHTTPStubsDemo' do
pod 'OHHTTPStubs', :path => '../..'
Expand Down
6 changes: 3 additions & 3 deletions Examples/ObjC/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ EXTERNAL SOURCES:
:path: "../.."

SPEC CHECKSUMS:
OHHTTPStubs: 90eac6d8f2c18317baeca36698523dc67c513831
OHHTTPStubs: 3fbe3cdc36877aa7251488be433b3d03e7253ce4

PODFILE CHECKSUM: 9a67077a86911aa4a252748903da3d5ea5d5d922
PODFILE CHECKSUM: f3ddae302b73d8e6a8b3564b8a9b2d666375dcca

COCOAPODS: 1.9.3
COCOAPODS: 1.15.2
19 changes: 10 additions & 9 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.

6 changes: 3 additions & 3 deletions Examples/ObjC/Pods/Manifest.lock

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

Loading