Skip to content

Commit 4b81c24

Browse files
author
Javier de Silóniz Sandino
authored
Merge pull request #29 from scala-exercises/js-change-aux-folder-name
Renaming the aux directory to avoid issues with Windows developers
2 parents 40dade1 + 4515041 commit 4b81c24

11 files changed

+12
-12
lines changed

Diff for: src/main/scala/scalatutorial/sections/ClassesVsCaseClasses.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package scalatutorial.sections
77

8-
import scalatutorial.aux.{BankAccount, Note}
8+
import scalatutorial.utils.{BankAccount, Note}
99

1010
/** @param name classes_vs_case_classes */
1111
object ClassesVsCaseClasses extends ScalaTutorialSection {

Diff for: src/main/scala/scalatutorial/sections/ImperativeProgramming.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package scalatutorial.sections
77

8-
import scalatutorial.aux.BankAccount
8+
import scalatutorial.utils.BankAccount
99

1010
/** @param name imperative_programming */
1111
object ImperativeProgramming extends ScalaTutorialSection {

Diff for: src/main/scala/scalatutorial/sections/ObjectOrientedProgramming.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package scalatutorial.sections
77

8-
import scalatutorial.aux.{Empty, IntSet, NonEmpty}
8+
import scalatutorial.utils.{Empty, IntSet, NonEmpty}
99

1010
/** @param name object_oriented_programming */
1111
object ObjectOrientedProgramming extends ScalaTutorialSection {

Diff for: src/main/scala/scalatutorial/sections/TypeClasses.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
package scalatutorial.sections
77

8-
import scalatutorial.aux.Rational
9-
import scalatutorial.aux.Sorting.insertionSort
8+
import scalatutorial.utils.Rational
9+
import scalatutorial.utils.Sorting.insertionSort
1010

1111
/** @param name type_classes */
1212
object TypeClasses extends ScalaTutorialSection {

Diff for: src/main/scala/scalatutorial/aux/BankAccount.scala renamed to src/main/scala/scalatutorial/utils/BankAccount.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
44
*/
55

6-
package scalatutorial.aux
6+
package scalatutorial.utils
77

88
class BankAccount {
99

Diff for: src/main/scala/scalatutorial/aux/IntSet.scala renamed to src/main/scala/scalatutorial/utils/IntSet.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
44
*/
55

6-
package scalatutorial.aux
6+
package scalatutorial.utils
77

88
abstract class IntSet {
99
def incl(x: Int): IntSet

Diff for: src/main/scala/scalatutorial/aux/Note.scala renamed to src/main/scala/scalatutorial/utils/Note.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
44
*/
55

6-
package scalatutorial.aux
6+
package scalatutorial.utils
77

88
case class Note(name: String, duration: String, octave: Int)

Diff for: src/main/scala/scalatutorial/aux/Rational.scala renamed to src/main/scala/scalatutorial/utils/Rational.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
44
*/
55

6-
package scalatutorial.aux
6+
package scalatutorial.utils
77

88
class Rational(x: Int, y: Int) {
99

Diff for: src/main/scala/scalatutorial/aux/animals.scala renamed to src/main/scala/scalatutorial/utils/animals.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
44
*/
55

6-
package scalatutorial.aux
6+
package scalatutorial.utils
77

88
trait Animal {
99
def fitness: Int

Diff for: src/main/scala/scalatutorial/aux/sorting.scala renamed to src/main/scala/scalatutorial/utils/sorting.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
44
*/
55

6-
package scalatutorial.aux
6+
package scalatutorial.utils
77

88
object Sorting {
99

Diff for: src/test/scala/scalatutorial/sections/TypeClassesSpec.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import org.scalatest.Spec
1111
import org.scalatest.prop.Checkers
1212
import shapeless.HNil
1313

14-
import scalatutorial.aux.Rational
14+
import scalatutorial.utils.Rational
1515

1616
class TypeClassesSpec extends Spec with Checkers {
1717

0 commit comments

Comments
 (0)