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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
A4FCWD
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