Merge remote-tracking branch 'origin/master'

dastrobu · Dec 4, 2018 · 441e854 · 441e854
2 parents b51abd1 + 4fc9362
commit 441e854
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -6,17 +6,17 @@
         "repositoryURL": "https://github.com/IBM-Swift/HeliumLogger.git",
         "state": {
           "branch": null,
-          "revision": "2afeb4c02f5a48a7fbd081fe8607b91eeebd7ecb",
-          "version": "1.7.1"
+          "revision": "5ad546a39376b911a6cd4b06e8cadf60aa9e9472",
+          "version": "1.8.0"
         }
       },
       {
         "package": "LoggerAPI",
         "repositoryURL": "https://github.com/IBM-Swift/LoggerAPI.git",
         "state": {
           "branch": null,
-          "revision": "5041f2673aa75d6e973d9b6bd3956bc5068387c8",
-          "version": "1.7.3"
+          "revision": "d0ccb4158b83f8692531892a9c894bb757593c6f",
+          "version": "1.8.0"
         }
       }
     ]

diff --git a/Package.swift b/Package.swift
@@ -12,8 +12,8 @@ let package = Package(
             ]),
     ],
     dependencies: [
-        .package(url: "https://github.com/IBM-Swift/LoggerAPI.git", from: "1.7.0"),
-        .package(url: "https://github.com/IBM-Swift/HeliumLogger.git", from: "1.7.0")
+        .package(url: "https://github.com/IBM-Swift/LoggerAPI.git", from: "1.8.0"),
+        .package(url: "https://github.com/IBM-Swift/HeliumLogger.git", from: "1.8.0")
     ],
     targets: [
         .target(

diff --git a/README.md b/README.md
@@ -533,7 +533,7 @@ To activate logging, one must configure a logger. A simple logger is e.g.
 ```swift
 import LoggerAPI
 import HeliumLogger
-Log.log = HeliumLogger(.debug)
+Log.logger = HeliumLogger(.debug)
 
 let argTree = ArgTree()
 try! argtree.parse()

diff --git a/Sources/parsers/Option.swift b/Sources/parsers/Option.swift
@@ -88,14 +88,14 @@ open class OptionParser<T>: ValueParser<T> {
 }
 
 public class Option: OptionParser<String> {
-    override init(longName: String? = nil,
-                  shortName: String? = nil,
-                  description: String? = nil,
-                  longPrefix: String = "--",
-                  shortPrefix: String = "-",
-                  multiAllowed: Bool = false,
-                  stopToken: String? = "--",
-                  parsed: OnValueParsed<String>? = nil) {
+    public override init(longName: String? = nil,
+                         shortName: String? = nil,
+                         description: String? = nil,
+                         longPrefix: String = "--",
+                         shortPrefix: String = "-",
+                         multiAllowed: Bool = false,
+                         stopToken: String? = "--",
+                         parsed: OnValueParsed<String>? = nil) {
         super.init(longName: longName,
             shortName: shortName,
             description: description,
@@ -170,6 +170,7 @@ public class DoubleOption: OptionParser<Double> {
             throw OptionParseError.valueNotDoubleConvertible(option: self, atIndex: i, value: value)
         }
     }
+
     public override var debugDescription: String {
         return "\(String(describing: DoubleOption.self))(\(aliases))"
     }