Skip to content

Commit

Permalink
Merge branch 'release-1.7.11'
Browse files Browse the repository at this point in the history
  • Loading branch information
odrobnik committed Sep 26, 2016
2 parents 2542388 + dfaf913 commit 2c573ba
Show file tree
Hide file tree
Showing 18 changed files with 32 additions and 35 deletions.
2 changes: 2 additions & 0 deletions Core/DTFoundation.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

#pragma mark - Universal

#import "DTCompatibility.h"

// Constants
#import "DTFoundationConstants.h"

Expand Down
15 changes: 2 additions & 13 deletions Core/Source/DTHTMLParser/DTHTMLParser.h
Original file line number Diff line number Diff line change
Expand Up @@ -139,20 +139,9 @@
- (void)abortParsing;

/**
Sets the receiver’s delegate.
@param delegate An object that is the new delegate. It is not retained. The delegate must conform to the DTHTMLParserDelegate Protocol protocol.
@see delegate
*/
- (void)setDelegate:(id <DTHTMLParserDelegate>)delegate;

/**
Returns the receiver’s delegate.
@see delegate
The receiver’s delegate. It is not retained. The delegate must conform to the DTHTMLParserDelegate Protocol protocol.
*/
- (id <DTHTMLParserDelegate>)delegate;
@property (nonatomic, DT_WEAK_PROPERTY) id <DTHTMLParserDelegate> delegate;

