Skip to content

Commit ebe3edb

Browse files
committed
update travis & swift 4 support & rename git
1 parent 80cf67d commit ebe3edb

File tree

10 files changed

+22
-40
lines changed

10 files changed

+22
-40
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ Pod::Spec.new do |s|
22
s.name = "AlamofireLogging"
33
s.version = "1.0.0"
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: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1029,7 +1029,7 @@
10291029
SDKROOT = iphoneos;
10301030
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
10311031
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1032-
SWIFT_VERSION = 3.0;
1032+
SWIFT_VERSION = 4.0;
10331033
TARGETED_DEVICE_FAMILY = "1,2";
10341034
VERSIONING_SYSTEM = "apple-generic";
10351035
VERSION_INFO_PREFIX = "";
@@ -1074,7 +1074,7 @@
10741074
MTL_ENABLE_DEBUG_INFO = NO;
10751075
SDKROOT = iphoneos;
10761076
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1077-
SWIFT_VERSION = 3.0;
1077+
SWIFT_VERSION = 4.0;
10781078
TARGETED_DEVICE_FAMILY = "1,2";
10791079
VALIDATE_PRODUCT = YES;
10801080
VERSIONING_SYSTEM = "apple-generic";
@@ -1100,7 +1100,6 @@
11001100
PRODUCT_NAME = AlamofireLogging;
11011101
SKIP_INSTALL = YES;
11021102
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1103-
SWIFT_VERSION = 3.0;
11041103
};
11051104
name = Debug;
11061105
};
@@ -1121,15 +1120,13 @@
11211120
PRODUCT_BUNDLE_IDENTIFIER = com.digipolitan.alamofirelogging;
11221121
PRODUCT_NAME = AlamofireLogging;
11231122
SKIP_INSTALL = YES;
1124-
SWIFT_VERSION = 3.0;
11251123
};
11261124
name = Release;
11271125
};
11281126
A3169DC81DE05E8300BABAFD /* Debug */ = {
11291127
isa = XCBuildConfiguration;
11301128
baseConfigurationReference = 48A60D07B65287DB839DD2DF /* Pods-Tests-AlamofireLoggingTests-iOS.debug.xcconfig */;
11311129
buildSettings = {
1132-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
11331130
CURRENT_PROJECT_VERSION = 1;
11341131
DEVELOPMENT_TEAM = 582762VK3P;
11351132
INFOPLIST_FILE = Tests/Info.plist;
@@ -1143,7 +1140,6 @@
11431140
isa = XCBuildConfiguration;
11441141
baseConfigurationReference = 03022444139FE7FDB4C2068F /* Pods-Tests-AlamofireLoggingTests-iOS.release.xcconfig */;
11451142
buildSettings = {
1146-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
11471143
CURRENT_PROJECT_VERSION = 1;
11481144
DEVELOPMENT_TEAM = 582762VK3P;
11491145
INFOPLIST_FILE = Tests/Info.plist;
@@ -1172,7 +1168,6 @@
11721168
SDKROOT = watchos;
11731169
SKIP_INSTALL = YES;
11741170
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1175-
SWIFT_VERSION = 3.0;
11761171
TARGETED_DEVICE_FAMILY = 4;
11771172
WATCHOS_DEPLOYMENT_TARGET = 2.0;
11781173
};
@@ -1196,7 +1191,6 @@
11961191
PRODUCT_NAME = AlamofireLogging;
11971192
SDKROOT = watchos;
11981193
SKIP_INSTALL = YES;
1199-
SWIFT_VERSION = 3.0;
12001194
TARGETED_DEVICE_FAMILY = 4;
12011195
WATCHOS_DEPLOYMENT_TARGET = 2.0;
12021196
};
@@ -1220,7 +1214,6 @@
12201214
SDKROOT = appletvos;
12211215
SKIP_INSTALL = YES;
12221216
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1223-
SWIFT_VERSION = 3.0;
12241217
TARGETED_DEVICE_FAMILY = 3;
12251218
TVOS_DEPLOYMENT_TARGET = 9.0;
12261219
};
@@ -1243,7 +1236,6 @@
12431236
PRODUCT_NAME = AlamofireLogging;
12441237
SDKROOT = appletvos;
12451238
SKIP_INSTALL = YES;
1246-
SWIFT_VERSION = 3.0;
12471239
TARGETED_DEVICE_FAMILY = 3;
12481240
TVOS_DEPLOYMENT_TARGET = 9.0;
12491241
};
@@ -1253,7 +1245,6 @@
12531245
isa = XCBuildConfiguration;
12541246
baseConfigurationReference = 7F2317062E3810C59D560D42 /* Pods-Tests-AlamofireLoggingTests-tvOS.debug.xcconfig */;
12551247
buildSettings = {
1256-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
12571248
CURRENT_PROJECT_VERSION = 1;
12581249
DEVELOPMENT_TEAM = 582762VK3P;
12591250
INFOPLIST_FILE = Tests/Info.plist;
@@ -1269,7 +1260,6 @@
12691260
isa = XCBuildConfiguration;
12701261
baseConfigurationReference = 8BF06AFE75A3BEA915D7C5DA /* Pods-Tests-AlamofireLoggingTests-tvOS.release.xcconfig */;
12711262
buildSettings = {
1272-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
12731263
CURRENT_PROJECT_VERSION = 1;
12741264
DEVELOPMENT_TEAM = 582762VK3P;
12751265
INFOPLIST_FILE = Tests/Info.plist;
@@ -1302,7 +1292,6 @@
13021292
SDKROOT = macosx;
13031293
SKIP_INSTALL = YES;
13041294
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1305-
SWIFT_VERSION = 3.0;
13061295
};
13071296
name = Debug;
13081297
};
@@ -1326,15 +1315,13 @@
13261315
PRODUCT_NAME = AlamofireLogging;
13271316
SDKROOT = macosx;
13281317
SKIP_INSTALL = YES;
1329-
SWIFT_VERSION = 3.0;
13301318
};
13311319
name = Release;
13321320
};
13331321
A3169E211DE072C800BABAFD /* Debug */ = {
13341322
isa = XCBuildConfiguration;
13351323
baseConfigurationReference = 3578D3909F1F4C9482DBE2DF /* Pods-Tests-AlamofireLoggingTests-OSX.debug.xcconfig */;
13361324
buildSettings = {
1337-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
13381325
COMBINE_HIDPI_IMAGES = YES;
13391326
CURRENT_PROJECT_VERSION = 1;
13401327
DEVELOPMENT_TEAM = 582762VK3P;
@@ -1351,7 +1338,6 @@
13511338
isa = XCBuildConfiguration;
13521339
baseConfigurationReference = D8EA6C30A4AFD555E9C142D4 /* Pods-Tests-AlamofireLoggingTests-OSX.release.xcconfig */;
13531340
buildSettings = {
1354-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
13551341
COMBINE_HIDPI_IMAGES = YES;
13561342
CURRENT_PROJECT_VERSION = 1;
13571343
DEVELOPMENT_TEAM = 582762VK3P;

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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/).
55

66
---

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)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@
302302
SDKROOT = macosx;
303303
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
304304
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
305+
SWIFT_VERSION = 4.0;
305306
VERSIONING_SYSTEM = "apple-generic";
306307
};
307308
name = Debug;
@@ -345,6 +346,7 @@
345346
MTL_ENABLE_DEBUG_INFO = NO;
346347
SDKROOT = macosx;
347348
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
349+
SWIFT_VERSION = 4.0;
348350
VERSIONING_SYSTEM = "apple-generic";
349351
};
350352
name = Release;
@@ -360,7 +362,6 @@
360362
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
361363
PRODUCT_BUNDLE_IDENTIFIER = "com.digipolitan.AlamofireLoggingSample-OSX";
362364
PRODUCT_NAME = "$(TARGET_NAME)";
363-
SWIFT_VERSION = 3.0;
364365
};
365366
name = Debug;
366367
};
@@ -375,7 +376,6 @@
375376
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
376377
PRODUCT_BUNDLE_IDENTIFIER = "com.digipolitan.AlamofireLoggingSample-OSX";
377378
PRODUCT_NAME = "$(TARGET_NAME)";
378-
SWIFT_VERSION = 3.0;
379379
};
380380
name = Release;
381381
};

