From ab0f8a046221f4b2a7ea96a5dda69717c186f725 Mon Sep 17 00:00:00 2001
From: Lucas Delanier <delanierlucas@gmail.com>
Date: Mon, 27 Mar 2023 22:23:12 +0200
Subject: [PATCH] clean master

---
 ShakeAndCraft/.idea/vcs.xml                    |  2 +-
 ShakeAndCraft/app/build.gradle                 | 18 +++++++++++-------
 .../java/com/example/shakecraft/model/Item.kt  |  1 -
 ShakeAndCraft/build.gradle                     |  2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/ShakeAndCraft/.idea/vcs.xml b/ShakeAndCraft/.idea/vcs.xml
index 5a0857d..6c0b863 100644
--- a/ShakeAndCraft/.idea/vcs.xml
+++ b/ShakeAndCraft/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/ShakeAndCraft/app/build.gradle b/ShakeAndCraft/app/build.gradle
index bac712e..34ade2c 100644
--- a/ShakeAndCraft/app/build.gradle
+++ b/ShakeAndCraft/app/build.gradle
@@ -34,18 +34,22 @@ android {
         jvmTarget = '1.8'
     }
 }
-
+apply plugin: 'kotlin-kapt'
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.5.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.google.ar.sceneform:filament-android:1.17.1'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3'
     implementation 'androidx.navigation:navigation-ui-ktx:2.5.3'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
+    implementation "androidx.room:room-runtime:2.5.1"
+    kapt "androidx.room:room-compiler:2.5.1"
+    implementation "androidx.room:room-ktx:2.5.1"
+
 }
\ No newline at end of file
diff --git a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/Item.kt b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/Item.kt
index 1d7414a..24b7494 100644
--- a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/Item.kt
+++ b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/Item.kt
@@ -3,7 +3,6 @@ package com.example.shakecraft.model
 import android.os.Parcel
 import android.os.Parcelable
 
-
 open class Item(
     val type: ItemType,
     var stack: Int = 1,
diff --git a/ShakeAndCraft/build.gradle b/ShakeAndCraft/build.gradle
index 699fe62..be7069e 100644
--- a/ShakeAndCraft/build.gradle
+++ b/ShakeAndCraft/build.gradle
@@ -4,4 +4,4 @@ plugins {
     id 'com.android.library' version '7.4.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.7.21' apply false
     id "org.sonarqube" version "3.4.0.2513"
-}
\ No newline at end of file
+}