Skip to content

Commit 71da6fb

Browse files
authored
Version to 3.0 (#63)
* Version to 3.0 * Update Jazzy docs. * Update CHANGELOG. * Fix Swift versions, CI support. * Fix CI again.
1 parent 64aa081 commit 71da6fb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+832
-508
lines changed
File renamed without changes.
File renamed without changes.

.github/workflows/ci.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: "AlamofireNetworkActivityIndicator CI"
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- hotfix
8+
pull_request:
9+
branches:
10+
- master
11+
- hotfix
12+
13+
jobs:
14+
iOS:
15+
name: Test iOS
16+
runs-on: macOS-latest
17+
env:
18+
DEVELOPER_DIR: /Applications/Xcode_11.3.1.app/Contents/Developer
19+
strategy:
20+
matrix:
21+
destination: ["OS=13.3,name=iPhone 11 Pro"]
22+
steps:
23+
- name: Checkout
24+
uses: actions/checkout@v1
25+
- name: Dependencies
26+
run: carthage bootstrap --no-use-binaries --platform iOS
27+
- name: iOS
28+
run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project "AlamofireNetworkActivityIndicator.xcodeproj" -scheme "AlamofireNetworkActivityIndicator" -destination "${{ matrix.destination }}" clean test | xcpretty

.gitmodules

Lines changed: 0 additions & 3 deletions
This file was deleted.

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.5
1+
2.7.0

.swiftformat

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# file options
2+
3+
--symlinks ignore
4+
--exclude Carthage
5+
--swiftversion 5
6+
7+
# rules
8+
--disable andOperator
9+
10+
# format options
11+
12+
--closingparen same-line
13+
--commas inline
14+
--comments indent
15+
--decimalgrouping 3,5
16+
--exponentcase lowercase
17+
--exponentgrouping disabled
18+
--fractiongrouping disabled
19+
--ifdef outdent
20+
--importgrouping testable-top
21+
--operatorfunc no-space
22+
--nospaceoperators ..<, ...
23+
--selfrequired validate
24+
--stripunusedargs closure-only
25+
--wraparguments after-first
26+
--wrapcollections after-first

.travis.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.

AlamofireNetworkActivityIndicator.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'AlamofireNetworkActivityIndicator'
3-
s.version = '3.0.0-beta.3'
3+
s.version = '3.0.0'
44
s.license = 'MIT'
55
s.summary = 'Controls the visibility of the network activity indicator on iOS using Alamofire'
66
s.homepage = 'https://github.com/Alamofire/AlamofireNetworkActivityIndicator'
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
1313

1414
s.ios.deployment_target = '10.0'
1515

16-
s.swift_version = '5.0'
16+
s.swift_versions = ['5.0', '5.1']
1717

18-
s.dependency 'Alamofire', '~> 5.0.0-beta.6'
18+
s.dependency 'Alamofire', '~> 5.0'
1919
end

AlamofireNetworkActivityIndicator.xcodeproj/project.pbxproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
/* End PBXContainerItemProxy section */
9696

9797
/* Begin PBXFileReference section */
98+
311AAFCC23FB4CDF00AFBABD /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
9899
4C0097AC1EF4CB9A0010778C /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
99100
4C0097AD1EF4CB9A0010778C /* CONTRIBUTING.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CONTRIBUTING.md; sourceTree = "<group>"; };
100101
4C0097AE1EF4CB9A0010778C /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
@@ -145,6 +146,7 @@
145146
children = (
146147
4C0097B01EF4CBA40010778C /* AlamofireNetworkActivityIndicator.podspec */,
147148
4C0097B11EF4CBA40010778C /* Cartfile */,
149+
311AAFCC23FB4CDF00AFBABD /* Package.swift */,
148150
);
149151
name = Deployment;
150152
sourceTree = "<group>";
@@ -296,11 +298,11 @@
296298
};
297299
buildConfigurationList = 4CB928331C66E1A600CE5F08 /* Build configuration list for PBXProject "AlamofireNetworkActivityIndicator" */;
298300
compatibilityVersion = "Xcode 3.2";
299-
developmentRegion = English;
301+
developmentRegion = en;
300302
hasScannedForEncodings = 0;
301303
knownRegions = (
302-
English,
303304
en,
305+
Base,
304306
);
305307
mainGroup = 4CB9282F1C66E1A600CE5F08;
306308
productRefGroup = 4CB9283A1C66E1A600CE5F08 /* Products */;

AlamofireNetworkActivityIndicator.xcodeproj/xcshareddata/xcschemes/AlamofireNetworkActivityIndicator.xcscheme

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,17 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43-
enableThreadSanitizer = "YES"
44-
shouldUseLaunchSchemeArgsEnv = "YES">
43+
shouldUseLaunchSchemeArgsEnv = "YES"
44+
enableThreadSanitizer = "YES">
45+
<MacroExpansion>
46+
<BuildableReference
47+
BuildableIdentifier = "primary"
48+
BlueprintIdentifier = "4CB928381C66E1A600CE5F08"
49+
BuildableName = "AlamofireNetworkActivityIndicator.framework"
50+
BlueprintName = "AlamofireNetworkActivityIndicator"
51+
ReferencedContainer = "container:AlamofireNetworkActivityIndicator.xcodeproj">
52+
</BuildableReference>
53+
</MacroExpansion>
4554
<Testables>
4655
<TestableReference
4756
skipped = "NO">
@@ -54,17 +63,6 @@
5463
</BuildableReference>
5564
</TestableReference>
5665
</Testables>
57-
<MacroExpansion>
58-
<BuildableReference
59-
BuildableIdentifier = "primary"
60-
BlueprintIdentifier = "4CB928381C66E1A600CE5F08"
61-
BuildableName = "AlamofireNetworkActivityIndicator.framework"
62-
BlueprintName = "AlamofireNetworkActivityIndicator"
63-
ReferencedContainer = "container:AlamofireNetworkActivityIndicator.xcodeproj">
64-
</BuildableReference>
65-
</MacroExpansion>
66-
<AdditionalOptions>
67-
</AdditionalOptions>
6866
</TestAction>
6967
<LaunchAction
7068
buildConfiguration = "Debug"
@@ -92,8 +90,6 @@
9290
isEnabled = "YES">
9391
</EnvironmentVariable>
9492
</EnvironmentVariables>
95-
<AdditionalOptions>
96-
</AdditionalOptions>
9793
</LaunchAction>
9894
<ProfileAction
9995
buildConfiguration = "Release"

0 commit comments

Comments
 (0)