Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus
This commit is contained in:
commit
f299770923
7 changed files with 20 additions and 10 deletions
Binary file not shown.
|
@ -5,22 +5,26 @@
|
|||
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
|
||||
<option name="myNullables">
|
||||
<value>
|
||||
<list size="5">
|
||||
<list size="7">
|
||||
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
|
||||
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
|
||||
<item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
|
||||
<item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
|
||||
<item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
|
||||
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
|
||||
<item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
|
||||
</list>
|
||||
</value>
|
||||
</option>
|
||||
<option name="myNotNulls">
|
||||
<value>
|
||||
<list size="4">
|
||||
<list size="6">
|
||||
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
|
||||
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
|
||||
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
|
||||
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
|
||||
<item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
|
||||
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
|
||||
</list>
|
||||
</value>
|
||||
</option>
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
|
@ -7,8 +7,16 @@ buildscript {
|
|||
jcenter()
|
||||
}
|
||||
dependencies {
|
||||
<<<<<<< HEAD
|
||||
classpath 'com.android.tools.build:gradle:3.2.0'
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
classpath 'com.android.tools.build:gradle:3.2.0'
|
||||
=======
|
||||
classpath 'com.android.tools.build:gradle:3.1.4'
|
||||
|
||||
>>>>>>> 0e3ca9a99ca712d5307384360c5dd5be9aeac57a
|
||||
>>>>>>> refs/remotes/origin/master
|
||||
|
||||
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
|
|
|
@ -1,6 +1,10 @@
|
|||
#Fri Sep 28 14:59:51 EDT 2018
|
||||
<<<<<<< HEAD
|
||||
#Fri Oct 05 11:36:36 EDT 2018
|
||||
=======
|
||||
#Fri Oct 05 10:21:14 EDT 2018
|
||||
>>>>>>> refs/remotes/origin/master
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
|
||||
|
|
Binary file not shown.
BIN
~$L Class Diagram.docx
Normal file
BIN
~$L Class Diagram.docx
Normal file
Binary file not shown.
Loading…
Reference in a new issue