diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..b8e53f78cdf374c96bd5917a7a748057941868b3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +../.idea/ +target/ +.idea/ diff --git a/TP2/build.sbt b/TP2/build.sbt index 3b5eaa87a12c8b7d3e3dbf378f6c145ee4c23ee8..5d8865d459ea7d195bb8cba0a14eaadc56cd6827 100644 --- a/TP2/build.sbt +++ b/TP2/build.sbt @@ -1,5 +1,11 @@ -name := "scala2020" +name := "TP2" version := "0.1" scalaVersion := "2.13.1" + +scalaSource in Compile := baseDirectory.value / "src" + +javaSource in Compile := baseDirectory.value / "java" / "src" + +scalaSource in Test := baseDirectory.value / "test" diff --git a/TP2/project/build.properties b/TP2/project/build.properties new file mode 100644 index 0000000000000000000000000000000000000000..e7c6f8aac77dcfa7939dfbbace6a43b833c46e51 --- /dev/null +++ b/TP2/project/build.properties @@ -0,0 +1 @@ +sbt.version = 1.3.7 \ No newline at end of file diff --git a/base_tp.tgz b/base_tp.tgz deleted file mode 100644 index 7178360f9c0868fd3c3d8995e030ef24791fba08..0000000000000000000000000000000000000000 Binary files a/base_tp.tgz and /dev/null differ diff --git a/src/main/scala/ch/hepia/tp2/Stack.scala b/src/main/scala/ch/hepia/tp2/Stack.scala deleted file mode 100644 index 240f0916256a8b263ced33f8e83308a0e40e448a..0000000000000000000000000000000000000000 --- a/src/main/scala/ch/hepia/tp2/Stack.scala +++ /dev/null @@ -1,5 +0,0 @@ -package ch.hepia.tp2 - -class Stack { - -}