Samples/AlamofireLoggingSample-iOS/AlamofireLoggingSample-iOS.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@
310310
SDKROOT = iphoneos;
311311
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
312312
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
313+
SWIFT_VERSION = 4.0;
313314
VERSIONING_SYSTEM = "apple-generic";
314315
};
315316
name = Debug;
@@ -353,6 +354,7 @@
353354
MTL_ENABLE_DEBUG_INFO = NO;
354355
SDKROOT = iphoneos;
355356
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
357+
SWIFT_VERSION = 4.0;
356358
VALIDATE_PRODUCT = YES;
357359
VERSIONING_SYSTEM = "apple-generic";
358360
};
@@ -369,7 +371,6 @@
369371
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
370372
PRODUCT_BUNDLE_IDENTIFIER = "com.digipolitan.AlamofireLoggingSample-iOS";
371373
PRODUCT_NAME = "$(TARGET_NAME)";
372-
SWIFT_VERSION = 3.0;
373374
};
374375
name = Debug;
375376
};
@@ -384,7 +385,6 @@
384385
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
385386
PRODUCT_BUNDLE_IDENTIFIER = "com.digipolitan.AlamofireLoggingSample-iOS";
386387
PRODUCT_NAME = "$(TARGET_NAME)";
387-
SWIFT_VERSION = 3.0;
388388
};
389389
name = Release;
390390
};

Samples/AlamofireLoggingSample-tvOS/AlamofireLoggingSample-tvOS.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@
299299
SDKROOT = appletvos;
300300
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
301301
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
302+
SWIFT_VERSION = 4.0;
302303
TARGETED_DEVICE_FAMILY = 3;
303304
TVOS_DEPLOYMENT_TARGET = 10.1;
304305
VERSIONING_SYSTEM = "apple-generic";
@@ -342,6 +343,7 @@
342343
MTL_ENABLE_DEBUG_INFO = NO;
343344
SDKROOT = appletvos;
344345
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
346+
SWIFT_VERSION = 4.0;
345347
TARGETED_DEVICE_FAMILY = 3;
346348
TVOS_DEPLOYMENT_TARGET = 10.1;
347349
VALIDATE_PRODUCT = YES;
@@ -360,7 +362,6 @@
360362
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
361363
PRODUCT_BUNDLE_IDENTIFIER = "com.digipolitan.AlamofireLoggingSample-tvOS";
362364
PRODUCT_NAME = "$(TARGET_NAME)";
363-
SWIFT_VERSION = 3.0;
364365
TVOS_DEPLOYMENT_TARGET = 9.0;
365366
};
366367
name = Debug;
@@ -376,7 +377,6 @@
376377
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
377378
PRODUCT_BUNDLE_IDENTIFIER = "com.digipolitan.AlamofireLoggingSample-tvOS";
378379
PRODUCT_NAME = "$(TARGET_NAME)";
379-
SWIFT_VERSION = 3.0;
380380
TVOS_DEPLOYMENT_TARGET = 9.0;
381381
};
382382
name = Release;

Samples/AlamofireLoggingSample-watchOS/AlamofireLoggingSample-watchOS.xcodeproj/project.pbxproj

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,7 @@
582582
SDKROOT = iphoneos;
583583
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
584584
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
585+
SWIFT_VERSION = 4.0;
585586
VERSIONING_SYSTEM = "apple-generic";
586587
};
587588
name = Debug;
@@ -625,6 +626,7 @@
625626
MTL_ENABLE_DEBUG_INFO = NO;
626627
SDKROOT = iphoneos;
627628
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
629+
SWIFT_VERSION = 4.0;
628630
VALIDATE_PRODUCT = YES;
629631
VERSIONING_SYSTEM = "apple-generic";
630632
};
@@ -642,7 +644,6 @@
642644
PRODUCT_NAME = "${TARGET_NAME}";
643645
SDKROOT = watchos;
644646
SKIP_INSTALL = YES;
645-
SWIFT_VERSION = 3.0;
646647
TARGETED_DEVICE_FAMILY = 4;
647648
WATCHOS_DEPLOYMENT_TARGET = 2.0;
648649
};
@@ -660,7 +661,6 @@
660661
PRODUCT_NAME = "${TARGET_NAME}";
661662
SDKROOT = watchos;
662663
SKIP_INSTALL = YES;
663-
SWIFT_VERSION = 3.0;
664664
TARGETED_DEVICE_FAMILY = 4;
665665
WATCHOS_DEPLOYMENT_TARGET = 2.0;
666666
};
@@ -678,7 +678,6 @@
678678
PRODUCT_NAME = "$(TARGET_NAME)";
679679
SDKROOT = watchos;
680680
SKIP_INSTALL = YES;
681-
SWIFT_VERSION = 3.0;
682681
TARGETED_DEVICE_FAMILY = 4;
683682
WATCHOS_DEPLOYMENT_TARGET = 2.0;
684683
};
@@ -696,7 +695,6 @@
696695
PRODUCT_NAME = "$(TARGET_NAME)";
697696
SDKROOT = watchos;
698697
SKIP_INSTALL = YES;
699-
SWIFT_VERSION = 3.0;
700698
TARGETED_DEVICE_FAMILY = 4;
701699
WATCHOS_DEPLOYMENT_TARGET = 2.0;
702700
};
@@ -713,7 +711,6 @@
713711
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
714712
PRODUCT_BUNDLE_IDENTIFIER = "com.digipolitan.AlamofireLoggingSample-watchOS";
715713
PRODUCT_NAME = "$(TARGET_NAME)";
716-
SWIFT_VERSION = 3.0;
717714
};
718715
name = Debug;
719716
};
@@ -728,7 +725,6 @@
728725
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
729726
PRODUCT_BUNDLE_IDENTIFIER = "com.digipolitan.AlamofireLoggingSample-watchOS";
730727
PRODUCT_NAME = "$(TARGET_NAME)";
731-
SWIFT_VERSION = 3.0;
732728
};
733729
name = Release;
734730
};

0 commit comments

Comments
 (0)