Skip to content

Commit da5d0dd

Browse files
bbriattebbriatte
committed
Merge branch 'release/1.0.2'
2 parents 5052ebb + f6f8216 commit da5d0dd

File tree

33 files changed

+238
-61
lines changed

33 files changed

+238
-61
lines changed

‎.swift-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4.0

‎.travis.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@ branches:
1010
notifications:
1111
email: false
1212
before_install:
13-
- brew update
1413
- gem install bundler
14+
- brew update
1515
- bundle install && brew bundle
16-
- bundle exec pod repo update
17-
script:
18-
- bundle exec fastlane run_tests
19-
after_success:
20-
- bundle exec fastlane ci_framework_deploy
16+
install: bundle exec pod install --repo-update --silent
17+
script: bundle exec fastlane run_tests
18+
after_success: bundle exec fastlane ci_framework_deploy

‎AlamofireLogging.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "AlamofireLogging"
3-
s.version = "1.0.1"
3+
s.version = "1.0.2"
44
s.summary = "Logging support for Alamofire"
55
s.homepage = "https://github.com/Digipolitan/alamofire-logging"
66
s.authors = "Digipolitan"

‎AlamofireLogging.xcodeproj/project.pbxproj‎

Lines changed: 44 additions & 30 deletions
Large diffs are not rendered by default.

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
55

66
---
77

8+
## [1.0.2](https://github.com/Digipolitan/alamofire-logging/releases/tag/v1.0.2)
9+
10+
update to swift 4 & spm4
11+
update travis
12+
update readme
13+
14+
---
15+
816
## [1.0.1](https://github.com/Digipolitan/alamofire-logging/releases/tag/v1.0.1)
917

1018
update project xcode9 support

‎Package.swift‎

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,27 @@
1+
// swift-tools-version:4.0
2+
13
import PackageDescription
24

35
let package = Package(
4-
name: "AlamofireLogging",
5-
dependencies: [
6-
.Package(url: "https://github.com/Alamofire/Alamofire.git", versions: Version(4, 0, 0)..<Version(5, 0, 0))
7-
],
8-
exclude: [
9-
"Tests",
10-
"Samples"
11-
]
6+
name: "AlamofireLogging",
7+
products: [
8+
.library(name: "AlamofireLogging", targets: ["AlamofireLogging"])
9+
],
10+
dependencies: [
11+
.package(url: "https://github.com/Alamofire/Alamofire.git", from: "4.0.0")
12+
],
13+
targets: [
14+
.target(
15+
name: "AlamofireLogging",
16+
dependencies: [
17+
"Alamofire"
18+
]
19+
),
20+
.testTarget(
21+
name: "AlamofireLoggingTests",
22+
dependencies: [
23+
"AlamofireLogging"
24+
]
25+
)
26+
]
1227
)

‎README.md‎

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
AlamofireLogging
1+
Alamofire+Logging
22
=================================
33

