From 26bc57ec3464b114d851d958e3f9e6d0ed970b8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Batuhan=20Berk=20Ba=C5=9Fo=C4=9Flu?= <batuhan@basoglu.ca>
Date: Sat, 20 May 2023 01:20:27 -0400
Subject: [PATCH] Updated the dependencies.

---
 OlympusServices/.idea/compiler.xml            |  6 +++
 OlympusServices/.idea/gradle.xml              |  7 +--
 OlympusServices/.idea/jarRepositories.xml     | 45 +++++++++++++++++++
 OlympusServices/.idea/misc.xml                |  3 +-
 OlympusServices/.idea/runConfigurations.xml   | 12 -----
 OlympusServices/.idea/vcs.xml                 |  2 +-
 OlympusServices/build.gradle                  |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 8 files changed, 59 insertions(+), 20 deletions(-)
 create mode 100644 OlympusServices/.idea/compiler.xml
 create mode 100644 OlympusServices/.idea/jarRepositories.xml
 delete mode 100644 OlympusServices/.idea/runConfigurations.xml

diff --git a/OlympusServices/.idea/compiler.xml b/OlympusServices/.idea/compiler.xml
new file mode 100644
index 0000000..61a9130
--- /dev/null
+++ b/OlympusServices/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="1.8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/OlympusServices/.idea/gradle.xml b/OlympusServices/.idea/gradle.xml
index 7ac24c7..8a91881 100644
--- a/OlympusServices/.idea/gradle.xml
+++ b/OlympusServices/.idea/gradle.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
           <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
+            <option value="/home2/arctichawk1/Projects/SEG2105-Olympus-Android-Application/OlympusServices" />
+            <option value="/home2/arctichawk1/Projects/SEG2105-Olympus-Android-Application/OlympusServices/app" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/OlympusServices/.idea/jarRepositories.xml b/OlympusServices/.idea/jarRepositories.xml
new file mode 100644
index 0000000..10637db
--- /dev/null
+++ b/OlympusServices/.idea/jarRepositories.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="$USER_HOME$/Android/Sdk/extras/google/m2repository" />
+      <option name="name" value="$USER_HOME$/Android/Sdk/extras/google/m2repository" />
+      <option name="url" value="file:$USER_HOME$/Android/Sdk/extras/google/m2repository" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="$USER_HOME$/Android/Sdk/extras/m2repository" />
+      <option name="name" value="$USER_HOME$/Android/Sdk/extras/m2repository" />
+      <option name="url" value="file:$USER_HOME$/Android/Sdk/extras/m2repository" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="$USER_HOME$/Android/Sdk/extras/android/m2repository" />
+      <option name="name" value="$USER_HOME$/Android/Sdk/extras/android/m2repository" />
+      <option name="url" value="file:$USER_HOME$/Android/Sdk/extras/android/m2repository" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://oss.sonatype.org/content/repositories/snapshots" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/OlympusServices/.idea/misc.xml b/OlympusServices/.idea/misc.xml
index dc34569..7cbaeeb 100644
--- a/OlympusServices/.idea/misc.xml
+++ b/OlympusServices/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
@@ -25,7 +24,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="corretto-1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/OlympusServices/.idea/runConfigurations.xml b/OlympusServices/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/OlympusServices/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/OlympusServices/.idea/vcs.xml b/OlympusServices/.idea/vcs.xml
index 94a25f7..6c0b863 100644
--- a/OlympusServices/.idea/vcs.xml
+++ b/OlympusServices/.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/OlympusServices/build.gradle b/OlympusServices/build.gradle
index 8d3ef8e..de09b28 100644
--- a/OlympusServices/build.gradle
+++ b/OlympusServices/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/OlympusServices/gradle/wrapper/gradle-wrapper.properties b/OlympusServices/gradle/wrapper/gradle-wrapper.properties
index 3d939b3..1bb7eb5 100644
--- a/OlympusServices/gradle/wrapper/gradle-wrapper.properties
+++ b/OlympusServices/gradle/wrapper/gradle-wrapper.properties
@@ -7,4 +7,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip