Merge pull request #68 from cquiroz/release_0.5.0

Release 0.5.0

Author: cquiroz

.travis.yml

@@ -3,7 +3,7 @@ language: scala
 scala:
   - 2.10.6
   - 2.11.8
-  - 2.12.0
+  - 2.12.1
 jdk:
   - oraclejdk8
 install:

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.5.0-cldr30
+
+* Added implementation of java.util.NumberFormat
+* Added implementation of java.util.DecimalFormat
+* Changed organization to io.github.cquiroz
+
 ## 0.4.0-cldr30
 
 * Added implementation of java.util.Currency

README.md

@@ -10,7 +10,7 @@
 Simply add the following line to your sbt settings:
 
 ```scala
-libraryDependencies += "com.github.cquiroz" %%% "scala-java-locales" % "0.4.0-cldr30"
+libraryDependencies += "io.github.cquiroz" %%% "scala-java-locales" % "0.5.0-cldr30"
 ```
 
 If you have a `crossProject`, the setting must be used only in the JS part:
@@ -19,7 +19,7 @@ If you have a `crossProject`, the setting must be used only in the JS part:
 lazy val myCross = crossProject.
   ...
   .jsSettings(
-    libraryDependencies += "com.github.cquiroz" %%% "scala-java-locales" % "0.4.0-cldr30"
+    libraryDependencies += "io.github.cquiroz" %%% "scala-java-locales" % "0.5.0-cldr30"
   )
 ```
 
@@ -91,7 +91,7 @@ A very simple `Scala.js` project is available at [scalajs-locales-demo](https://
 `scala-java-locales` uses [Semantic Versioning](http://semver.org/) and includes the CLDR version used as a build tag, e.g.:
 
 ```
