Upgrade dependencies

.gitignore

@@ -1,5 +1,5 @@
 # Visual Studio Code
-.vscode/
+#.vscode/
 
 # Compiled Object files
 *.o
@@ -16,16 +16,22 @@
 
 # Executables
 *.exe
+*-test-*
 
 # DUB
 .dub
-dub.selections.json
+dub.*.json
 docs.json
 __dummy.html
 
 # Code coverage
 *.lst
 
-# Examples
+# Idea
+*.iml
 
-*-test-library
+# crash file
+core
+
+# others
+*.tar.gz

dub.json

@@ -1,10 +1,10 @@
 {
     "name": "hunt-time",
     "description": "A time library for D programming language.",
-    "copyright": "Copyright (C) 2018-2019, HuntLabs",
+    "copyright": "Copyright (C) 2018-2020, HuntLabs",
     "homepage": "https://www.huntlabs.net",
     "license": "Apache-2.0",
     "dependencies": {
-        "hunt" : "~>1.4.0"
+        "hunt-extra": "~>1.0.0"
     }
 }

examples/UnitTest/.vscode/launch.json

@@ -0,0 +1,28 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+
+        {
+            "name": "(gdb) Launch",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/time-demo",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+            "externalConsole": false,
+            "MIMode": "gdb",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ]
+        }
+    ]
+}

source/hunt/time/Duration.d

@@ -36,7 +36,7 @@ import hunt.Functions;
 import hunt.Long;
 import hunt.math.Helper;
 import hunt.text.Common;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 import hunt.util.Common;
 import hunt.util.Comparator;
 import hunt.util.Serialize;

source/hunt/time/LocalDate.d

@@ -50,7 +50,7 @@ import hunt.time.ZonedDateTime;
 import hunt.time.ZoneOffset;
 import hunt.time.Year;
 import hunt.time.Exceptions;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 import hunt.math.Helper;
 import hunt.time.Ser;
 import hunt.util.Comparator;

source/hunt/time/LocalTime.d

@@ -43,7 +43,7 @@ import hunt.time.LocalDate;
 import hunt.time.OffsetTime;
 import hunt.time.ZoneOffset;
 import hunt.time.Exceptions;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 import hunt.time.Ser;
 import hunt.time.Duration;
 import std.conv;

source/hunt/time/MonthDay.d

@@ -44,7 +44,7 @@ import hunt.time.Ser;
 import hunt.time.util.Common;
 import hunt.math.Helper;
 import hunt.Functions;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 import hunt.util.Common;
 
 import std.conv;

source/hunt/time/Period.d

@@ -43,7 +43,7 @@ import hunt.time.Ser;
 import hunt.text.Common;
 import std.conv;
 import std.regex;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 import hunt.time.util.QueryHelper;
 import hunt.time.util.Common;
 // import hunt.util.regex.Matcher;

source/hunt/time/YearMonth.d

