diff --git a/src/main/scala/scalatutorial/sections/ClassesVsCaseClasses.scala b/src/main/scala/scalatutorial/sections/ClassesVsCaseClasses.scala index 7a91afb0..69d9511a 100644 --- 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 index d1b94d65..aa273211 100644 --- 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 index 49faf17e..c9df0a2b 100644 --- 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 index 32b6553a..65e92759 100644 --- 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/src/main/scala/scalatutorial/aux/BankAccount.scala b/src/main/scala/scalatutorial/utils/BankAccount.scala similarity index 93% rename from src/main/scala/scalatutorial/aux/BankAccount.scala rename to src/main/scala/scalatutorial/utils/BankAccount.scala index 3ea8db08..48370fb7 100644 --- a/src/main/scala/scalatutorial/aux/BankAccount.scala +++ b/src/main/scala/scalatutorial/utils/BankAccount.scala @@ -3,7 +3,7 @@ * Copyright (C) 2015-2016 47 Degrees, LLC. */ -package scalatutorial.aux +package scalatutorial.utils class BankAccount { diff --git a/src/main/scala/scalatutorial/aux/IntSet.scala b/src/main/scala/scalatutorial/utils/IntSet.scala similarity index 96% rename from src/main/scala/scalatutorial/aux/IntSet.scala rename to src/main/scala/scalatutorial/utils/IntSet.scala index 553bfafc..14219fda 100644 --- a/src/main/scala/scalatutorial/aux/IntSet.scala +++ b/src/main/scala/scalatutorial/utils/IntSet.scala @@ -3,7 +3,7 @@ * Copyright (C) 2015-2016 47 Degrees, LLC. */ -package scalatutorial.aux +package scalatutorial.utils abstract class IntSet { def incl(x: Int): IntSet diff --git a/src/main/scala/scalatutorial/aux/Note.scala b/src/main/scala/scalatutorial/utils/Note.scala similarity index 86% rename from src/main/scala/scalatutorial/aux/Note.scala rename to src/main/scala/scalatutorial/utils/Note.scala index ff758832..9ad2914a 100644 --- a/src/main/scala/scalatutorial/aux/Note.scala +++ b/src/main/scala/scalatutorial/utils/Note.scala @@ -3,6 +3,6 @@ * Copyright (C) 2015-2016 47 Degrees, LLC. */ -package scalatutorial.aux +package scalatutorial.utils case class Note(name: String, duration: String, octave: Int) diff --git a/src/main/scala/scalatutorial/aux/Rational.scala b/src/main/scala/scalatutorial/utils/Rational.scala similarity index 92% rename from src/main/scala/scalatutorial/aux/Rational.scala rename to src/main/scala/scalatutorial/utils/Rational.scala index e244ab4f..f1fbb2ae 100644 --- a/src/main/scala/scalatutorial/aux/Rational.scala +++ b/src/main/scala/scalatutorial/utils/Rational.scala @@ -3,7 +3,7 @@ * Copyright (C) 2015-2016 47 Degrees, LLC. */ -package scalatutorial.aux +package scalatutorial.utils class Rational(x: Int, y: Int) { diff --git a/src/main/scala/scalatutorial/aux/animals.scala b/src/main/scala/scalatutorial/utils/animals.scala similarity index 91% rename from src/main/scala/scalatutorial/aux/animals.scala rename to src/main/scala/scalatutorial/utils/animals.scala index a4776ad6..d1c4593d 100644 --- a/src/main/scala/scalatutorial/aux/animals.scala +++ b/src/main/scala/scalatutorial/utils/animals.scala @@ -3,7 +3,7 @@ * Copyright (C) 2015-2016 47 Degrees, LLC. */ -package scalatutorial.aux +package scalatutorial.utils trait Animal { def fitness: Int diff --git a/src/main/scala/scalatutorial/aux/sorting.scala b/src/main/scala/scalatutorial/utils/sorting.scala similarity index 94% rename from src/main/scala/scalatutorial/aux/sorting.scala rename to src/main/scala/scalatutorial/utils/sorting.scala index 14640aed..1abc5ebf 100644 --- a/src/main/scala/scalatutorial/aux/sorting.scala +++ b/src/main/scala/scalatutorial/utils/sorting.scala @@ -3,7 +3,7 @@ * Copyright (C) 2015-2016 47 Degrees, LLC. */ -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 index cf5a2a8d..12a5b576 100644 --- 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 {