Skip to content

Commit

Permalink
Version to 3.0 (#63)
Browse files Browse the repository at this point in the history
* Version to 3.0

* Update Jazzy docs.

* Update CHANGELOG.

* Fix Swift versions, CI support.

* Fix CI again.
  • Loading branch information
jshier authored Feb 17, 2020
1 parent 64aa081 commit 71da6fb
Show file tree
Hide file tree
Showing 45 changed files with 832 additions and 508 deletions.
File renamed without changes.
File renamed without changes.
28 changes: 28 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: "AlamofireNetworkActivityIndicator CI"

on:
push:
branches:
- master
- hotfix
pull_request:
branches:
- master
- hotfix

jobs:
iOS:
name: Test iOS
runs-on: macOS-latest
env:
DEVELOPER_DIR: /Applications/Xcode_11.3.1.app/Contents/Developer
strategy:
matrix:
destination: ["OS=13.3,name=iPhone 11 Pro"]
steps:
- name: Checkout
uses: actions/checkout@v1
- name: Dependencies
run: carthage bootstrap --no-use-binaries --platform iOS
- name: iOS
run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project "AlamofireNetworkActivityIndicator.xcodeproj" -scheme "AlamofireNetworkActivityIndicator" -destination "${{ matrix.destination }}" clean test | xcpretty
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.5
2.7.0
26 changes: 26 additions & 0 deletions .swiftformat
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# file options

--symlinks ignore
--exclude Carthage
--swiftversion 5

# rules
--disable andOperator

# format options

--closingparen same-line
--commas inline
--comments indent
--decimalgrouping 3,5
--exponentcase lowercase
--exponentgrouping disabled
--fractiongrouping disabled
--ifdef outdent
--importgrouping testable-top
--operatorfunc no-space
--nospaceoperators ..<, ...
--selfrequired validate
--stripunusedargs closure-only
--wraparguments after-first
--wrapcollections after-first
33 changes: 0 additions & 33 deletions .travis.yml

This file was deleted.

6 changes: 3 additions & 3 deletions AlamofireNetworkActivityIndicator.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'AlamofireNetworkActivityIndicator'
s.version = '3.0.0-beta.3'
s.version = '3.0.0'
s.license = 'MIT'
s.summary = 'Controls the visibility of the network activity indicator on iOS using Alamofire'
s.homepage = 'https://github.com/Alamofire/AlamofireNetworkActivityIndicator'
Expand All @@ -13,7 +13,7 @@ Pod::Spec.new do |s|

s.ios.deployment_target = '10.0'

s.swift_version = '5.0'
s.swift_versions = ['5.0', '5.1']

s.dependency 'Alamofire', '~> 5.0.0-beta.6'
s.dependency 'Alamofire', '~> 5.0'
end
6 changes: 4 additions & 2 deletions AlamofireNetworkActivityIndicator.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
311AAFCC23FB4CDF00AFBABD /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
4C0097AC1EF4CB9A0010778C /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
4C0097AD1EF4CB9A0010778C /* CONTRIBUTING.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CONTRIBUTING.md; sourceTree = "<group>"; };
4C0097AE1EF4CB9A0010778C /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
Expand Down Expand Up @@ -145,6 +146,7 @@
children = (
4C0097B01EF4CBA40010778C /* AlamofireNetworkActivityIndicator.podspec */,
4C0097B11EF4CBA40010778C /* Cartfile */,
311AAFCC23FB4CDF00AFBABD /* Package.swift */,
);
name = Deployment;
sourceTree = "<group>";
Expand Down Expand Up @@ -296,11 +298,11 @@
};
buildConfigurationList = 4CB928331C66E1A600CE5F08 /* Build configuration list for PBXProject "AlamofireNetworkActivityIndicator" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
mainGroup = 4CB9282F1C66E1A600CE5F08;
productRefGroup = 4CB9283A1C66E1A600CE5F08 /* Products */;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,17 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
enableThreadSanitizer = "YES"
shouldUseLaunchSchemeArgsEnv = "YES">
shouldUseLaunchSchemeArgsEnv = "YES"
enableThreadSanitizer = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4CB928381C66E1A600CE5F08"
BuildableName = "AlamofireNetworkActivityIndicator.framework"
BlueprintName = "AlamofireNetworkActivityIndicator"
ReferencedContainer = "container:AlamofireNetworkActivityIndicator.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -54,17 +63,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4CB928381C66E1A600CE5F08"
BuildableName = "AlamofireNetworkActivityIndicator.framework"
BlueprintName = "AlamofireNetworkActivityIndicator"
ReferencedContainer = "container:AlamofireNetworkActivityIndicator.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand Down Expand Up @@ -92,8 +90,6 @@
isEnabled = "YES">
</EnvironmentVariable>
</EnvironmentVariables>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ 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.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
Expand All @@ -18,6 +19,14 @@ All notable changes to this project will be documented in this file.

---