@@ -49,7 +49,7 @@ import hunt.time.Exceptions;
 import hunt.time.Year;
 import hunt.util.Common;
 import hunt.time.Ser;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 /**
  * A year-month _in the ISO-8601 calendar system, such as {@code 2007-12}.
  * !(p)

source/hunt/time/ZoneId.d

@@ -33,7 +33,7 @@ import hunt.collection.HashSet;
 import hunt.collection;
 import hunt.time.ZoneOffset;
 import hunt.time.Ser;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 // import hunt.time.ZoneRegion;
 import std.algorithm.searching;
 import hunt.text.Common;

source/hunt/time/ZoneOffset.d

@@ -37,7 +37,7 @@ import hunt.collection;
 import hunt.text.Common;
 import hunt.util.Common;
 import hunt.time.Exceptions;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 import hunt.time.Ser;
 import hunt.time.util.QueryHelper;
 import hunt.time.util.Common;

source/hunt/time/chrono/ChronoLocalDateImpl.d

@@ -28,7 +28,7 @@ import hunt.time.chrono.Chronology;
 import hunt.Long;
 import hunt.math.Helper;
 import std.conv;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 /**
  * A date expressed _in terms of a standard year-month-day calendar system.
  * !(p)

source/hunt/time/chrono/ChronoPeriodImpl.d

@@ -35,7 +35,7 @@ import hunt.time.chrono.Chronology;
 import hunt.time.chrono.ChronoPeriod;
 import hunt.Integer;
 import hunt.math.Helper;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 import hunt.time.chrono.Ser;
 import hunt.time.util.QueryHelper;
 

source/hunt/time/format/CharLiteralPrinterParser.d

@@ -4,7 +4,7 @@ import hunt.time.format.DateTimeParseContext;
 import hunt.time.format.DateTimePrinterParser;
 import hunt.time.format.DateTimePrintContext;
 import hunt.time.temporal.TemporalField;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 
 import std.string;
 

source/hunt/time/format/ChronoPrinterParser.d

@@ -11,7 +11,7 @@ import hunt.time.temporal.TemporalField;
 import hunt.time.temporal.TemporalQueries;
 
 import hunt.collection.Set;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 import hunt.Exceptions;
 import hunt.util.Locale;
 

source/hunt/time/format/CompositePrinterParser.d

@@ -4,7 +4,7 @@ import hunt.time.format.DateTimeParseContext;
 import hunt.time.format.DateTimePrinterParser;
 import hunt.time.format.DateTimePrintContext;
 import hunt.time.temporal.TemporalField;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 
 import hunt.collection.List;
 

source/hunt/time/format/DateTimeFormatter.d

@@ -43,9 +43,10 @@ import hunt.time.util.QueryHelper;
 import hunt.Boolean;
 import hunt.Long;
 import hunt.collection;
-import hunt.text.StringBuilder;
+import hunt.util.Appendable;
 import hunt.util.Common;
 import hunt.util.Locale;
+import hunt.util.StringBuilder;
 
 import std.algorithm.searching;
 import std.conv;

source/hunt/time/format/DateTimeFormatterBuilder.d

@@ -67,7 +67,7 @@ import hunt.collection.Set;
 import hunt.Exceptions;
 import hunt.Long;
 import hunt.text.Common;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 import hunt.util.Common;
 import hunt.util.Comparator;
 import hunt.util.Locale;

source/hunt/time/format/DateTimePrinterParser.d

@@ -3,7 +3,7 @@ module hunt.time.format.DateTimePrinterParser;
 import hunt.time.format.DateTimeParseContext;
 import hunt.time.format.DateTimePrintContext;
 import hunt.time.temporal.TemporalField;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 
 //-----------------------------------------------------------------------
 /**

source/hunt/time/format/FractionPrinterParser.d

@@ -6,7 +6,7 @@ import hunt.time.format.DecimalStyle;
 import hunt.time.format.NumberPrinterParser;
 import hunt.time.format.SignStyle;
 import hunt.time.temporal.TemporalField;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 
 import hunt.Exceptions;
 import hunt.Long;

source/hunt/time/format/InstantPrinterParser.d

@@ -8,7 +8,7 @@ import hunt.time.format.DateTimePrinterParser;
 import hunt.time.format.DateTimePrintContext;
 import hunt.time.temporal.ChronoField;
 import hunt.time.temporal.TemporalField;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 
 import hunt.Exceptions;
 import hunt.Long;

source/hunt/time/format/LocalizedOffsetIdPrinterParser.d

@@ -6,7 +6,7 @@ import hunt.time.format.DateTimePrintContext;
 import hunt.time.format.TextStyle;
 import hunt.time.temporal.ChronoField;
 import hunt.time.temporal.TemporalField;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 
 
 import hunt.Long;

source/hunt/time/format/LocalizedPrinterParser.d

@@ -10,7 +10,7 @@ import hunt.time.format.FormatStyle;
 import hunt.time.temporal.TemporalField;
 import hunt.time.util.Common;
 // import hunt.time.util.Locale;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 
 import hunt.collection.HashMap;
 import hunt.collection.Map;

source/hunt/time/format/NumberPrinterParser.d

@@ -7,7 +7,7 @@ import hunt.time.format.DateTimePrintContext;
 import hunt.time.format.DecimalStyle;
 import hunt.time.format.SignStyle;
 import hunt.time.temporal.TemporalField;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 
 import hunt.Long;
 import hunt.math.BigInteger;

source/hunt/time/format/OffsetIdPrinterParser.d

@@ -8,7 +8,7 @@ import hunt.time.format.DateTimePrintContext;
 import hunt.time.temporal.ChronoField;
 import hunt.time.temporal.TemporalField;
 import hunt.time.util.Common;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 
 import hunt.Exceptions;
 import hunt.Long;

source/hunt/time/format/PadPrinterParserDecorator.d

@@ -6,7 +6,7 @@ import hunt.time.format.DateTimeParseContext;
 import hunt.time.format.DateTimePrinterParser;
 import hunt.time.format.DateTimePrintContext;
 import hunt.time.temporal.TemporalField;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 
 import hunt.Exceptions;
 

source/hunt/time/format/Parsed.d

@@ -36,7 +36,7 @@ import hunt.collection.HashMap;
 import hunt.collection.Iterator;
 import hunt.collection.Map;
 import std.conv;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 import hunt.collection.Set;
 import hunt.Long;
 import hunt.math.Helper;

source/hunt/time/format/PrefixTree.d

@@ -5,7 +5,7 @@ import hunt.time.text.ParsePosition;
 
 import hunt.collection.Set;
 import hunt.text.Common;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 
 import std.string;
 

source/hunt/time/format/ReducedPrinterParser.d

@@ -13,7 +13,7 @@ import hunt.time.format.NumberPrinterParser;
 import hunt.time.format.SignStyle;
 import hunt.time.temporal.TemporalField;
 import hunt.time.util.Common;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 
 import hunt.Exceptions;
 import hunt.Integer;

source/hunt/time/format/SettingsParser.d

@@ -4,7 +4,7 @@ import hunt.time.format.DateTimeParseContext;
 import hunt.time.format.DateTimePrinterParser;
 import hunt.time.format.DateTimePrintContext;
 import hunt.time.temporal.TemporalField;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 
 import hunt.time.util.Common;
 

source/hunt/time/format/StringLiteralPrinterParser.d

@@ -9,7 +9,7 @@ import hunt.time.format.TextStyle;
 import hunt.time.temporal.TemporalField;
 
 import hunt.text.Common;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 
 import hunt.Exceptions;
 import hunt.Long;

source/hunt/time/format/TextPrinterParser.d

@@ -16,7 +16,7 @@ import hunt.time.temporal.ChronoField;
 import hunt.time.temporal.TemporalField;
 import hunt.time.temporal.TemporalQueries;
 import hunt.time.util.QueryHelper;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 
 import hunt.collection.List;
 import hunt.collection.Map;

source/hunt/time/format/WeekBasedFieldPrinterParser.d

@@ -9,7 +9,7 @@ import hunt.time.format.SignStyle;
 import hunt.time.temporal.TemporalField;
 import hunt.time.temporal.WeekFields;
 
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 
 import hunt.Exceptions;
 import hunt.util.Locale;

source/hunt/time/format/ZoneIdPrinterParser.d

@@ -16,7 +16,7 @@ import hunt.time.ZoneId;
 import hunt.time.ZoneOffset;
 import hunt.time.ZoneRegion;
 import hunt.time.zone.ZoneRulesProvider;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 
 import hunt.Exceptions;
 import hunt.Integer;

source/hunt/time/format/ZoneTextPrinterParser.d

@@ -26,7 +26,7 @@ import hunt.collection.HashSet;
 import hunt.collection.Map;
 import hunt.collection.Set;
 import hunt.Integer;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 import hunt.util.Locale;
 
 //-----------------------------------------------------------------------

source/hunt/time/temporal/ValueRange.d

@@ -14,7 +14,7 @@ module hunt.time.temporal.ValueRange;
 import hunt.Exceptions;
 import std.conv;
 import hunt.Integer;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 import hunt.stream.Common;
 import hunt.time.Exceptions;
 import hunt.time.temporal.TemporalField;

source/hunt/time/zone/ZoneOffsetTransition.d

@@ -28,7 +28,7 @@ import hunt.Functions;
 import hunt.Integer;
 import hunt.util.Comparator;
 import hunt.util.Common;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 /**
  * A transition between two offsets caused by a discontinuity _in the local time-line.
  * !(p)

source/hunt/time/zone/ZoneOffsetTransitionRule.d

@@ -27,7 +27,7 @@ import hunt.time.Month;
 import hunt.time.ZoneOffset;
 import hunt.time.chrono.IsoChronology;
 import hunt.time.zone.ZoneOffsetTransition;
-import hunt.text.StringBuilder;
+import hunt.util.StringBuilder;
 import hunt.time.util.Common;
 
 import hunt.util.Common;