Skip to content

Commit 79353a3

Browse files
authored
Update for Xcode 9.3 (#33)
* Update for Xcode 9.3, update dependencies. * Update Travis config. * Remove per-target SWIFT_VERSION setting, enable thread sanitizer. * Use Travis 9.3beta image. * Update checkout. * Update copyrights. * Version to 2.2.1. * Adjust timing to make test more reliable. * Update Jazzy docs.
1 parent 1112f8e commit 79353a3

28 files changed

+136
-82
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode9.2
2+
osx_image: xcode9.3beta
33
branches:
44
only:
55
- master
@@ -10,7 +10,7 @@ env:
1010
- PROJECT=AlamofireNetworkActivityIndicator.xcodeproj
1111
- SCHEME="AlamofireNetworkActivityIndicator"
1212
matrix:
13-
- DESTINATION="OS=11.2,name=iPhone 8" POD_LINT="YES"
13+
- DESTINATION="OS=11.3,name=iPhone 8" POD_LINT="YES"
1414
- DESTINATION="OS=10.3.1,name=iPhone 7" POD_LINT="NO"
1515
- DESTINATION="OS=9.3,name=iPhone 6" POD_LINT="NO"
1616
- DESTINATION="OS=8.4,name=iPhone 4S" POD_LINT="NO"

AlamofireNetworkActivityIndicator.podspec

Lines changed: 2 additions & 2 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 = '2.2.0'
3+
s.version = '2.2.1'
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'
@@ -12,5 +12,5 @@ Pod::Spec.new do |s|
1212

1313
s.ios.deployment_target = '8.0'
1414

15-
s.dependency 'Alamofire', '~> 4.6'
15+
s.dependency 'Alamofire', '~> 4.7'
1616
end

AlamofireNetworkActivityIndicator.xcodeproj/project.pbxproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@
277277
isa = PBXProject;
278278
attributes = {
279279
LastSwiftUpdateCheck = 0720;
280-
LastUpgradeCheck = 0900;
280+
LastUpgradeCheck = 0930;
281281
ORGANIZATIONNAME = Alamofire;
282282
TargetAttributes = {
283283
4C37A5691D45CA7100FC20A4 = {
@@ -464,12 +464,14 @@
464464
CLANG_WARN_BOOL_CONVERSION = YES;
465465
CLANG_WARN_COMMA = YES;
466466
CLANG_WARN_CONSTANT_CONVERSION = YES;
467+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
467468
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
468469
CLANG_WARN_EMPTY_BODY = YES;
469470
CLANG_WARN_ENUM_CONVERSION = YES;
470471
CLANG_WARN_INFINITE_RECURSION = YES;
471472
CLANG_WARN_INT_CONVERSION = YES;
472473
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
474+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
473475
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
474476
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
475477
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -526,12 +528,14 @@
526528
CLANG_WARN_BOOL_CONVERSION = YES;
527529
CLANG_WARN_COMMA = YES;
528530
CLANG_WARN_CONSTANT_CONVERSION = YES;
531+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
529532
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
530533
CLANG_WARN_EMPTY_BODY = YES;
531534
CLANG_WARN_ENUM_CONVERSION = YES;
532535
CLANG_WARN_INFINITE_RECURSION = YES;
533536
CLANG_WARN_INT_CONVERSION = YES;
534537
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
538+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
535539
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
536540
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
537541
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -589,7 +593,6 @@
589593
SKIP_INSTALL = YES;
590594
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
591595
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
592-
SWIFT_VERSION = 3.0;
593596
};
594597
name = Debug;
595598
};
@@ -612,7 +615,6 @@
612615
SKIP_INSTALL = YES;
613616
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
614617
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
615-
SWIFT_VERSION = 3.0;
616618
};
617619
name = Release;
618620
};
@@ -624,7 +626,6 @@
624626
PRODUCT_BUNDLE_IDENTIFIER = org.alamofire.AlamofireNetworkActivityIndicatorTests;
625627
PRODUCT_NAME = "$(TARGET_NAME)";
626628
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
627-
SWIFT_VERSION = 3.0;
628629
};
629630
name = Debug;
630631
};
@@ -637,7 +638,6 @@
637638
PRODUCT_NAME = "$(TARGET_NAME)";
638639
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
639640
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
640-
SWIFT_VERSION = 3.0;
641641
};
642642
name = Release;
643643
};
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

AlamofireNetworkActivityIndicator.xcodeproj/xcshareddata/xcschemes/AlamofireNetworkActivityIndicator.xcscheme

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,6 +40,7 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
enableThreadSanitizer = "YES"
4344
shouldUseLaunchSchemeArgsEnv = "YES">
4445
<Testables>
4546
<TestableReference

AlamofireNetworkActivityIndicator.xcodeproj/xcshareddata/xcschemes/Cleanup Whitespace.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

CHANGELOG.md

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file.
33
`AlamofireNetworkActivityIndicator` adheres to [Semantic Versioning](http://semver.org/).
44

55
#### 2.x Releases
6-
- `2.2.x` Releases - [2.2.0](#220)
6+
- `2.2.x` Releases - [2.2.0](#220) | [2.2.1](#221)
77
- `2.1.x` Releases - [2.1.0](#210)
88
- `2.0.x` Releases - [2.0.0](#200) | [2.0.1](#201)
99

@@ -13,7 +13,25 @@ All notable changes to this project will be documented in this file.
1313

1414
---
1515

16-
## [2.2.0](https://github.com/Alamofire/AlamofireNetworkActivityIndicator/releases/tag/2.1.0)
16+
## [2.2.1](https://github.com/Alamofire/AlamofireNetworkActivityIndicator/releases/tag/2.2.1)
17+
Released on 2018-03-31. All issues associated with this milestone can be found using this
18+
[filter](https://github.com/Alamofire/AlamofireNetworkActivityIndicator/milestone/8?closed=1).
19+
20+
#### Added
21+
- Jazzy docs.
22+
- Added by [Jon Shier](https://github.com/jshier) in Pull Request [#28](https://github.com/Alamofire/AlamofireNetworkActivityIndicator/pull/28).
23+
- Pull request and issue templates.
24+
- Added by [Jon Shier](https://github.com/jshier) in Pull Request [#28](https://github.com/Alamofire/AlamofireNetworkActivityIndicator/pull/28).
25+
26+
#### Updated
27+
- Project settings and dependencies for Xcode 9.3 and Swift 4.1.
28+
- Updated by [Jon Shier](https://github.com/jshier) in Pull Request [#33](https://github.com/Alamofire/AlamofireNetworkActivityIndicator/pull/33).
29+
30+
#### Fixed
31+
- Swift Package Manager integration by removing Swift Package Manager support.
32+
- Fixed by [Jon Shier](https://github.com/jshier) in Pull Request [#28](https://github.com/Alamofire/AlamofireNetworkActivityIndicator/pull/28).
33+
34+
## [2.2.0](https://github.com/Alamofire/AlamofireNetworkActivityIndicator/releases/tag/2.2.0)
1735
Released on 2017-06-16. All issues associated with this milestone can be found using this
1836
[filter](https://github.com/Alamofire/AlamofireNetworkActivityIndicator/milestone/7?closed=1).
1937

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "Alamofire/Alamofire" ~> 4.6
1+
github "Alamofire/Alamofire" ~> 4.7

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "Alamofire/Alamofire" "4.6.0"
1+
github "Alamofire/Alamofire" "4.7.1"

Carthage/Checkouts/Alamofire

Submodule Alamofire updated 190 files

0 commit comments

Comments
 (0)