diff --git a/.ruby-version b/.ruby-version index 24ba9a3..860487c 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.0 +2.7.1 diff --git a/AlamofireNetworkActivityIndicator.xcodeproj/project.pbxproj b/AlamofireNetworkActivityIndicator.xcodeproj/project.pbxproj index c0350cd..1d9bec3 100644 --- a/AlamofireNetworkActivityIndicator.xcodeproj/project.pbxproj +++ b/AlamofireNetworkActivityIndicator.xcodeproj/project.pbxproj @@ -457,6 +457,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACOSX_DEPLOYMENT_TARGET = 10.12; + MARKETING_VERSION = 3.1.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -466,7 +467,6 @@ TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 10.0; VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; WATCHOS_DEPLOYMENT_TARGET = 3.0; }; name = Debug; @@ -516,6 +516,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACOSX_DEPLOYMENT_TARGET = 10.12; + MARKETING_VERSION = 3.1.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; @@ -525,7 +526,6 @@ TVOS_DEPLOYMENT_TARGET = 10.0; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; WATCHOS_DEPLOYMENT_TARGET = 3.0; }; name = Release; @@ -543,7 +543,6 @@ INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 3.0.1; PRODUCT_BUNDLE_IDENTIFIER = org.alamofire.AlamofireNetworkActivityIndicator; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -564,7 +563,6 @@ INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 3.0.1; PRODUCT_BUNDLE_IDENTIFIER = org.alamofire.AlamofireNetworkActivityIndicator; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; diff --git a/CHANGELOG.md b/CHANGELOG.md index 9db4a70..ea59ea9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,8 @@ All notable changes to this project will be documented in this file. `AlamofireNetworkActivityIndicator` adheres to [Semantic Versioning](http://semver.org/). #### 3.x Releases -- `3.0.x` Releases - [3.0.0](#300) +- `3.1.x` Releases - [3.1.0](#310) +- `3.0.x` Releases - [3.0.0](#300) | [3.0.1](#301) - `3.0.0` Betas - [3.0.0-beta.1](#300-beta1) | [3.0.0-beta.2](#300-beta2) | | [3.0.0-beta.3](#300-beta3) #### 2.x Releases @@ -19,6 +20,16 @@ All notable changes to this project will be documented in this file. --- +## [3.1.0](https://github.com/Alamofire/AlamofireNetworkActivityIndicator/releases/tag/3.1.0) +Released on 2020-04-05. All issues associated with this milestone can be found using this +[filter](https://github.com/Alamofire/AlamofireNetworkActivityIndicator/milestone/16?closed=1). + +#### Updated +- Project to require Swift 5.1. + - Updated by [Jon Shier](https://github.com/jshier) in Pull Request [#67](https://github.com/Alamofire/AlamofireNetworkActivityIndicator/pull/67). + +--- + ## [3.0.1](https://github.com/Alamofire/AlamofireNetworkActivityIndicator/releases/tag/3.0.1) Released on 2020-02-29. All issues associated with this milestone can be found using this [filter](https://github.com/Alamofire/AlamofireNetworkActivityIndicator/milestone/15?closed=1). diff --git a/Gemfile.lock b/Gemfile.lock index 9b5ba20..6f15094 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,10 +12,10 @@ GEM json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.9.0) + cocoapods (1.9.1) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.9.0) + cocoapods-core (= 1.9.1) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -31,7 +31,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.14.0, < 2.0) - cocoapods-core (1.9.0) + cocoapods-core (1.9.1) activesupport (>= 4.0.2, < 6) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) @@ -61,7 +61,7 @@ GEM httpclient (2.8.3) i18n (0.9.5) concurrent-ruby (~> 1.0) - jazzy (0.13.1) + jazzy (0.13.2) cocoapods (~> 1.5) mustache (~> 1.1) open4 @@ -88,7 +88,7 @@ GEM thread_safe (0.3.6) typhoeus (1.3.1) ethon (>= 0.9.0) - tzinfo (1.2.6) + tzinfo (1.2.7) thread_safe (~> 0.1) xcinvoke (0.3.0) liferaft (~> 0.0.6) @@ -110,4 +110,4 @@ DEPENDENCIES xcpretty BUNDLED WITH - 2.1.2 + 2.1.4 diff --git a/docs/Classes.html b/docs/Classes.html index 8c09d3e..606a8ad 100644 --- a/docs/Classes.html +++ b/docs/Classes.html @@ -128,8 +128,8 @@

Declaration

diff --git a/docs/Classes/NetworkActivityIndicatorManager.html b/docs/Classes/NetworkActivityIndicatorManager.html index 9c370ea..e77922a 100644 --- a/docs/Classes/NetworkActivityIndicatorManager.html +++ b/docs/Classes/NetworkActivityIndicatorManager.html @@ -290,7 +290,7 @@

Request Tracking

- requestDidStart(requestID:) + requestDidStart(requestID:)
@@ -338,7 +338,7 @@

Parameters

- requestDidStop(requestID:) + requestDidStop(requestID:)
@@ -389,8 +389,8 @@

Parameters

diff --git a/docs/css/jazzy.css b/docs/css/jazzy.css index 3ca6b31..f73852b 100644 --- a/docs/css/jazzy.css +++ b/docs/css/jazzy.css @@ -248,8 +248,10 @@ pre code { content: ""; display: block; } .item .token, .item .direct-link { + display: inline-block; + text-indent: -20px; padding-left: 3px; - margin-left: 0px; + margin-left: 20px; font-size: 1rem; } .item .declaration-note { font-size: .85em; diff --git a/docs/docsets/AlamofireNetworkActivityIndicator.docset/Contents/Resources/Documents/Classes.html b/docs/docsets/AlamofireNetworkActivityIndicator.docset/Contents/Resources/Documents/Classes.html index 8c09d3e..606a8ad 100644 --- a/docs/docsets/AlamofireNetworkActivityIndicator.docset/Contents/Resources/Documents/Classes.html +++ b/docs/docsets/AlamofireNetworkActivityIndicator.docset/Contents/Resources/Documents/Classes.html @@ -128,8 +128,8 @@

Declaration

diff --git a/docs/docsets/AlamofireNetworkActivityIndicator.docset/Contents/Resources/Documents/Classes/NetworkActivityIndicatorManager.html b/docs/docsets/AlamofireNetworkActivityIndicator.docset/Contents/Resources/Documents/Classes/NetworkActivityIndicatorManager.html index 9c370ea..e77922a 100644 --- a/docs/docsets/AlamofireNetworkActivityIndicator.docset/Contents/Resources/Documents/Classes/NetworkActivityIndicatorManager.html +++ b/docs/docsets/AlamofireNetworkActivityIndicator.docset/Contents/Resources/Documents/Classes/NetworkActivityIndicatorManager.html @@ -290,7 +290,7 @@

Request Tracking

- requestDidStart(requestID:) + requestDidStart(requestID:)
@@ -338,7 +338,7 @@

Parameters

- requestDidStop(requestID:) + requestDidStop(requestID:)
@@ -389,8 +389,8 @@

Parameters

diff --git a/docs/docsets/AlamofireNetworkActivityIndicator.docset/Contents/Resources/Documents/css/jazzy.css b/docs/docsets/AlamofireNetworkActivityIndicator.docset/Contents/Resources/Documents/css/jazzy.css index 3ca6b31..f73852b 100644 --- a/docs/docsets/AlamofireNetworkActivityIndicator.docset/Contents/Resources/Documents/css/jazzy.css +++ b/docs/docsets/AlamofireNetworkActivityIndicator.docset/Contents/Resources/Documents/css/jazzy.css @@ -248,8 +248,10 @@ pre code { content: ""; display: block; } .item .token, .item .direct-link { + display: inline-block; + text-indent: -20px; padding-left: 3px; - margin-left: 0px; + margin-left: 20px; font-size: 1rem; } .item .declaration-note { font-size: .85em; diff --git a/docs/docsets/AlamofireNetworkActivityIndicator.docset/Contents/Resources/Documents/index.html b/docs/docsets/AlamofireNetworkActivityIndicator.docset/Contents/Resources/Documents/index.html index 2f3b45c..3151f2f 100644 --- a/docs/docsets/AlamofireNetworkActivityIndicator.docset/Contents/Resources/Documents/index.html +++ b/docs/docsets/AlamofireNetworkActivityIndicator.docset/Contents/Resources/Documents/index.html @@ -92,8 +92,8 @@

Requirements

Dependencies

@@ -113,18 +113,18 @@

Installation

CocoaPods

CocoaPods is a dependency manager for Cocoa projects. For usage and installation instructions, visit their website. To integrate Alamofire into your Xcode project using CocoaPods, specify it in your Podfile:

-
pod 'AlamofireNetworkActivityIndicator', '~> 3.0'
+
pod 'AlamofireNetworkActivityIndicator', '~> 3.1'
 

Carthage

Carthage is a decentralized dependency manager that builds your dependencies and provides you with binary frameworks. To integrate Alamofire into your Xcode project using Carthage, specify it in your Cartfile:

-
github "Alamofire/AlamofireNetworkActivityIndicator" ~> 3.0
+
github "Alamofire/AlamofireNetworkActivityIndicator" ~> 3.1
 

Swift Package Manager (requires Xcode 11)

  1. Select File > Swift Packages > Add Package Dependency. Enter https://github.com/Alamofire/AlamofireNetworkActivityIndicator in the “Choose Package Repository” dialog.
  2. -
  3. In the next page, specify the version resolving rule as “Up to Next Major” with “3.0.0” as its earliest version.
  4. +
  5. In the next page, specify the version resolving rule as “Up to Next Major” with “3.1.0” as its earliest version.
  6. After Xcode checking out the source and resolving the version, you can choose the “AlamofireNetworkActivityIndicator” library and add it to your app target.

Manually

@@ -241,8 +241,8 @@

License

diff --git a/docs/docsets/AlamofireNetworkActivityIndicator.docset/Contents/Resources/Documents/js/jazzy.js b/docs/docsets/AlamofireNetworkActivityIndicator.docset/Contents/Resources/Documents/js/jazzy.js index c31dc05..1e55d6e 100755 --- a/docs/docsets/AlamofireNetworkActivityIndicator.docset/Contents/Resources/Documents/js/jazzy.js +++ b/docs/docsets/AlamofireNetworkActivityIndicator.docset/Contents/Resources/Documents/js/jazzy.js @@ -23,7 +23,7 @@ function openCurrentItemIfClosed() { if (window.jazzy.docset) { return; } - var $link = $(`.token[href="${location.hash}"]`); + var $link = $(`a[name="${location.hash.substring(1)}"]`).nextAll('.token'); $content = itemLinkToContent($link); if ($content.is(':hidden')) { toggleItem($link, $content); @@ -57,3 +57,14 @@ $("a:not('.token')").on('click', function() { openCurrentItemIfClosed(); } }); + +// KaTeX rendering +if ("katex" in window) { + $($('.math').each( (_, element) => { + katex.render(element.textContent, element, { + displayMode: $(element).hasClass('m-block'), + throwOnError: false, + trust: true + }); + })) +} diff --git a/docs/docsets/AlamofireNetworkActivityIndicator.tgz b/docs/docsets/AlamofireNetworkActivityIndicator.tgz index 900d70b..51e89f5 100644 Binary files a/docs/docsets/AlamofireNetworkActivityIndicator.tgz and b/docs/docsets/AlamofireNetworkActivityIndicator.tgz differ diff --git a/docs/docsets/AlamofireNetworkActivityIndicator.xml b/docs/docsets/AlamofireNetworkActivityIndicator.xml index 68b58cf..c626ca5 100644 --- a/docs/docsets/AlamofireNetworkActivityIndicator.xml +++ b/docs/docsets/AlamofireNetworkActivityIndicator.xml @@ -1 +1 @@ -3.0.1https://alamofire.github.io/AlamofireNetworkActivityIndicator/docsets/AlamofireNetworkActivityIndicator.tgz +3.1.0https://alamofire.github.io/AlamofireNetworkActivityIndicator/docsets/AlamofireNetworkActivityIndicator.tgz diff --git a/docs/index.html b/docs/index.html index 2f3b45c..3151f2f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -92,8 +92,8 @@

Requirements

  • iOS 10.0+
  • -
  • Xcode 10.2+
  • -
  • Swift 5.0+
  • +
  • Xcode 11+
  • +
  • Swift 5.1+

Dependencies

@@ -113,18 +113,18 @@

Installation

CocoaPods

CocoaPods is a dependency manager for Cocoa projects. For usage and installation instructions, visit their website. To integrate Alamofire into your Xcode project using CocoaPods, specify it in your Podfile:

-
pod 'AlamofireNetworkActivityIndicator', '~> 3.0'
+
pod 'AlamofireNetworkActivityIndicator', '~> 3.1'
 

Carthage

Carthage is a decentralized dependency manager that builds your dependencies and provides you with binary frameworks. To integrate Alamofire into your Xcode project using Carthage, specify it in your Cartfile:

-
github "Alamofire/AlamofireNetworkActivityIndicator" ~> 3.0
+
github "Alamofire/AlamofireNetworkActivityIndicator" ~> 3.1
 

Swift Package Manager (requires Xcode 11)

  1. Select File > Swift Packages > Add Package Dependency. Enter https://github.com/Alamofire/AlamofireNetworkActivityIndicator in the “Choose Package Repository” dialog.
  2. -
  3. In the next page, specify the version resolving rule as “Up to Next Major” with “3.0.0” as its earliest version.
  4. +
  5. In the next page, specify the version resolving rule as “Up to Next Major” with “3.1.0” as its earliest version.
  6. After Xcode checking out the source and resolving the version, you can choose the “AlamofireNetworkActivityIndicator” library and add it to your app target.

Manually

@@ -241,8 +241,8 @@

License

diff --git a/docs/js/jazzy.js b/docs/js/jazzy.js index c31dc05..1e55d6e 100755 --- a/docs/js/jazzy.js +++ b/docs/js/jazzy.js @@ -23,7 +23,7 @@ function openCurrentItemIfClosed() { if (window.jazzy.docset) { return; } - var $link = $(`.token[href="${location.hash}"]`); + var $link = $(`a[name="${location.hash.substring(1)}"]`).nextAll('.token'); $content = itemLinkToContent($link); if ($content.is(':hidden')) { toggleItem($link, $content); @@ -57,3 +57,14 @@ $("a:not('.token')").on('click', function() { openCurrentItemIfClosed(); } }); + +// KaTeX rendering +if ("katex" in window) { + $($('.math').each( (_, element) => { + katex.render(element.textContent, element, { + displayMode: $(element).hasClass('m-block'), + throwOnError: false, + trust: true + }); + })) +}