Update Chengelog

Checkout html5lib-tests submodule

.github/workflows/ci.yml

@@ -0,0 +1,30 @@
+name: HTMLKit CI
+
+on: [push]
+
+jobs:
+  macOS:
+    name: Test macOS 
+    runs-on: macOS-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: macOS
+        run: xcodebuild -workspace "HTMLKit.xcworkspace" -scheme "HTMLKit-macOS" -destination "platform=macOS" -enableCodeCoverage YES clean test | xcpretty
+      - name: code coverage
+        uses: codecov/codecov-action@v1
+  iOS:
+    name: Test iOS 
+    runs-on: macOS-latest
+    env: 
+      DEVELOPER_DIR: /Applications/Xcode_11.5.app/Contents/Developer
+    strategy:
+      matrix:
+        destination: ["OS=13.5,name=iPhone 11 Pro", "OS=12.4,name=iPhone XS", "OS=11.4,name=iPhone X"]
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: iOS - ${{ matrix.destination }}
+        run: xcodebuild -workspace "HTMLKit.xcworkspace" -scheme "HTMLKit-iOS" -destination "${{ matrix.destination }}" clean test | xcpretty

.travis.yml

@@ -1,45 +0,0 @@
-language: objective-c
-osx_image: xcode9
-
-branches:
-  except:
-    - gh-pages
-
-install:
-  - gem install xcpretty
-
-env:
-  global:
-    - LC_CTYPE=en_US.UTF-8
-    - LANG=en_US.UTF-8
-    - WORKSPACE=HTMLKit.xcworkspace
-    - IOS_FRAMEWORK_SCHEME=HTMLKit-iOS
-    - MACOS_FRAMEWORK_SCHEME=HTMLKit-macOS
-    - WATCHOS_FRAMEWORK_SCHEME="HTMLKit-watchOS"
-    - TVOS_FRAMEWORK_SCHEME="HTMLKit-tvOS"
-    - IOS_SDK=iphonesimulator11.0
-    - MACOS_SDK=macosx10.13
-    - WATCHOS_SDK=watchsimulator4.0
-    - TVOS_SDK=appletvsimulator11.0
-  matrix:
-    - DESTINATION="arch=x86_64"                                SCHEME="$MACOS_FRAMEWORK_SCHEME"      SDK="$MACOS_SDK"
-    - DESTINATION="OS=9.3,name=iPhone 6s Plus"                 SCHEME="$IOS_FRAMEWORK_SCHEME"        SDK="$IOS_SDK"
-    - DESTINATION="OS=10.3.1,name=iPhone 7 Plus"               SCHEME="$IOS_FRAMEWORK_SCHEME"        SDK="$IOS_SDK"
-    - DESTINATION="OS=11.0,name=iPhone X"                      SCHEME="$IOS_FRAMEWORK_SCHEME"        SDK="$IOS_SDK"
-    - DESTINATION="OS=3.2,name=Apple Watch Series 2 - 42mm"    SCHEME="$WATCHOS_FRAMEWORK_SCHEME"    SDK="$WATCHOS_SDK"
-    - DESTINATION="OS=4.0,name=Apple Watch Series 3 - 42mm"    SCHEME="$WATCHOS_FRAMEWORK_SCHEME"    SDK="$WATCHOS_SDK"
-    - DESTINATION="OS=10.2,name=Apple TV 1080p"                SCHEME="$TVOS_FRAMEWORK_SCHEME"       SDK="$TVOS_SDK"
-    - DESTINATION="OS=11.0,name=Apple TV 4K"                   SCHEME="$TVOS_FRAMEWORK_SCHEME"       SDK="$TVOS_SDK"
-
-script:
-  - set -o pipefail
-  - xcodebuild -version
-  - xcodebuild -showsdks
-  - travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO clean build | xcpretty -c
-  - if [ "$SDK" != "$WATCHOS_SDK" ]; then
-      travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES test | xcpretty -c;
-    fi
-
-after_success:
-  - bash <(curl -s https://codecov.io/bash)
-

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## [4.0.0](https://github.com/iabudiab/HTMLKit/releases/tag/4.0.0)
+
+Release on 2020.07.16
+
+### Breaking Change
+
+- Swift package version updated to 5.1
+
+
+
 ## [3.1.0](https://github.com/iabudiab/HTMLKit/releases/tag/3.1.0)
 
 Release on 2019.08.20

Example/HTMLKitExample/HTMLKitExample.xcodeproj/project.pbxproj

@@ -89,7 +89,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 1130;
 				ORGANIZATIONNAME = iabudiab;
 				TargetAttributes = {
 					629A63C81D9AFE0E0089679F = {
@@ -100,10 +100,11 @@
 			};
 			buildConfigurationList = 629A63C41D9AFE0E0089679F /* Build configuration list for PBXProject "HTMLKitExample" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 629A63C01D9AFE0E0089679F;
 			productRefGroup = 629A63CA1D9AFE0E0089679F /* Products */;
@@ -131,6 +132,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -140,6 +142,7 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -147,6 +150,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -186,6 +190,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -195,6 +200,7 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -202,6 +208,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -233,6 +240,7 @@
 		629A63D11D9AFE0E0089679F /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "-";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 3.0;
 			};
@@ -241,6 +249,7 @@
 		629A63D21D9AFE0E0089679F /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "-";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 3.0;
 			};

