Skip to content

Commit

Permalink
Merge branch 'release-1.7.19'
Browse files Browse the repository at this point in the history
  • Loading branch information
@odrobnik
odrobnik committed Sep 10, 2024
2 parents badc485 + 01d7ddb commit a75f24e
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 63 deletions.
72 changes: 36 additions & 36 deletions DTFoundation.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,105 +8,105 @@ Pod::Spec.new do |spec|
spec.social_media_url = 'https://twitter.com/cocoanetics'
spec.source = { :git => "https://github.com/Cocoanetics/DTFoundation.git", :tag => spec.version.to_s }

spec.ios.deployment_target = '9.0'
spec.tvos.deployment_target = '9.0'
spec.osx.deployment_target = '10.8'
spec.ios.deployment_target = '11.0'
spec.tvos.deployment_target = '12.0'
spec.osx.deployment_target = '10.13'
spec.license = 'BSD'
spec.requires_arc = true

spec.subspec 'Core' do |ss|
ss.ios.deployment_target = '4.3'
ss.tvos.deployment_target = '9.0'
ss.osx.deployment_target = '10.8'
ss.ios.deployment_target = '11.0'
ss.tvos.deployment_target = '12.0'
ss.osx.deployment_target = '10.13'
ss.source_files = 'Core/Source/*.{h,m}'
end

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

spec.subspec 'UIKit_BlocksAdditions' do |ss|
ss.platform = :ios, '4.3'
ss.platform = :ios, '11.0'
ss.dependency 'DTFoundation/Core'
ss.ios.source_files = 'Core/Source/iOS/BlocksAdditions/*.{h,m}'
end

spec.subspec 'AppKit' do |ss|
ss.platform = :osx, '10.8'
ss.platform = :osx, '10.13'
ss.dependency 'DTFoundation/Core'
ss.osx.source_files = 'Core/Source/OSX/*.{h,m}'
end

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

spec.subspec 'DTAWS' do |ss|
ss.ios.deployment_target = '4.3'
ss.osx.deployment_target = '10.8'
ss.ios.deployment_target = '11.0'
ss.osx.deployment_target = '10.13'
ss.dependency 'DTFoundation/Core'
ss.source_files = 'Core/Source/DTAWS/*.{h,m}'
end

spec.subspec 'DTASN1' do |ss|
ss.ios.deployment_target = '4.3'
ss.tvos.deployment_target = '9.0'
ss.osx.deployment_target = '10.8'
ss.ios.deployment_target = '11.0'
ss.tvos.deployment_target = '12.0'
ss.osx.deployment_target = '10.13'
ss.dependency 'DTFoundation/Core'
ss.source_files = 'Core/Source/DTASN1/*.{h,m}'
end

spec.subspec 'DTHTMLParser' do |ss|
ss.ios.deployment_target = '4.3'
ss.tvos.deployment_target = '9.0'
ss.osx.deployment_target = '10.8'
ss.ios.deployment_target = '11.0'
ss.tvos.deployment_target = '12.0'
ss.osx.deployment_target = '10.13'
ss.dependency 'DTFoundation/Core'
ss.source_files = 'Core/Source/DTHTMLParser/*.{h,m}'
ss.library = 'xml2'
ss.xcconfig = { 'HEADER_SEARCH_PATHS' => '"$(SDKROOT)/usr/include/libxml2"' }
end

spec.subspec 'DTReachability' do |ss|
ss.ios.deployment_target = '4.3'
ss.osx.deployment_target = '10.8'
ss.ios.deployment_target = '11.0'
ss.osx.deployment_target = '10.13'
ss.framework = 'SystemConfiguration'
ss.source_files = 'Core/Source/DTReachability/*.{h,m}'
ss.dependency 'DTFoundation/Core'
end

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

spec.subspec 'DTSQLite' do |ss|
ss.ios.deployment_target = '4.3'
ss.osx.deployment_target = '10.8'
ss.ios.deployment_target = '11.0'
ss.osx.deployment_target = '10.13'
ss.library = 'sqlite3'
ss.source_files = 'Core/Source/DTSQLite/*.{h,m}'
ss.private_header_files = 'Core/Source/DTSQLite/DTSQLiteFunctions.h'
ss.dependency 'DTFoundation/Core'
end

spec.subspec 'DTUTI' do |ss|
ss.ios.deployment_target = '4.3'
ss.osx.deployment_target = '10.8'
ss.ios.deployment_target = '11.0'
ss.osx.deployment_target = '10.13'
ss.ios.frameworks = ['MobileCoreServices']
ss.source_files = 'Core/Source/DTUTI/*.{h,m}'
end

spec.subspec 'DTZipArchive' do |ss|
ss.ios.deployment_target = '4.3'
ss.ios.deployment_target = '11.0'
ss.source_files = 'Core/Source/DTZipArchive/*.{h,m}'
ss.library = 'z'

Expand All @@ -119,7 +119,7 @@ Pod::Spec.new do |spec|
end

