Skip to content

Commit 5052ebb

Browse files
bbriattebbriatte
committed
Merge branch 'release/1.0.1'
2 parents 07e028a + 3ca58fe commit 5052ebb

File tree

16 files changed

+109
-52
lines changed

16 files changed

+109
-52
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
osx_image: xcode8.3
1+
osx_image: xcode9
22
language: objective-c
33
cache:
44
- bundler

‎AlamofireLogging.podspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Pod::Spec.new do |s|
22
s.name = "AlamofireLogging"
3-
s.version = "1.0.0"
3+
s.version = "1.0.1"
44
s.summary = "Logging support for Alamofire"
5-
s.homepage = "https://github.com/Digipolitan/alamofire-logging-swift"
5+
s.homepage = "https://github.com/Digipolitan/alamofire-logging"
66
s.authors = "Digipolitan"
7-
s.source = { :git => "https://github.com/Digipolitan/alamofire-logging-swift.git", :tag => "v#{s.version}" }
7+
s.source = { :git => "https://github.com/Digipolitan/alamofire-logging.git", :tag => "v#{s.version}" }
88
s.license = { :type => "BSD", :file => "LICENSE" }
99
s.source_files = 'Sources/**/*.{swift,h}'
1010
s.ios.deployment_target = '8.0'

