Merge pull request #29 from scala-exercises/js-change-aux-folder-name

Renaming the aux directory to avoid issues with Windows developers
scala-exercises · Jan 17, 2018 · 4b81c24 · 4b81c24
2 parents 40dade1 + 4515041
commit 4b81c24
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 12 deletions.
diff --git a/src/main/scala/scalatutorial/sections/ClassesVsCaseClasses.scala b/src/main/scala/scalatutorial/sections/ClassesVsCaseClasses.scala
@@ -5,7 +5,7 @@
 
 package scalatutorial.sections
 
-import scalatutorial.aux.{BankAccount, Note}
+import scalatutorial.utils.{BankAccount, Note}
 
 /** @param name classes_vs_case_classes */
 object ClassesVsCaseClasses extends ScalaTutorialSection {

diff --git a/src/main/scala/scalatutorial/sections/ImperativeProgramming.scala b/src/main/scala/scalatutorial/sections/ImperativeProgramming.scala
@@ -5,7 +5,7 @@
 
 package scalatutorial.sections
 
-import scalatutorial.aux.BankAccount
+import scalatutorial.utils.BankAccount
 
 /** @param name imperative_programming */
 object ImperativeProgramming extends ScalaTutorialSection {

diff --git a/src/main/scala/scalatutorial/sections/ObjectOrientedProgramming.scala b/src/main/scala/scalatutorial/sections/ObjectOrientedProgramming.scala
@@ -5,7 +5,7 @@
 
 package scalatutorial.sections
 
-import scalatutorial.aux.{Empty, IntSet, NonEmpty}
+import scalatutorial.utils.{Empty, IntSet, NonEmpty}
 
 /** @param name object_oriented_programming */
 object ObjectOrientedProgramming extends ScalaTutorialSection {

diff --git a/src/main/scala/scalatutorial/sections/TypeClasses.scala b/src/main/scala/scalatutorial/sections/TypeClasses.scala
@@ -5,8 +5,8 @@
 
 package scalatutorial.sections
 
-import scalatutorial.aux.Rational
-import scalatutorial.aux.Sorting.insertionSort
+import scalatutorial.utils.Rational
+import scalatutorial.utils.Sorting.insertionSort
 
 /** @param name type_classes */
 object TypeClasses extends ScalaTutorialSection {

diff --git a/...scala/scalatutorial/aux/BankAccount.scala → ...ala/scalatutorial/utils/BankAccount.scala b/...scala/scalatutorial/aux/BankAccount.scala → ...ala/scalatutorial/utils/BankAccount.scala
@@ -3,7 +3,7 @@
  * Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
  */
 
-package scalatutorial.aux
+package scalatutorial.utils
 
 class BankAccount {
 

diff --git a/...main/scala/scalatutorial/aux/IntSet.scala → ...in/scala/scalatutorial/utils/IntSet.scala b/...main/scala/scalatutorial/aux/IntSet.scala → ...in/scala/scalatutorial/utils/IntSet.scala
@@ -3,7 +3,7 @@
  * Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
  */
 
-package scalatutorial.aux
+package scalatutorial.utils
 
 abstract class IntSet {
   def incl(x: Int): IntSet

diff --git a/src/main/scala/scalatutorial/aux/Note.scala → ...main/scala/scalatutorial/utils/Note.scala b/src/main/scala/scalatutorial/aux/Note.scala → ...main/scala/scalatutorial/utils/Note.scala
@@ -3,6 +3,6 @@
  * Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
  */
 
-package scalatutorial.aux
+package scalatutorial.utils
 
 case class Note(name: String, duration: String, octave: Int)
diff --git a/...in/scala/scalatutorial/aux/Rational.scala → .../scala/scalatutorial/utils/Rational.scala b/...in/scala/scalatutorial/aux/Rational.scala → .../scala/scalatutorial/utils/Rational.scala
@@ -3,7 +3,7 @@
  * Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
  */
 
-package scalatutorial.aux
+package scalatutorial.utils
 
 class Rational(x: Int, y: Int) {
 

diff --git a/...ain/scala/scalatutorial/aux/animals.scala → ...n/scala/scalatutorial/utils/animals.scala b/...ain/scala/scalatutorial/aux/animals.scala → ...n/scala/scalatutorial/utils/animals.scala
@@ -3,7 +3,7 @@
  * Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
  */
 
-package scalatutorial.aux
+package scalatutorial.utils
 
 trait Animal {
   def fitness: Int

diff --git a/...ain/scala/scalatutorial/aux/sorting.scala → ...n/scala/scalatutorial/utils/sorting.scala b/...ain/scala/scalatutorial/aux/sorting.scala → ...n/scala/scalatutorial/utils/sorting.scala
@@ -3,7 +3,7 @@
  * Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
  */
 
-package scalatutorial.aux
+package scalatutorial.utils
 
 object Sorting {
 

diff --git a/src/test/scala/scalatutorial/sections/TypeClassesSpec.scala b/src/test/scala/scalatutorial/sections/TypeClassesSpec.scala
@@ -11,7 +11,7 @@ import org.scalatest.Spec
 import org.scalatest.prop.Checkers
 import shapeless.HNil
 
-import scalatutorial.aux.Rational
+import scalatutorial.utils.Rational
 
 class TypeClassesSpec extends Spec with Checkers {