Example/HTMLKitExample/HTMLKitExample.xcodeproj/xcshareddata/xcschemes/HTMLKitExample.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1130"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,10 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -39,14 +36,13 @@
             ReferencedContainer = "container:HTMLKitExample.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
@@ -63,8 +59,6 @@
             ReferencedContainer = "container:HTMLKitExample.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

HTMLKit.xcodeproj/project.pbxproj

@@ -1687,7 +1687,7 @@
 		625A14A319C7829400AD0C32 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 1130;
 				ORGANIZATIONNAME = BrainCookie;
 				TargetAttributes = {
 					625A14C219C7829400AD0C32 = {
@@ -1716,10 +1716,11 @@
 			};
 			buildConfigurationList = 625A14A619C7829400AD0C32 /* Build configuration list for PBXProject "HTMLKit" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 625A14A219C7829400AD0C32;
 			productRefGroup = 625A14AD19C7829400AD0C32 /* Products */;
@@ -2172,6 +2173,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -2180,12 +2182,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -2222,6 +2226,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -2230,12 +2235,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -2281,7 +2288,8 @@
 				INFOPLIST_FILE = "Sources/HTMLKit-Info.plist";
 				INSTALL_PATH = "@rpath";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				PRODUCT_BUNDLE_IDENTIFIER = de.iabudiab.HTMLKit;
+				MARKETING_VERSION = 4.0.0;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.iabudiab.HTMLKit;
 				PRODUCT_NAME = HTMLKit;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -2309,7 +2317,8 @@
 				INFOPLIST_FILE = "Sources/HTMLKit-Info.plist";
 				INSTALL_PATH = "@rpath";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				PRODUCT_BUNDLE_IDENTIFIER = de.iabudiab.HTMLKit;
+				MARKETING_VERSION = 4.0.0;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.iabudiab.HTMLKit;
 				PRODUCT_NAME = HTMLKit;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -2334,7 +2343,7 @@
 				);
 				INFOPLIST_FILE = "Tests/HTMLKitTests/HTMLKitTests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "de.iabudiab.${PRODUCT_NAME:rfc1034identifier}";
+				PRODUCT_BUNDLE_IDENTIFIER = "dev.iabudiab.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUNDLE_LOADER)";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
@@ -2356,7 +2365,7 @@
 				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = "Tests/HTMLKitTests/HTMLKitTests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "de.iabudiab.${PRODUCT_NAME:rfc1034identifier}";
+				PRODUCT_BUNDLE_IDENTIFIER = "dev.iabudiab.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUNDLE_LOADER)";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
@@ -2389,8 +2398,9 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 4.0.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = de.iabudiab.HTMLKit;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.iabudiab.HTMLKit;
 				PRODUCT_MODULE_NAME = HTMLKit;
 				PRODUCT_NAME = HTMLKit;
 				SDKROOT = watchos;
@@ -2427,8 +2437,9 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 4.0.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = de.iabudiab.HTMLKit;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.iabudiab.HTMLKit;
 				PRODUCT_MODULE_NAME = HTMLKit;
 				PRODUCT_NAME = HTMLKit;
 				SDKROOT = watchos;
@@ -2467,8 +2478,9 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 4.0.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = de.iabudiab.HTMLKit;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.iabudiab.HTMLKit;
 				PRODUCT_NAME = HTMLKit;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
@@ -2505,8 +2517,9 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 4.0.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = de.iabudiab.HTMLKit;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.iabudiab.HTMLKit;
 				PRODUCT_NAME = HTMLKit;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
@@ -2531,7 +2544,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "de.iabudiab.HTMLKit-tvOSTests";
+				PRODUCT_BUNDLE_IDENTIFIER = "dev.iabudiab.HTMLKit-tvOSTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
@@ -2551,7 +2564,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = "de.iabudiab.HTMLKit-tvOSTests";
+				PRODUCT_BUNDLE_IDENTIFIER = "dev.iabudiab.HTMLKit-tvOSTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
@@ -2586,8 +2599,9 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 4.0.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = de.iabudiab.HTMLKit;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.iabudiab.HTMLKit;
 				PRODUCT_NAME = HTMLKit;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
