Skip to content

Renaming the aux directory to avoid issues with Windows developers #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jdesiloniz merged 1 commit into from
Jan 17, 2018
Merged

Renaming the aux directory to avoid issues with Windows developers #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/scala/scalatutorial/sections/ClassesVsCaseClasses.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/scalatutorial/sections/ImperativeProgramming.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

package scalatutorial.sections

import scalatutorial.aux.BankAccount
import scalatutorial.utils.BankAccount

/** @param name imperative_programming */
object ImperativeProgramming extends ScalaTutorialSection {
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/scalatutorial/sections/ObjectOrientedProgramming.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/scalatutorial/sections/TypeClasses.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ...scala/scalatutorial/aux/BankAccount.scala → ...ala/scalatutorial/utils/BankAccount.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*/

package scalatutorial.aux
package scalatutorial.utils

class BankAccount {

Expand Down
2 changes: 1 addition & 1 deletion ...main/scala/scalatutorial/aux/IntSet.scala → ...in/scala/scalatutorial/utils/IntSet.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/scalatutorial/aux/Note.scala → ...main/scala/scalatutorial/utils/Note.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion ...in/scala/scalatutorial/aux/Rational.scala → .../scala/scalatutorial/utils/Rational.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {

Expand Down
2 changes: 1 addition & 1 deletion ...ain/scala/scalatutorial/aux/animals.scala → ...n/scala/scalatutorial/utils/animals.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ain/scala/scalatutorial/aux/sorting.scala → ...n/scala/scalatutorial/utils/sorting.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*/

package scalatutorial.aux
package scalatutorial.utils

object Sorting {

Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/scalatutorial/sections/TypeClassesSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down