spec.subspec 'DTProgressHUD' do |ss|
ss.platform = :ios, '6.0'
ss.platform = :ios, '11.0'
ss.dependency 'DTFoundation/UIKit'
ss.dependency 'DTFoundation/Core'
ss.ios.frameworks = 'QuartzCore'
Expand All @@ -128,29 +128,29 @@ Pod::Spec.new do |spec|


spec.subspec 'DTScripting' do |ss|
ss.ios.deployment_target = '4.3'
ss.osx.deployment_target = '10.8'
ss.ios.deployment_target = '11.0'
ss.osx.deployment_target = '10.13'
ss.dependency 'DTFoundation/Core'
ss.source_files = 'Core/Source/DTScripting/*.{h,m}'
end

spec.subspec 'DTAsyncFileDeleter' do |ss|
ss.ios.deployment_target = '4.3'
ss.osx.deployment_target = '10.8'
ss.ios.deployment_target = '11.0'
ss.osx.deployment_target = '10.13'
ss.dependency 'DTFoundation/Core'
ss.source_files = 'Core/Source/DTAsyncFileDeleter/*.{h,m}'
end

spec.subspec 'Debug' do |ss|
ss.platform = :ios, '4.3'
ss.platform = :ios, '11.0'
ss.dependency 'DTFoundation/Runtime'
ss.dependency 'DTFoundation/Core'
ss.source_files = 'Core/Source/iOS/Debug/*.{h,m}'
end

spec.subspec 'Runtime' do |ss|
ss.ios.deployment_target = '4.3'
ss.osx.deployment_target = '10.8'
ss.ios.deployment_target = '11.0'
ss.osx.deployment_target = '10.13'
ss.source_files = 'Core/Source/Runtime/*.{h,m}'
end

Expand Down
16 changes: 8 additions & 8 deletions DTFoundation.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 52;
objectVersion = 54;
objects = {

/* Begin PBXAggregateTarget section */
Expand Down Expand Up @@ -3052,7 +3052,7 @@
isa = PBXProject;
attributes = {
LastTestingUpgradeCheck = 0510;
LastUpgradeCheck = 1240;
LastUpgradeCheck = 1300;
ORGANIZATIONNAME = Cocoanetics;
TargetAttributes = {
A78381C21963F8D700AF09D3 = {
Expand Down Expand Up @@ -4134,7 +4134,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1.7.18;
CURRENT_PROJECT_VERSION = 1.7.19;
ENABLE_BITCODE = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
Expand Down Expand Up @@ -5279,7 +5279,7 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
Expand Down Expand Up @@ -5322,7 +5322,7 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
Expand Down Expand Up @@ -5367,7 +5367,7 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
Expand Down Expand Up @@ -5428,7 +5428,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1.7.18;
CURRENT_PROJECT_VERSION = 1.7.19;
ENABLE_BITCODE = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
Expand Down Expand Up @@ -5488,7 +5488,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 1.7.18;
CURRENT_PROJECT_VERSION = 1.7.19;
ENABLE_BITCODE = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
Expand Down
37 changes: 18 additions & 19 deletions Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,25 +34,24 @@ let package = Package(
dependencies: ["DTFoundation"],
path: "Test",
exclude: ["UnitTests-Info.plist", "UnitTests-Prefix.pch"],
resources: [.copy("SelfSigned.der"),
.copy("Resources/zipContent/Franz.txt"),
.copy("Resources/zipContent/Oliver.txt"),
.copy("Resources/zipContent/Stefan.txt"),
.copy("Resources/gzip_sample.txt.original"),
.copy("Resources/gzip_sample.txt-z"),
.copy("Resources/zipContent/Rene"),
.copy("Resources/gzip_sample.txt.gz"),
.copy("Resources/gzip_sample_invalid.gz"),
.copy("Resources/gzip_sample.txt.foo"),
.copy("Resources/processing_instruction.html"),
.copy("Resources/gzip_sample.txt-gz"),
.copy("Resources/html_doctype.html"),
.copy("Resources/DictionarySample.plist"),
.copy("Resources/ArraySample.plist"),
.copy("Resources/screenshot.png.dat"),
.copy("Resources/sample.zip"),
.copy("Resources/SelfSigned.der")
],
resources: [.copy("Resources/zipContent/Franz.txt"),
.copy("Resources/zipContent/Oliver.txt"),
.copy("Resources/zipContent/Stefan.txt"),
.copy("Resources/gzip_sample.txt.original"),
.copy("Resources/gzip_sample.txt-z"),
.copy("Resources/zipContent/Rene"),
.copy("Resources/gzip_sample.txt.gz"),
.copy("Resources/gzip_sample_invalid.gz"),
.copy("Resources/gzip_sample.txt.foo"),
.copy("Resources/processing_instruction.html"),
.copy("Resources/gzip_sample.txt-gz"),
.copy("Resources/html_doctype.html"),
.copy("Resources/DictionarySample.plist"),
.copy("Resources/ArraySample.plist"),
.copy("Resources/screenshot.png.dat"),
.copy("Resources/sample.zip"),
.copy("Resources/SelfSigned.der")
],
cSettings: [
.headerSearchPath("include"),
]
Expand Down

0 comments on commit a75f24e

Please sign in to comment.