@@ -2625,8 +2639,9 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 4.0.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = de.iabudiab.HTMLKit;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.iabudiab.HTMLKit;
 				PRODUCT_NAME = HTMLKit;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
@@ -2651,7 +2666,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "de.iabudiab.HTMLKit-iOSTests";
+				PRODUCT_BUNDLE_IDENTIFIER = "dev.iabudiab.HTMLKit-iOSTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
@@ -2671,7 +2686,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = "de.iabudiab.HTMLKit-iOSTests";
+				PRODUCT_BUNDLE_IDENTIFIER = "dev.iabudiab.HTMLKit-iOSTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				TVOS_DEPLOYMENT_TARGET = 9.0;

HTMLKit.xcodeproj/xcshareddata/xcschemes/HTMLKit-iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1130"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,9 +26,17 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "62ECBF4C1C0B6C7600AF847B"
+            BuildableName = "HTMLKit.framework"
+            BlueprintName = "HTMLKit-iOS"
+            ReferencedContainer = "container:HTMLKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -55,23 +63,11 @@
             </SkippedTests>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "62ECBF4C1C0B6C7600AF847B"
-            BuildableName = "HTMLKit.framework"
-            BlueprintName = "HTMLKit-iOS"
-            ReferencedContainer = "container:HTMLKit.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
@@ -87,8 +83,6 @@
             ReferencedContainer = "container:HTMLKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

HTMLKit.xcodeproj/xcshareddata/xcschemes/HTMLKit-macOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1130"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,9 +26,17 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "625A14AB19C7829400AD0C32"
+            BuildableName = "HTMLKit.framework"
+            BlueprintName = "HTMLKit-macOS"
+            ReferencedContainer = "container:HTMLKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -55,23 +63,11 @@
             </SkippedTests>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "625A14AB19C7829400AD0C32"
-            BuildableName = "HTMLKit.framework"
-            BlueprintName = "HTMLKit-macOS"
-            ReferencedContainer = "container:HTMLKit.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
@@ -87,8 +83,6 @@
             ReferencedContainer = "container:HTMLKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

HTMLKit.xcodeproj/xcshareddata/xcschemes/HTMLKit-tvOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1130"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,9 +26,17 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "62857CE91D39A262008DC254"
+            BuildableName = "HTMLKit.framework"
+            BlueprintName = "HTMLKit-tvOS"
+            ReferencedContainer = "container:HTMLKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -49,23 +57,11 @@
             </SkippedTests>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "62857CE91D39A262008DC254"
-            BuildableName = "HTMLKit.framework"
-            BlueprintName = "HTMLKit-tvOS"
-            ReferencedContainer = "container:HTMLKit.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
@@ -81,8 +77,6 @@
             ReferencedContainer = "container:HTMLKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

HTMLKit.xcodeproj/xcshareddata/xcschemes/HTMLKit-watchOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1130"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,19 +26,15 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
@@ -54,8 +50,6 @@
             ReferencedContainer = "container:HTMLKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Iskandar Abudiab
+Copyright (c) 2014-2020 Iskandar Abudiab
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Package.swift

@@ -1,6 +1,9 @@
+// swift-tools-version:5.1
 import PackageDescription
 
 let package = Package(
 	name: "HTMLKit",
-	exclude: ["Tests/Fixtures", "Tests/css-tests", "Tests/html5lib-tests"]
+	products: [.library(name: "HTMLKit", targets: ["HTMLKit"])],
+	targets: [.target(name: "HTMLKit", dependencies: [], path: "Sources")],
+	swiftLanguageVersions: [.v5]
 )

README.md

@@ -77,7 +77,7 @@ To add `HTMLKit` as a dependency into your project using CocoaPods just add the
 
 ```ruby
 target 'MyTarget' do
-  pod 'HTMLKit', '~> 3.1'
+  pod 'HTMLKit', '~> 4.0'
 end
 ```
 
@@ -94,7 +94,7 @@ $ pod install
 Add `HTMLKit` to your `Package.swift` dependecies:
 
 ```swift
-.Package(url: "https://github.com/iabudiab/HTMLKit", majorVersion: 3)
+.package(url: "https://github.com/iabudiab/HTMLKit", .upToNextMajor(from: "4.0.0")),
 ```
 
 Then run:

Sources/HTMLKit-Info.plist

