From cdec5445c4207bed5c198bae57c0a730f65022e2 Mon Sep 17 00:00:00 2001
From: "quentin.leblanc@etu.hesge.ch" <quentin.leblanc@etu.hesge.ch>
Date: Thu, 30 Jan 2020 15:06:30 +0100
Subject: [PATCH] TP2
---
.gitignore | 3 +++
TP2/build.sbt | 8 +++++++-
TP2/project/build.properties | 1 +
base_tp.tgz | Bin 2122 -> 0 bytes
src/main/scala/ch/hepia/tp2/Stack.scala | 5 -----
5 files changed, 11 insertions(+), 6 deletions(-)
create mode 100644 .gitignore
create mode 100644 TP2/project/build.properties
delete mode 100644 base_tp.tgz
delete mode 100644 src/main/scala/ch/hepia/tp2/Stack.scala
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b8e53f7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+../.idea/
+target/
+.idea/
diff --git a/TP2/build.sbt b/TP2/build.sbt
index 3b5eaa8..5d8865d 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 0000000..e7c6f8a
--- /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
GIT binary patch
literal 0
HcmV?d00001
literal 2122
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
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 240f091..0000000
--- a/src/main/scala/ch/hepia/tp2/Stack.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-package ch.hepia.tp2
-
-class Stack {
-
-}
--
GitLab