‎AlamofireLogging.xcodeproj/project.pbxproj‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@
438438
isa = PBXProject;
439439
attributes = {
440440
LastSwiftUpdateCheck = 0810;
441-
LastUpgradeCheck = 0820;
441+
LastUpgradeCheck = 0900;
442442
ORGANIZATIONNAME = Digipolitan;
443443
TargetAttributes = {
444444
A3169DAF1DE05E8300BABAFD = {
@@ -991,15 +991,21 @@
991991
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
992992
CLANG_CXX_LIBRARY = "libc++";
993993
CLANG_ENABLE_OBJC_ARC = YES;
994+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
994995
CLANG_WARN_BOOL_CONVERSION = YES;
996+
CLANG_WARN_COMMA = YES;
995997
CLANG_WARN_CONSTANT_CONVERSION = YES;
996998
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
997999
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
9981000
CLANG_WARN_EMPTY_BODY = YES;
9991001
CLANG_WARN_ENUM_CONVERSION = YES;
10001002
CLANG_WARN_INFINITE_RECURSION = YES;
10011003
CLANG_WARN_INT_CONVERSION = YES;
1004+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1005+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
10021006
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1007+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1008+
CLANG_WARN_STRICT_PROTOTYPES = YES;
10031009
CLANG_WARN_SUSPICIOUS_MOVE = YES;
10041010
CLANG_WARN_SUSPICIOUS_MOVES = YES;
10051011
CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -1029,7 +1035,7 @@
10291035
SDKROOT = iphoneos;
10301036
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
10311037
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1032-
SWIFT_VERSION = 3.0;
1038+
SWIFT_VERSION = 4.0;
10331039
TARGETED_DEVICE_FAMILY = "1,2";
10341040
VERSIONING_SYSTEM = "apple-generic";
10351041
VERSION_INFO_PREFIX = "";
@@ -1044,15 +1050,21 @@
10441050
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
10451051
CLANG_CXX_LIBRARY = "libc++";
10461052
CLANG_ENABLE_OBJC_ARC = YES;
1053+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
10471054
CLANG_WARN_BOOL_CONVERSION = YES;
1055+
CLANG_WARN_COMMA = YES;
10481056
CLANG_WARN_CONSTANT_CONVERSION = YES;
10491057
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
10501058
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
10511059
CLANG_WARN_EMPTY_BODY = YES;
10521060
CLANG_WARN_ENUM_CONVERSION = YES;
10531061
CLANG_WARN_INFINITE_RECURSION = YES;
10541062
CLANG_WARN_INT_CONVERSION = YES;
1063+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1064+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
10551065
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1066+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1067+
CLANG_WARN_STRICT_PROTOTYPES = YES;
10561068
CLANG_WARN_SUSPICIOUS_MOVE = YES;
10571069
CLANG_WARN_SUSPICIOUS_MOVES = YES;
10581070
CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -1074,7 +1086,7 @@
10741086
MTL_ENABLE_DEBUG_INFO = NO;
10751087
SDKROOT = iphoneos;
10761088
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1077-
SWIFT_VERSION = 3.0;
1089+
SWIFT_VERSION = 4.0;
10781090
TARGETED_DEVICE_FAMILY = "1,2";
10791091
VALIDATE_PRODUCT = YES;
10801092
VERSIONING_SYSTEM = "apple-generic";
@@ -1100,7 +1112,6 @@
11001112
PRODUCT_NAME = AlamofireLogging;
11011113
SKIP_INSTALL = YES;
11021114
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1103-
SWIFT_VERSION = 3.0;
11041115
};
11051116
name = Debug;
11061117
};
@@ -1121,15 +1132,13 @@
11211132
PRODUCT_BUNDLE_IDENTIFIER = com.digipolitan.alamofirelogging;
11221133
PRODUCT_NAME = AlamofireLogging;
11231134
SKIP_INSTALL = YES;
1124-
SWIFT_VERSION = 3.0;
11251135
};
11261136
name = Release;
11271137
};
11281138
A3169DC81DE05E8300BABAFD /* Debug */ = {
11291139
isa = XCBuildConfiguration;
11301140
baseConfigurationReference = 48A60D07B65287DB839DD2DF /* Pods-Tests-AlamofireLoggingTests-iOS.debug.xcconfig */;
11311141
buildSettings = {
1132-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
11331142
CURRENT_PROJECT_VERSION = 1;
11341143
DEVELOPMENT_TEAM = 582762VK3P;
11351144
INFOPLIST_FILE = Tests/Info.plist;
@@ -1143,7 +1152,6 @@
11431152
isa = XCBuildConfiguration;
11441153
baseConfigurationReference = 03022444139FE7FDB4C2068F /* Pods-Tests-AlamofireLoggingTests-iOS.release.xcconfig */;
11451154
buildSettings = {
1146-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
11471155
CURRENT_PROJECT_VERSION = 1;
11481156
DEVELOPMENT_TEAM = 582762VK3P;
11491157
INFOPLIST_FILE = Tests/Info.plist;
@@ -1172,7 +1180,6 @@
11721180
SDKROOT = watchos;
11731181
SKIP_INSTALL = YES;
11741182
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1175-
SWIFT_VERSION = 3.0;
11761183
TARGETED_DEVICE_FAMILY = 4;
11771184
WATCHOS_DEPLOYMENT_TARGET = 2.0;
11781185
};
@@ -1196,7 +1203,6 @@
11961203
PRODUCT_NAME = AlamofireLogging;
11971204
SDKROOT = watchos;
11981205
SKIP_INSTALL = YES;
1199-
SWIFT_VERSION = 3.0;
12001206
TARGETED_DEVICE_FAMILY = 4;
12011207
WATCHOS_DEPLOYMENT_TARGET = 2.0;
12021208
};
@@ -1220,7 +1226,6 @@
12201226
SDKROOT = appletvos;
12211227
SKIP_INSTALL = YES;
12221228
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1223-
SWIFT_VERSION = 3.0;
12241229
TARGETED_DEVICE_FAMILY = 3;
12251230
TVOS_DEPLOYMENT_TARGET = 9.0;
12261231
};
@@ -1243,7 +1248,6 @@
12431248
PRODUCT_NAME = AlamofireLogging;
12441249
SDKROOT = appletvos;
12451250
SKIP_INSTALL = YES;
1246-
SWIFT_VERSION = 3.0;
12471251
TARGETED_DEVICE_FAMILY = 3;
12481252
TVOS_DEPLOYMENT_TARGET = 9.0;
12491253
};
@@ -1253,7 +1257,6 @@
12531257
isa = XCBuildConfiguration;
12541258
baseConfigurationReference = 7F2317062E3810C59D560D42 /* Pods-Tests-AlamofireLoggingTests-tvOS.debug.xcconfig */;
12551259
buildSettings = {
1256-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
12571260
CURRENT_PROJECT_VERSION = 1;
12581261
DEVELOPMENT_TEAM = 582762VK3P;
12591262
INFOPLIST_FILE = Tests/Info.plist;
@@ -1269,7 +1272,6 @@
12691272
isa = XCBuildConfiguration;
12701273
baseConfigurationReference = 8BF06AFE75A3BEA915D7C5DA /* Pods-Tests-AlamofireLoggingTests-tvOS.release.xcconfig */;
12711274
buildSettings = {
1272-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
12731275
CURRENT_PROJECT_VERSION = 1;
12741276
DEVELOPMENT_TEAM = 582762VK3P;
12751277
INFOPLIST_FILE = Tests/Info.plist;
@@ -1302,7 +1304,6 @@
13021304
SDKROOT = macosx;
13031305
SKIP_INSTALL = YES;
13041306
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1305-
SWIFT_VERSION = 3.0;
13061307
};
13071308
name = Debug;
13081309
};
@@ -1326,15 +1327,13 @@
13261327
PRODUCT_NAME = AlamofireLogging;
13271328
SDKROOT = macosx;
13281329
SKIP_INSTALL = YES;
1329-
SWIFT_VERSION = 3.0;
13301330
};
13311331
name = Release;
13321332
};
13331333
A3169E211DE072C800BABAFD /* Debug */ = {
13341334
isa = XCBuildConfiguration;
13351335
baseConfigurationReference = 3578D3909F1F4C9482DBE2DF /* Pods-Tests-AlamofireLoggingTests-OSX.debug.xcconfig */;
13361336
buildSettings = {
1337-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
13381337
COMBINE_HIDPI_IMAGES = YES;
13391338
CURRENT_PROJECT_VERSION = 1;
13401339
DEVELOPMENT_TEAM = 582762VK3P;
@@ -1351,7 +1350,6 @@
13511350
isa = XCBuildConfiguration;
13521351
baseConfigurationReference = D8EA6C30A4AFD555E9C142D4 /* Pods-Tests-AlamofireLoggingTests-OSX.release.xcconfig */;
13531352
buildSettings = {
1354-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
13551353
COMBINE_HIDPI_IMAGES = YES;
13561354
CURRENT_PROJECT_VERSION = 1;
13571355
DEVELOPMENT_TEAM = 582762VK3P;

‎AlamofireLogging.xcodeproj/xcshareddata/xcschemes/AlamofireLogging-OSX.xcscheme‎

Lines changed: 3 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 = "0820"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -55,6 +56,7 @@
5556
buildConfiguration = "Debug"
5657
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5758
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59+
language = ""
5860
launchStyle = "0"
5961
useCustomWorkingDirectory = "NO"
6062
ignoresPersistentStateOnLaunch = "NO"

‎AlamofireLogging.xcodeproj/xcshareddata/xcschemes/AlamofireLogging-iOS.xcscheme‎

Lines changed: 3 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 = "0820"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES"
3031
codeCoverageEnabled = "YES">
3132
<Testables>
@@ -56,6 +57,7 @@
5657
buildConfiguration = "Debug"
5758
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5859
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60+
language = ""
5961
launchStyle = "0"
6062
useCustomWorkingDirectory = "NO"
6163
ignoresPersistentStateOnLaunch = "NO"

‎AlamofireLogging.xcodeproj/xcshareddata/xcschemes/AlamofireLogging-tvOS.xcscheme‎

Lines changed: 3 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 = "0820"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -55,6 +56,7 @@
5556
buildConfiguration = "Debug"
5657
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5758
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59+
language = ""
5860
launchStyle = "0"
5961
useCustomWorkingDirectory = "NO"
6062
ignoresPersistentStateOnLaunch = "NO"

‎AlamofireLogging.xcodeproj/xcshareddata/xcschemes/AlamofireLogging-watchOS.xcscheme‎

Lines changed: 3 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 = "0820"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -36,6 +37,7 @@
3637
buildConfiguration = "Debug"
3738
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3839
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40+
language = ""
3941
launchStyle = "0"
4042
useCustomWorkingDirectory = "NO"
4143
ignoresPersistentStateOnLaunch = "NO"

‎CHANGELOG.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
# Change Log
22

33
All notable changes to this project will be documented in this file.
4-
`alamofire-logging-swift` adheres to [Semantic Versioning](http://semver.org/).
4+
`alamofire-logging` adheres to [Semantic Versioning](http://semver.org/).
5+
6+
---
7+
8+
## [1.0.1](https://github.com/Digipolitan/alamofire-logging/releases/tag/v1.0.1)
9+
10+
update project xcode9 support
11+
update travis & swift 4 support & rename git
512

613
---

‎CONTRIBUTING.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Contributing to alamofire-logging-swift
1+
# Contributing to alamofire-logging
22

33
First off, thanks for taking the time to contribute! :tada::+1:
44

@@ -43,19 +43,19 @@ Explain the problem and include additional details to help maintainers reproduce
4343
* **Describe the behavior you observed after following the steps** and point out what exactly is the problem with that behavior.
4444
* **Explain which behavior you expected to see instead and why.**
4545
* **Include screenshots and animated GIFs** which show you following the described steps and clearly demonstrate the problem.
46-
* **If you're reporting that alamofire-logging-swift crashed**, include a crash report with a stack trace from the operating system. On iOS, the crash report is available in Xcode, on macOS, the crash report will be available in `Console.app` under "Diagnostic and usage information" > "User diagnostic reports". Include the crash report in the issue in a [code block](https://help.github.com/articles/markdown-basics/#multiple-lines), a [file attachment](https://help.github.com/articles/file-attachments-on-issues-and-pull-requests/), or put it in a [gist](https://gist.github.com/) and provide link to that gist.
46+
* **If you're reporting that alamofire-logging crashed**, include a crash report with a stack trace from the operating system. On iOS, the crash report is available in Xcode, on macOS, the crash report will be available in `Console.app` under "Diagnostic and usage information" > "User diagnostic reports". Include the crash report in the issue in a [code block](https://help.github.com/articles/markdown-basics/#multiple-lines), a [file attachment](https://help.github.com/articles/file-attachments-on-issues-and-pull-requests/), or put it in a [gist](https://gist.github.com/) and provide link to that gist.
4747
* **If the problem is related to performance**, include a CPU profile capture and a screenshot with your report.
4848
* **If the problem wasn't triggered by a specific action**, describe what you were doing before the problem happened and share more information using the guidelines below.
4949

5050
Provide more context by answering these questions:
5151

52-
* **Did the problem start happening recently** (e.g. after updating to a new version of alamofire-logging-swift) or was this always a problem?
53-
* If the problem started happening recently, **can you reproduce the problem in an older version of alamofire-logging-swift ?** What's the most recent version in which the problem doesn't happen? You can download older versions of alamofire-logging-swift from [the releases page](https://github.com/digipolitan/alamofire-logging-swift/releases).
52+
* **Did the problem start happening recently** (e.g. after updating to a new version of alamofire-logging) or was this always a problem?
53+
* If the problem started happening recently, **can you reproduce the problem in an older version of alamofire-logging ?** What's the most recent version in which the problem doesn't happen? You can download older versions of alamofire-logging from [the releases page](https://github.com/digipolitan/alamofire-logging/releases).
5454
* **Can you reliably reproduce the issue?** If not, provide details about how often the problem happens and under which conditions it normally happens.
5555

5656
Include details about your configuration and environment:
5757

58-
* **Which version of alamofire-logging-swift are you using?
58+
* **Which version of alamofire-logging are you using?
5959
* **What's the name and version of the macOS or iOS you're using**?
6060

6161
#### Template For Submitting Bug Reports
@@ -80,7 +80,7 @@ Include details about your configuration and environment:
8080

8181
![Screenshots and GIFs which follow reproduction steps to demonstrate the problem](url)
8282

83-
**alamofire-logging-swift version:** [Enter alamofire-logging-swift version here]
83+
**alamofire-logging version:** [Enter alamofire-logging version here]
8484
**OS and version:** [Enter macOS / iOS / linux name and version here]
8585

8686
**Installed packages:**
@@ -89,6 +89,6 @@ Include details about your configuration and environment:
8989

9090
**Additional information:**
9191

92-
* Problem started happening recently, didn't happen in an older version of alamofire-logging-swift: [Yes/No]
92+
* Problem started happening recently, didn't happen in an older version of alamofire-logging: [Yes/No]
9393
* Problem can be reliably reproduced, doesn't happen randomly: [Yes/No]
9494
* Problem happens with all files and projects, not only some files or projects: [Yes/No]

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
AlamofireLogging
22
=================================
33

4-
[![Build Status](https://travis-ci.org/Digipolitan/alamofire-logging-swift.svg?branch=master)](https://travis-ci.org/Digipolitan/alamofire-logging-swift)
4+
[![Build Status](https://travis-ci.org/Digipolitan/alamofire-logging.svg?branch=master)](https://travis-ci.org/Digipolitan/alamofire-logging)
55
[![CocoaPods Compatible](https://img.shields.io/cocoapods/v/AlamofireLogging.svg)](https://img.shields.io/cocoapods/v/AlamofireLogging.svg)
66
[![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
77
[![Platform](https://img.shields.io/cocoapods/p/AlamofireLogging.svg?style=flat)](http://cocoadocs.org/docsets/AlamofireLogging)

0 commit comments

Comments
 (0)