@@ -17,13 +17,13 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2014 BrainCookie. All rights reserved.</string>
+	<string>Copyright © 2014 iabudiab. All rights reserved.</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

Sources/HTMLParser.m

@@ -1308,7 +1308,7 @@
 		_framesetOkFlag = NO;
 	} else if ([tagName isEqualToString:@"a"]) {
 		HTMLElement *element = ^ HTMLElement * {
-			for (HTMLElement *element in _listOfActiveFormattingElements.reverseObjectEnumerator) {
+            for (HTMLElement *element in self->_listOfActiveFormattingElements.reverseObjectEnumerator) {
 				if ([element isEqual:[HTMLMarker marker]]) return nil;
 				if ([element.tagName isEqualToString:@"a"]) {
 					return element;
@@ -1776,7 +1776,7 @@
 - (void)HTMLInsertionModeInCaption:(HTMLToken *)token
 {
 	void (^ common) (BOOL) = ^ (BOOL reprocess) {
-		if (![_stackOfOpenElements hasElementInTableScopeWithTagName:@"caption"]) {
+        if (![self->_stackOfOpenElements hasElementInTableScopeWithTagName:@"caption"]) {
 			[self emitParseError:@"Unexpected end tag </caption> for misnested element in <caption>"];
 			return;
 		}
@@ -1784,8 +1784,8 @@
 		if (![self.currentNode.tagName isEqualToString:@"caption"]) {
 			[self emitParseError:@"Misnested <caption> element in <caption>"];
 		}
-		[_stackOfOpenElements popElementsUntilElementPoppedWithTagName:@"caption"];
-		[_listOfActiveFormattingElements clearUptoLastMarker];
+        [self->_stackOfOpenElements popElementsUntilElementPoppedWithTagName:@"caption"];
+        [self->_listOfActiveFormattingElements clearUptoLastMarker];
 		[self switchInsertionMode:HTMLInsertionModeInTable];
 
 		if (reprocess) {
@@ -1890,12 +1890,12 @@
 - (void)HTMLInsertionModeInTableBody:(HTMLToken *)token
 {
 	void (^ common) (BOOL) = ^ (BOOL reprocess) {
-		if (![_stackOfOpenElements hasElementInTableScopeWithAnyOfTagNames:@[@"tbody", @"tfoot", @"thead"]]) {
+        if (![self->_stackOfOpenElements hasElementInTableScopeWithAnyOfTagNames:@[@"tbody", @"tfoot", @"thead"]]) {
 			[self emitParseError:@"Unexpected tag '%@' for misnested element in <tbody>", token.asTagToken.tagName];
 			return;
 		} else {
-			[_stackOfOpenElements clearBackToTableBodyContext];
-			[_stackOfOpenElements popCurrentNode];
+            [self->_stackOfOpenElements clearBackToTableBodyContext];
+            [self->_stackOfOpenElements popCurrentNode];
 			[self switchInsertionMode:HTMLInsertionModeInTable];
 		}
 
@@ -1946,12 +1946,12 @@
 - (void)HTMLInsertionModeInRow:(HTMLToken *)token
 {
 	void (^ common) (NSString *, BOOL) = ^ (NSString *elementTagName, BOOL reprocess) {
-		if (![_stackOfOpenElements hasElementInTableScopeWithTagName:elementTagName]) {
+        if (![self->_stackOfOpenElements hasElementInTableScopeWithTagName:elementTagName]) {
 			[self emitParseError:@"Unexpected tag '%@' for misnested element <%@> in <tr>", token.asTagToken.tagName, elementTagName];
 			return;
 		} else {
-			[_stackOfOpenElements clearBackToTableRowContext];
-			[_stackOfOpenElements popCurrentNode];
+            [self->_stackOfOpenElements clearBackToTableRowContext];
+            [self->_stackOfOpenElements popCurrentNode];
 			[self switchInsertionMode:HTMLInsertionModeInTableBody];
 		}
 
@@ -2516,7 +2516,7 @@
 											if ([substring isEqualToString:@"\uFFFD"]) {
 												[self emitParseError:@"Unexpected Character (0x0000) in foreign content"];
 											} else if (!substring.htmlkit_isHTMLWhitespaceString) {
-												_framesetOkFlag = NO;
+                                                self->_framesetOkFlag = NO;
 											}
 											[self insertCharacters:substring];
 										}];
@@ -2541,20 +2541,20 @@
 				}
 				[self insertForeignElementForToken:token.asTagToken inNamespace:self.adjustedCurrentNode.htmlNamespace];
 				if (token.asTagToken.selfClosing) {
-					[_stackOfOpenElements popCurrentNode];
+                    [self->_stackOfOpenElements popCurrentNode];
 				}
 			};
 
 			void (^ matchedCase)(void) = ^ {
 				[self emitParseError:@"Unexpected start tag <%@> in foreign content", token.asTagToken.tagName];
-				if (_fragmentParsingAlgorithm) {
+                if (self->_fragmentParsingAlgorithm) {
 					anythingElse();
 				} else {
-					[_stackOfOpenElements popCurrentNode];
+                    [self->_stackOfOpenElements popCurrentNode];
 					while (!IsNodeMathMLTextIntegrationPoint(self.currentNode) &&
 						   !IsNodeHTMLIntegrationPoint(self.currentNode) &&
 						   self.currentNode.htmlNamespace != HTMLNamespaceHTML) {
-						[_stackOfOpenElements popCurrentNode];
+                        [self->_stackOfOpenElements popCurrentNode];
 					}
 					[self reprocessToken:token];
 				}

Sources/HTMLSerializer.m

@@ -54,11 +54,11 @@
 	[_result setString:@""];
 
 	HTMLNodeVisitorBlock *nodeVisitor = [HTMLNodeVisitorBlock visitorWithEnterBlock:^(HTMLNode * node) {
-		if (scope == HTMLSerializationScopeChildrenOnly && node == _root) {
+        if (scope == HTMLSerializationScopeChildrenOnly && node == self->_root) {
 			return;
 		}
 
-		if (_ignore > 0) {
+        if (self->_ignore > 0) {
 			return;
 		}
 
@@ -79,7 +79,7 @@
 				break;
 		}
 	} leaveBlock:^(HTMLNode * _Nonnull node) {
-		if (scope == HTMLSerializationScopeChildrenOnly && node == _root) {
+        if (scope == HTMLSerializationScopeChildrenOnly && node == self->_root) {
 			return;
 		}
 
@@ -88,7 +88,7 @@
 				if ([node.asElement.tagName isEqualToAny:@"area", @"base", @"basefont", @"bgsound", @"br", @"col", @"embed",
 					 @"frame", @"hr", @"img", @"input", @"keygen", @"link", @"menuitem", @"meta", @"param", @"source",
 					 @"track", @"wbr", nil]) {
-					_ignore--;
+                    self->_ignore--;
 					break;
 				}
 				[self closeElement:node.asElement];

Sources/include/HTMLComment.h

@@ -15,6 +15,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface HTMLComment : HTMLCharacterData
 
+/**
+Decalration override for `NS_UNAVAILABLE` declared in `HTMLNode`
+*/
+- (instancetype)init;
+
 /**
  Initializes a new HTML comment node.
 

Sources/include/HTMLDocument.h

@@ -78,6 +78,11 @@ typedef NS_ENUM(short, HTMLDocumentReadyState)
  */
 + (instancetype)documentWithString:(NSString *)string;
 
+/**
+Decalration override for `NS_UNAVAILABLE` declared in `HTMLNode`
+*/
+- (instancetype)init;
+
 /**
  Adopts a given node into this document, i.e. the document becomes the new owner of the node. Raises a HTMLKitNotSupportedError
  exception if node is an instance of HTMLDocument.

Sources/include/HTMLDocumentFragment.h

@@ -18,6 +18,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface HTMLDocumentFragment : HTMLNode
 
+/**
+Decalration override for `NS_UNAVAILABLE` declared in `HTMLNode`
+*/
+- (instancetype)init;
+
 /**
  Initializes a new document fragment with the given document as owner.
  

Sources/include/HTMLDocumentType.h

@@ -31,6 +31,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, copy, readonly) NSString *systemIdentifier;
 
+/**
+Decalration override for `NS_UNAVAILABLE` declared in `HTMLNode`
+*/
+- (instancetype)init;
+
 /**
  Initializes and returns a new isntance of a Document Type node.
 

Sources/include/HTMLTemplate.h

@@ -18,6 +18,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface HTMLTemplate : HTMLElement
 
+/**
+Decalration override for `NS_UNAVAILABLE` declared in `HTMLNode`
+*/
+- (instancetype)init;
+
 /** 
  The content of the template.
  

Sources/include/HTMLText.h

@@ -15,6 +15,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface HTMLText : HTMLCharacterData
 
+/**
+Decalration override for `NS_UNAVAILABLE` declared in `HTMLNode`
+*/
+- (instancetype)init;
+
 /**
  Initializes a new HTML text node.
 

Tests/HTMLKitTests/HTMLKitTests-Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.braincookie.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>dev.iabudiab.${PRODUCT_NAME:rfc1034identifier}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>