/**
Returns the column number of the XML document being processed by the receiver.
Expand Down
2 changes: 1 addition & 1 deletion Core/Source/Runtime/NSObject+DTRuntime.m
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ + (BOOL)addInstanceMethodWithSelectorName:(NSString *)selectorName block:(void(^
#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_7
void *impBlockForIMP = (void *)objc_unretainedPointer(block);
#else
id impBlockForIMP = (__bridge id)objc_unretainedPointer(block);
id impBlockForIMP = (__bridge id)(__bridge void *)(block);
#endif

IMP myIMP = imp_implementationWithBlock(impBlockForIMP);
Expand Down
13 changes: 8 additions & 5 deletions DTFoundation.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'DTFoundation'
spec.version = '1.7.10'
spec.version = '1.7.11'
spec.summary = "Standard toolset classes and categories."
spec.homepage = "https://github.com/Cocoanetics/DTFoundation"
spec.author = { "Oliver Drobnik" => "[email protected]" }
Expand All @@ -22,10 +22,11 @@ Pod::Spec.new do |spec|
end

spec.subspec 'UIKit' do |ss|
ss.platform = :ios, '4.3'
ss.ios.deployment_target = '4.3'
ss.tvos.deployment_target = '9.0'
ss.dependency 'DTFoundation/Core'
ss.ios.frameworks = 'QuartzCore'
ss.ios.source_files = 'Core/Source/iOS/*.{h,m}'
ss.frameworks = 'QuartzCore'
ss.source_files = 'Core/Source/iOS/*.{h,m}'
end

spec.subspec 'UIKit_BlocksAdditions' do |ss|
Expand All @@ -42,7 +43,8 @@ Pod::Spec.new do |spec|

spec.subspec 'DTAnimatedGIF' do |ss|
ss.ios.deployment_target = '4.3'
ss.ios.frameworks = 'ImageIO'
ss.tvos.deployment_target = '9.0'
ss.frameworks = 'ImageIO'
ss.source_files = 'Core/Source/iOS/DTAnimatedGIF/*.{h,m}'
end

Expand All @@ -62,6 +64,7 @@ Pod::Spec.new do |spec|

spec.subspec 'DTHTMLParser' do |ss|
ss.ios.deployment_target = '4.3'
ss.tvos.deployment_target = '9.0'
ss.osx.deployment_target = '10.6'
ss.dependency 'DTFoundation/Core'
ss.source_files = 'Core/Source/DTHTMLParser/*.{h,m}'
Expand Down
6 changes: 2 additions & 4 deletions DTFoundation.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@
A73B6FA716318EBC002CCCA7 /* NSString+DTFormatNumbers.m in Sources */ = {isa = PBXBuildFile; fileRef = A70B4CCB1486621B00873A4A /* NSString+DTFormatNumbers.m */; };
A73C6D251CB55B710058920A /* NSStringDTURLEncodingTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A73C6D241CB55B710058920A /* NSStringDTURLEncodingTest.m */; };
A73D5BAE155271FD0024BDB7 /* NSArray+DTError.m in Sources */ = {isa = PBXBuildFile; fileRef = A73D5BAA155271FD0024BDB7 /* NSArray+DTError.m */; };
A741709E1CEA10E600F15DA9 /* DTCompatibility.h in Headers */ = {isa = PBXBuildFile; fileRef = A74549681B6A3F26004B0CA7 /* DTCompatibility.h */; settings = {ATTRIBUTES = (Public, ); }; };
A7437DE216147A450091C1A2 /* NSString+DTPaths.m in Sources */ = {isa = PBXBuildFile; fileRef = A7D8628014EBF65C001436AF /* NSString+DTPaths.m */; };
A7444D2C162C011C00DD3692 /* NSArray+DTError.m in Sources */ = {isa = PBXBuildFile; fileRef = A73D5BAA155271FD0024BDB7 /* NSArray+DTError.m */; };
A74988811B6EA91C00A66234 /* DTProgressHUD.h in Headers */ = {isa = PBXBuildFile; fileRef = F88FF6831920A9DF00120808 /* DTProgressHUD.h */; settings = {ATTRIBUTES = (Public, ); }; };
Expand Down Expand Up @@ -379,9 +380,7 @@
A7B505351B6A594F00BC743A /* DTCompatibility.h in Headers */ = {isa = PBXBuildFile; fileRef = A74549681B6A3F26004B0CA7 /* DTCompatibility.h */; settings = {ATTRIBUTES = (Public, ); }; };
A7B505361B6A595700BC743A /* DTCompatibility.h in Headers */ = {isa = PBXBuildFile; fileRef = A74549681B6A3F26004B0CA7 /* DTCompatibility.h */; settings = {ATTRIBUTES = (Public, ); }; };
A7BDB4221C64D6FE00E8CD84 /* DTProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = F88FF6841920A9DF00120808 /* DTProgressHUD.m */; };
A7BDB4231C64D70000E8CD84 /* DTProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = F88FF6841920A9DF00120808 /* DTProgressHUD.m */; };
A7BDB4241C64D71900E8CD84 /* DTProgressHUDWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = F88FF6D11920BF5200120808 /* DTProgressHUDWindow.m */; };
A7BDB4251C64D71A00E8CD84 /* DTProgressHUDWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = F88FF6D11920BF5200120808 /* DTProgressHUDWindow.m */; };
A7C92B5D174F6A1A0019D70A /* toolbar-icon-menu.png in Resources */ = {isa = PBXBuildFile; fileRef = A7C92B5B174F6A1A0019D70A /* toolbar-icon-menu.png */; };
A7C92B5E174F6A1A0019D70A /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = A7C92B5C174F6A1A0019D70A /* [email protected] */; };
A7C92B63174F72C30019D70A /* ModalPanelViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A7C92B61174F72C30019D70A /* ModalPanelViewController.m */; };
Expand Down Expand Up @@ -2519,6 +2518,7 @@
buildActionMask = 2147483647;
files = (
A7D95AE01BC40DAB00AB8A21 /* DTASN1Parser.h in Headers */,
A741709E1CEA10E600F15DA9 /* DTCompatibility.h in Headers */,
A7EA07941A2B232500B61CCE /* DTExtendedFileAttributes.h in Headers */,
A7E7997A1AB9AFA9008C2393 /* DTFoundation.h in Headers */,
A7EA07591A2B220100B61CCE /* DTScrollView.h in Headers */,
Expand Down Expand Up @@ -3360,7 +3360,6 @@
384470F11BA33ED80037C68D /* NSFileWrapper+DTCopying.m in Sources */,
384470F21BA33ED80037C68D /* NSArray+DTError.m in Sources */,
384470F31BA33ED80037C68D /* DTFoundationConstants.m in Sources */,
A7BDB4251C64D71A00E8CD84 /* DTProgressHUDWindow.m in Sources */,
384470F41BA33ED80037C68D /* NSURL+DTUnshorten.m in Sources */,
384470F51BA33ED80037C68D /* DTCustomColoredAccessory.m in Sources */,
384470F61BA33ED80037C68D /* DTTiledLayerWithoutFade.m in Sources */,
Expand Down Expand Up @@ -3401,7 +3400,6 @@
384471161BA33ED80037C68D /* NSString+DTPaths.m in Sources */,
A7D95AD91BC40DAB00AB8A21 /* DTASN1BitString.m in Sources */,
384471171BA33ED80037C68D /* DTCoreGraphicsUtils.m in Sources */,
A7BDB4231C64D70000E8CD84 /* DTProgressHUD.m in Sources */,
384471181BA33ED80037C68D /* UIColor+DTDebug.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
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 = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
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 = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
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 = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
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 = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
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 = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
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 = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
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 = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
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 = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
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 = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
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 = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
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 = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
5 changes: 5 additions & 0 deletions Documentation/Change Log-template.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ Change Log

This is the history of version updates.

**Version 1.7.11**

- FIXED: Xcode 8 build error in Runtime
- ADDED: tvOS Subspec

**Version 1.7.10**

- FIXED: stringByURLEncoding returned incorrect strings with iOS 9 SDK
Expand Down
2 changes: 1 addition & 1 deletion readme.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Methods, categories and functions are grouped into Subspecs. The grouping determ
- **DTSQLite:** Objective-C wrapper for SQLite
- **DTUTI:** UTI methods
- **DTZipArchive:** Handing of Pkzip and GZip files
- **DTProgressHUD:** Displaying informations or progress (in the middle fo the screen)
- **DTProgressHUD:** Displaying informations or progress (in the middle of the screen)

License
-------
Expand Down

0 comments on commit 2c573ba

Please sign in to comment.