Skip to content
Merged
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
3 changes: 1 addition & 2 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ignore:
- "Tests"
- "Sources/Performance"
- "Sources/HTMLString/ObjC.swift"
- "Sources/HTMLString/NSString+HTMLString.swift"
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,7 @@ xcuserdata/
Packages/
.build/
Carthage/Build
Gemfile
Gemfile.lock
docs/undocumented.json
docs/docsets/HTMLString.docset/Contents/Resources/Documents/undocumented.json
8 changes: 4 additions & 4 deletions .jazzy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ clean: true
author: "Alexis Aubry Radanovic"
author_url: https://github.com/alexaubry
github_url: https://github.com/alexaubry/HTMLString
github_file_prefix: https://github.com/alexaubry/HTMLString/tree/2.1.2
module_version: 2.1.2
github_file_prefix: https://github.com/alexaubry/HTMLString/tree/3.0.0
module_version: 3.0.0
xcodebuild_arguments:
- -scheme
- HTMLString
- HTMLString-macOS
- -destination
- 'platform=OS X,arch=x86_64'
- 'platform=macOS'
module: HTMLString
root_url: https://alexaubry.github.io/HTMLString
output: docs/
Expand Down
42 changes: 33 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,35 @@
os:
- linux
- osx
language: generic
sudo: required
dist: trusty
osx_image: xcode8.2

language: objective-c
osx_image: xcode8
env:
global:
- FRAMEWORK_NAME=HTMLString
before_install:
- brew update
- brew outdated carthage || brew upgrade carthage
script:
- eval "$(curl -sL https://swift.vapor.sh/ci)"
- xcodebuild clean build -project HTMLString.xcodeproj -scheme HTMLString-watchOS CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO
- xcodebuild clean build build-for-testing -project HTMLString.xcodeproj -scheme HTMLString-iOS -destination "platform=iOS Simulator,name=iPhone 6" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO
- xcodebuild clean build build-for-testing -project HTMLString.xcodeproj -scheme HTMLString-tvOS -destination "platform=tvOS Simulator,name=Apple TV 1080p" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO
- xcodebuild clean build build-for-testing -project HTMLString.xcodeproj -scheme HTMLString-macOS -destination "platform=macOS" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO
- xcodebuild test-without-building -project HTMLString.xcodeproj -scheme HTMLString-iOS -destination "platform=iOS Simulator,name=iPhone 6" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO
- xcodebuild test-without-building -project HTMLString.xcodeproj -scheme HTMLString-tvOS -destination "platform=tvOS Simulator,name=Apple TV 1080p" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO
- xcodebuild test-without-building -project HTMLString.xcodeproj -scheme HTMLString-macOS -destination "platform=macOS" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO
- eval "$(curl -sL https://swift.vapor.sh/codecov)"
before_deploy:
- carthage build --no-skip-current
- carthage archive $FRAMEWORK_NAME
deploy:
- provider: releases
api_key:
secure: bI9J98yDzELOVAjxCxmxvRvQ99ITOAUPCUtShzSmhJTQdu+ED5MhAwPQshjSnU6uPtCm6tdYo6LzqgPVQKGs2ARdyYN2YCsrVx4cCzXNTt4VNOtUtbh4l3LHueLgBdlz4EGo76HTw49mlSt7jfBwN99BzrypQ8ZN51rGtmGNYzfFXXOaQbn4VmoKPpix64e/QMH6rX0smqkDQalDURDKY/uvlq3ON8nOqH5lWY6K++LT/XAWdUqb8DqpOJs/g6eVj+aAgrMH5rPkzTICAmN/6YvFK3JxBZt+cpfRgVnk4aMLyTGX84EFWfWPKO4MmVobyzEupAUh8/PjXuhSQN1sRpOe96aY0z6ysVN9mns+seEaLG627lcU7VFjF/mH+dy4goLvMyTDXlUMk6lZl5wRoYpL5p5+krlnUVYcr99zuVf+o5EZk1CuBdDLKgQc6DoB8X2flvKCuMqwfCRd0XqVdO6M3BvCNWg+cNlrdSoTNZ0wMm+0Otq2gTQWMRR7jWONhgsCPGiqVW/9C6ImTyUBkZHT9/HsrrLxIrNSRorY+4eHuCRKZmlSeAKuLmBmfmKotKz7ya0QgMKx6Rg6CWMpenEJckehfC2aeTWeEZPn2UW57pIe0yyLcRGbcsJuMiKMXUAaB8+i1AESyl42uje+dl5V2HSADhAIe0rXwaaONdc=
file: "$FRAMEWORK_NAME.framework.zip"
skip_cleanup: true
on:
repo: alexaubry/HTMLString
tags: true
- provider: script
skip_cleanup: true
script: ci/deploy_pod.sh
on:
repo: alexaubry/HTMLString
tags: true
52 changes: 0 additions & 52 deletions Benchmark.md

This file was deleted.

10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# HTMLString Change Log

## 2017-02-14 — Version 3.0.0

- Implemented final API: same design as Foundation `addingPercentEncoding`/`removingPercentEncoding`
- Reorganized Xcode project and targets (1 target/platform)
- Better @objc annotations
- Automatic deployment from CI
- Fix Carthage minimum deployment version issue
- Updated README
- Sanitized codebase

## 2017-01-16 — Version 2.1.2

- Added an Objective-C Mix & Match API
Expand Down
26 changes: 26 additions & 0 deletions Configs/HTMLString.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
4 changes: 0 additions & 4 deletions Gemfile

This file was deleted.

208 changes: 0 additions & 208 deletions Gemfile.lock

This file was deleted.

Loading