4+
[![Swift Version](https://img.shields.io/badge/swift-4.0-orange.svg?style=flat)](https://developer.apple.com/swift/)
45
[![Build Status](https://travis-ci.org/Digipolitan/alamofire-logging.svg?branch=master)](https://travis-ci.org/Digipolitan/alamofire-logging)
56
[![CocoaPods Compatible](https://img.shields.io/cocoapods/v/AlamofireLogging.svg)](https://img.shields.io/cocoapods/v/AlamofireLogging.svg)
6-
[![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
7+
[![Carthage Compatible](https://img.shields.io/badge/carthage-compatible-brightgreen.svg?style=flat)](https://github.com/Carthage/Carthage)
8+
[![Swift Package Manager Compatible](https://img.shields.io/badge/swift%20package%20manager-compatible-brightgreen.svg?style=flat)](https://swift.org/package-manager/)
79
[![Platform](https://img.shields.io/cocoapods/p/AlamofireLogging.svg?style=flat)](http://cocoadocs.org/docsets/AlamofireLogging)
810
[![Twitter](https://img.shields.io/badge/twitter-@Digipolitan-blue.svg?style=flat)](http://twitter.com/Digipolitan)
911

@@ -13,16 +15,47 @@ Logging support for Alamofire
1315

1416
### CocoaPods
1517

16-
To install AlamofireLogging with CocoaPods, add the following lines to your `Podfile`.
18+
To install Alamofire+Logging with CocoaPods, add the following lines to your `Podfile`.
1719

1820
```ruby
1921
source 'https://github.com/CocoaPods/Specs.git'
20-
platform :ios, '8.0' # or platform :osx, '10.10' if your target is OS X.
22+
platform :ios, '9.0'
2123
use_frameworks!
2224

2325
pod 'AlamofireLogging'
2426
```
2527

28+
### Carthage
29+
30+
[Carthage](https://github.com/Carthage/Carthage) is a decentralized dependency manager that builds your dependencies and provides you with binary frameworks.
31+
32+
You can install Carthage with [Homebrew](http://brew.sh/) using the following command:
33+
34+
```bash
35+
$ brew update
36+
$ brew install carthage
37+
```
38+
39+
To integrate Alamofire+Logging into your Xcode project using Carthage, specify it in your `Cartfile`:
40+
41+
```
42+
github 'Digipolitan/alamofire-logging' ~> 1.0
43+
```
44+
45+
Run `carthage update` to build the framework and drag the built `AlamofireLogging.framework` into your Xcode project.
46+
47+
### Swift Package Manager
48+
49+
The [Swift Package Manager](https://swift.org/package-manager/) is a tool for automating the distribution of Swift code and is integrated into the `swift` compiler.
50+
51+
Once you have your Swift package set up, adding Alamofire+Logging as a dependency is as easy as adding it to the `dependencies` value of your `Package.swift`.
52+
53+
```swift
54+
dependencies: [
55+
.package(url: "https://github.com/Digipolitan/alamofire-logging.git", from: "1.0.0")
56+
]
57+
```
58+
2659
## How to use ?
2760

2861
```swift
@@ -51,4 +84,4 @@ unacceptable behavior to [contact@digipolitan.com](mailto:contact@digipolitan.co
5184

5285
## License
5386

54-
AlamofireLogging is licensed under the [BSD 3-Clause license](LICENSE).
87+
Alamofire+Logging is licensed under the [BSD 3-Clause license](LICENSE).

‎Samples/AlamofireLoggingSample-OSX/AlamofireLoggingSample-OSX.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@
302302
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
303303
GCC_WARN_UNUSED_FUNCTION = YES;
304304
GCC_WARN_UNUSED_VARIABLE = YES;
305-
MACOSX_DEPLOYMENT_TARGET = 10.9;
305+
MACOSX_DEPLOYMENT_TARGET = 10.10;
306306
MTL_ENABLE_DEBUG_INFO = YES;
307307
ONLY_ACTIVE_ARCH = YES;
308308
SDKROOT = macosx;
@@ -354,7 +354,7 @@
354354
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
355355
GCC_WARN_UNUSED_FUNCTION = YES;
356356
GCC_WARN_UNUSED_VARIABLE = YES;
357-
MACOSX_DEPLOYMENT_TARGET = 10.9;
357+
MACOSX_DEPLOYMENT_TARGET = 10.10;
358358
MTL_ENABLE_DEBUG_INFO = NO;
359359
SDKROOT = macosx;
360360
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

‎Samples/AlamofireLoggingSample-OSX/AlamofireLoggingSample-OSX/AppDelegate.swift‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//
88

99
import Cocoa
10+
import Alamofire
1011
import AlamofireLogging
1112

1213
@NSApplicationMain
@@ -15,6 +16,14 @@ class AppDelegate: NSObject, NSApplicationDelegate {
1516
@IBOutlet weak var window: NSWindow!
1617

1718
func applicationDidFinishLaunching(_ aNotification: Notification) {
19+
SessionManager.default.request("http://date.jsontest.com").log(level: .verbose).responseJSON { (response) in
20+
switch response.result {
21+
case .success(let value):
22+
print("Alamofire \(value)")
23+
case .failure(let error):
24+
print("\(error)")
25+
}
26+
}
1827
}
1928

2029
func applicationWillTerminate(_ aNotification: Notification) {

‎Samples/AlamofireLoggingSample-OSX/AlamofireLoggingSample-OSX/Info.plist‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,10 @@
2828
<string>MainMenu</string>
2929
<key>NSPrincipalClass</key>
3030
<string>NSApplication</string>
31+
<key>NSAppTransportSecurity</key>
32+
<dict>
33+
<key>NSAllowsArbitraryLoads</key>
34+
<true/>
35+
</dict>
3136
</dict>
3237
</plist>

0 commit comments

Comments
 (0)