-0.4.0-cldr30 // Version 0.4.0 with CLDR version 30
+0.5.0-cldr30 // Version 0.5.0 with CLDR version 30
 ```
 
 ## Contributors

build.sbt

@@ -8,10 +8,10 @@ lazy val downloadFromZip: TaskKey[Unit] =
 
 val commonSettings: Seq[Setting[_]] = Seq(
   cldrVersion        := "30",
-  version            := s"0.5.0-cldr${cldrVersion.value}-SNAPSHOT",
+  version            := s"0.5.0-cldr${cldrVersion.value}",
   organization       := "io.github.cquiroz",
   scalaVersion       := "2.11.8",
-  crossScalaVersions := Seq("2.10.4", "2.11.8", "2.12.0"),
+  crossScalaVersions := Seq("2.10.4", "2.11.8", "2.12.1"),
   scalacOptions      ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"),
   javaOptions        ++= Seq("-Dfile.encoding=UTF8"),
   mappings in (Compile, packageBin) ~= {
@@ -84,7 +84,7 @@ lazy val core: CrossProject = crossProject.crossType(CrossType.Pure).
   settings(
     name := "scala-java-locales",
     downloadFromZip := {
-      val xmlFiles = ((resourceDirectory in Compile) / "core").value
+      val xmlFiles = (resourceDirectory in Compile).value / "core"
       if (java.nio.file.Files.notExists(xmlFiles.toPath)) {
         println(s"CLDR files missing, downloading version ${cldrVersion.value} ...")
         IO.unzipURL(
@@ -94,10 +94,10 @@ lazy val core: CrossProject = crossProject.crossType(CrossType.Pure).
         println("CLDR files already available")
       }
     },
-    compile in Compile <<= (compile in Compile).dependsOn(downloadFromZip),
+    compile in Compile := (compile in Compile).dependsOn(downloadFromZip).value,
     sourceGenerators in Compile += Def.task {
       generateLocaleData((sourceManaged in Compile).value,
-        ((resourceDirectory in Compile) / "core").value)
+        (resourceDirectory in Compile).value / "core")
     }.taskValue
   ).
   jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin))

core/src/main/scala/java/text/DecimalFormat.scala

@@ -24,11 +24,11 @@ class DecimalFormat(private[this] val pattern: String, private[this] var symbols
   private var decimalSeparatorAlwaysShown: Boolean = false
   private var parseBigDecimal: Boolean = false
   private var currency: Currency = Currency.getInstance(Locale.getDefault)
-  
+
   // Helpers to avoid using .compareTo, annoying have to re-import within defs
   private val bigIntegerOrdering = implicitly[Ordering[JavaBigInteger]]
   import bigIntegerOrdering.mkOrderingOps
-      
+
   private val bigDecimalOrdering = implicitly[Ordering[JavaBigDecimal]]
   import bigDecimalOrdering.mkOrderingOps
 
@@ -316,9 +316,9 @@ class DecimalFormat(private[this] val pattern: String, private[this] var symbols
   def setGroupingSize(newValue: Int): Unit =
     this.parsedPattern = parsedPattern.copy(groupingSize = newValue, isGroupingUsed = (newValue > 0))
 
-  def isGroupingUsed(): Boolean = parsedPattern.isGroupingUsed
+  override def isGroupingUsed(): Boolean = parsedPattern.isGroupingUsed
 
-  def setGroupingUsed(newValue: Boolean): Unit =
+  override def setGroupingUsed(newValue: Boolean): Unit =
     this.parsedPattern = parsedPattern.copy(isGroupingUsed = newValue)
 
   def isDecimalSeparatorAlwaysShown(): Boolean = this.decimalSeparatorAlwaysShown
@@ -416,9 +416,9 @@ class DecimalFormat(private[this] val pattern: String, private[this] var symbols
     result.toString()
   }
 
-  def getMaximumIntegerDigits(): Int = parsedPattern.maximumIntegerDigits.getOrElse(Int.MaxValue)
+  override def getMaximumIntegerDigits(): Int = parsedPattern.maximumIntegerDigits.getOrElse(Int.MaxValue)
 
-  def setMaximumIntegerDigits(newValue: Int): Unit = {
+  override def setMaximumIntegerDigits(newValue: Int): Unit = {
     val newMax: Int = max(newValue, 0)
 
     this.parsedPattern = parsedPattern.copy(
@@ -430,9 +430,9 @@ class DecimalFormat(private[this] val pattern: String, private[this] var symbols
   private def minFractionDigitsAreEmpty: Boolean = parsedPattern.minimumFractionDigits.isEmpty ||
     parsedPattern.minimumFractionDigits.exists{ _ == 0 }
 
-  def getMinimumIntegerDigits(): Int = parsedPattern.minimumIntegerDigits.getOrElse(0)
+  override def getMinimumIntegerDigits(): Int = parsedPattern.minimumIntegerDigits.getOrElse(0)
 
-  def setMinimumIntegerDigits(newValue: Int): Unit = {
+  override def setMinimumIntegerDigits(newValue: Int): Unit = {
     val newMin: Int = max(newValue, 0)
 
     this.parsedPattern = parsedPattern.copy(
@@ -441,9 +441,9 @@ class DecimalFormat(private[this] val pattern: String, private[this] var symbols
     )
   }
 
-  def getMaximumFractionDigits(): Int = parsedPattern.maximumFractionDigits.getOrElse(5)
+  override def getMaximumFractionDigits(): Int = parsedPattern.maximumFractionDigits.getOrElse(5)
 
-  def setMaximumFractionDigits(newValue: Int): Unit = {
+  override def setMaximumFractionDigits(newValue: Int): Unit = {
     val newMax: Int = max(newValue, 0)
 
     this.parsedPattern = parsedPattern.copy(
@@ -452,9 +452,9 @@ class DecimalFormat(private[this] val pattern: String, private[this] var symbols
     )
   }
 
-  def getMinimumFractionDigits(): Int = parsedPattern.minimumFractionDigits.getOrElse(0)
+  override def getMinimumFractionDigits(): Int = parsedPattern.minimumFractionDigits.getOrElse(0)
 
-  def setMinimumFractionDigits(newValue: Int): Unit = {
+  override def setMinimumFractionDigits(newValue: Int): Unit = {
     val newMin: Int = max(newValue, 0)
 
     this.parsedPattern = parsedPattern.copy(
@@ -471,9 +471,9 @@ class DecimalFormat(private[this] val pattern: String, private[this] var symbols
     usePattern(standardPattern)
   }
 
-  def getCurrency(): Currency = currency
+  override def getCurrency(): Currency = currency
 
-  def setCurrency(currency: Currency): Unit = this.currency = currency
+  override def setCurrency(currency: Currency): Unit = this.currency = currency
 
   override def clone(): AnyRef = {
     val f = new DecimalFormat(toPattern())

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.9
+sbt.version=0.13.13