## [3.0.0](https://github.com/Alamofire/AlamofireNetworkActivityIndicator/releases/tag/3.0.0)
Released on 2020-002-17. All issues associated with this milestone can be found using this
[filter](https://github.com/Alamofire/AlamofireNetworkActivityIndicator/milestone/14?closed=1).

#### Added
- Swift Package Manager support.
- Added by [Alexey Korolev](https://github.com/alphatroya) in Pull Request [#61](https://github.com/Alamofire/AlamofireNetworkActivityIndicator/pull/61).

## [3.0.0-beta.3](https://github.com/Alamofire/AlamofireNetworkActivityIndicator/releases/tag/3.0.0-beta.3)
Released on 2019-05-04. All issues associated with this milestone can be found using this
[filter](https://github.com/Alamofire/AlamofireNetworkActivityIndicator/milestone/13?closed=1).
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "Alamofire/Alamofire" ~> 5.0.0-beta.6
github "Alamofire/Alamofire" ~> 5.0
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "Alamofire/Alamofire" "5.0.0-beta.6"
github "Alamofire/Alamofire" "5.0.0"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Alamofire
Submodule Alamofire updated from 163db0 to 0c8cb7
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ source "https://rubygems.org"

gem "cocoapods"
gem "jazzy"
gem "xcpretty"
74 changes: 39 additions & 35 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,103 +1,107 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.0)
CFPropertyList (3.0.2)
activesupport (4.2.11.1)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
algoliasearch (1.27.1)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.2)
cocoapods (1.6.1)
claide (1.0.3)
cocoapods (1.8.4)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.6.1)
cocoapods-deintegrate (>= 1.0.2, < 2.0)
cocoapods-core (= 1.8.4)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-stats (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.3.1, < 2.0)
cocoapods-trunk (>= 1.4.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (>= 2.2.0, < 3.0)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.8.1, < 2.0)
cocoapods-core (1.6.1)
xcodeproj (>= 1.11.1, < 2.0)
cocoapods-core (1.8.4)
activesupport (>= 4.0.2, < 6)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.2.2)
cocoapods-downloader (1.3.0)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.1.0)
cocoapods-trunk (1.3.1)
cocoapods-trunk (1.4.1)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.1.0)
colored2 (3.1.2)
concurrent-ruby (1.1.5)
concurrent-ruby (1.1.6)
escape (0.0.4)
ffi (1.10.0)
fourflusher (2.2.0)
ffi (1.12.2)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jazzy (0.9.4)
cocoapods (~> 1.0)
mustache (~> 0.99)
jazzy (0.13.1)
cocoapods (~> 1.5)
mustache (~> 1.1)
open4
redcarpet (~> 3.2)
redcarpet (~> 3.4)
rouge (>= 2.0.6, < 4.0)
sass (~> 3.4)
sassc (~> 2.1)
sqlite3 (~> 1.3)
xcinvoke (~> 0.3.0)
json (2.3.0)
liferaft (0.0.6)
minitest (5.11.3)
minitest (5.14.0)
molinillo (0.6.6)
mustache (0.99.8)
mustache (1.1.1)
nanaimo (0.2.6)
nap (1.1.0)
netrc (0.11.0)
open4 (1.3.4)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
redcarpet (3.4.0)
rouge (3.3.0)
redcarpet (3.5.0)
rouge (2.0.7)
ruby-macho (1.4.0)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sqlite3 (1.4.0)
sassc (2.2.1)
ffi (~> 1.9)
sqlite3 (1.4.2)
thread_safe (0.3.6)
tzinfo (1.2.5)
tzinfo (1.2.6)
thread_safe (~> 0.1)
xcinvoke (0.3.0)
liferaft (~> 0.0.6)
xcodeproj (1.8.2)
xcodeproj (1.15.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.2.6)
xcpretty (0.3.0)
rouge (~> 2.0.7)

PLATFORMS
ruby

DEPENDENCIES
cocoapods
jazzy
xcpretty

BUNDLED WITH
1.17.3
2.1.2
24 changes: 7 additions & 17 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,20 +1,10 @@
// swift-tools-version:5.1
import PackageDescription

let package = Package(
name: "AlamofireNetworkActivityIndicator",
platforms: [.iOS(.v10)],
products: [
.library(name: "AlamofireNetworkActivityIndicator", targets: ["AlamofireNetworkActivityIndicator"]),
],
dependencies: [
.package(url: "https://github.com/Alamofire/Alamofire.git", from: "5.0.0-rc.3")
],
targets: [
.target(
name: "AlamofireNetworkActivityIndicator",
dependencies: ["Alamofire"],
path: "Source"
),
]
)
let package = Package(name: "AlamofireNetworkActivityIndicator",
platforms: [.iOS(.v10)],
products: [.library(name: "AlamofireNetworkActivityIndicator", targets: ["AlamofireNetworkActivityIndicator"])],
dependencies: [.package(url: "https://github.com/Alamofire/Alamofire.git", from: "5.0.0")],
targets: [.target(name: "AlamofireNetworkActivityIndicator",
dependencies: ["Alamofire"],
path: "Source")])
Loading

0 comments on commit 71da6fb

Please sign in to comment.