Updated the dependencies.
This commit is contained in:
		
							parent
							
								
									c59f491346
								
							
						
					
					
						commit
						26bc57ec34
					
				
					 8 changed files with 59 additions and 20 deletions
				
			
		
							
								
								
									
										6
									
								
								OlympusServices/.idea/compiler.xml
									
										
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								OlympusServices/.idea/compiler.xml
									
										
									
										generated
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,6 @@
 | 
				
			||||||
 | 
					<?xml version="1.0" encoding="UTF-8"?>
 | 
				
			||||||
 | 
					<project version="4">
 | 
				
			||||||
 | 
					  <component name="CompilerConfiguration">
 | 
				
			||||||
 | 
					    <bytecodeTargetLevel target="1.8" />
 | 
				
			||||||
 | 
					  </component>
 | 
				
			||||||
 | 
					</project>
 | 
				
			||||||
							
								
								
									
										7
									
								
								OlympusServices/.idea/gradle.xml
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										7
									
								
								OlympusServices/.idea/gradle.xml
									
										
									
										generated
									
									
									
								
							| 
						 | 
					@ -1,17 +1,18 @@
 | 
				
			||||||
<?xml version="1.0" encoding="UTF-8"?>
 | 
					<?xml version="1.0" encoding="UTF-8"?>
 | 
				
			||||||
<project version="4">
 | 
					<project version="4">
 | 
				
			||||||
 | 
					  <component name="GradleMigrationSettings" migrationVersion="1" />
 | 
				
			||||||
  <component name="GradleSettings">
 | 
					  <component name="GradleSettings">
 | 
				
			||||||
    <option name="linkedExternalProjectsSettings">
 | 
					    <option name="linkedExternalProjectsSettings">
 | 
				
			||||||
      <GradleProjectSettings>
 | 
					      <GradleProjectSettings>
 | 
				
			||||||
 | 
					        <option name="testRunner" value="GRADLE" />
 | 
				
			||||||
        <option name="distributionType" value="DEFAULT_WRAPPED" />
 | 
					        <option name="distributionType" value="DEFAULT_WRAPPED" />
 | 
				
			||||||
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
 | 
					        <option name="externalProjectPath" value="$PROJECT_DIR$" />
 | 
				
			||||||
        <option name="modules">
 | 
					        <option name="modules">
 | 
				
			||||||
          <set>
 | 
					          <set>
 | 
				
			||||||
            <option value="$PROJECT_DIR$" />
 | 
					            <option value="/home2/arctichawk1/Projects/SEG2105-Olympus-Android-Application/OlympusServices" />
 | 
				
			||||||
            <option value="$PROJECT_DIR$/app" />
 | 
					            <option value="/home2/arctichawk1/Projects/SEG2105-Olympus-Android-Application/OlympusServices/app" />
 | 
				
			||||||
          </set>
 | 
					          </set>
 | 
				
			||||||
        </option>
 | 
					        </option>
 | 
				
			||||||
        <option name="resolveModulePerSourceSet" value="false" />
 | 
					 | 
				
			||||||
      </GradleProjectSettings>
 | 
					      </GradleProjectSettings>
 | 
				
			||||||
    </option>
 | 
					    </option>
 | 
				
			||||||
  </component>
 | 
					  </component>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										45
									
								
								OlympusServices/.idea/jarRepositories.xml
									
										
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										45
									
								
								OlympusServices/.idea/jarRepositories.xml
									
										
									
										generated
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -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>
 | 
				
			||||||
							
								
								
									
										3
									
								
								OlympusServices/.idea/misc.xml
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										3
									
								
								OlympusServices/.idea/misc.xml
									
										
									
										generated
									
									
									
								
							| 
						 | 
					@ -1,4 +1,3 @@
 | 
				
			||||||
<?xml version="1.0" encoding="UTF-8"?>
 | 
					 | 
				
			||||||
<project version="4">
 | 
					<project version="4">
 | 
				
			||||||
  <component name="NullableNotNullManager">
 | 
					  <component name="NullableNotNullManager">
 | 
				
			||||||
    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
 | 
					    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
 | 
				
			||||||
| 
						 | 
					@ -25,7 +24,7 @@
 | 
				
			||||||
      </value>
 | 
					      </value>
 | 
				
			||||||
    </option>
 | 
					    </option>
 | 
				
			||||||
  </component>
 | 
					  </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" />
 | 
					    <output url="file://$PROJECT_DIR$/build/classes" />
 | 
				
			||||||
  </component>
 | 
					  </component>
 | 
				
			||||||
  <component name="ProjectType">
 | 
					  <component name="ProjectType">
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										12
									
								
								OlympusServices/.idea/runConfigurations.xml
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										12
									
								
								OlympusServices/.idea/runConfigurations.xml
									
										
									
										generated
									
									
									
								
							| 
						 | 
					@ -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>
 | 
					 | 
				
			||||||
							
								
								
									
										2
									
								
								OlympusServices/.idea/vcs.xml
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										2
									
								
								OlympusServices/.idea/vcs.xml
									
										
									
										generated
									
									
									
								
							| 
						 | 
					@ -1,6 +1,6 @@
 | 
				
			||||||
<?xml version="1.0" encoding="UTF-8"?>
 | 
					<?xml version="1.0" encoding="UTF-8"?>
 | 
				
			||||||
<project version="4">
 | 
					<project version="4">
 | 
				
			||||||
  <component name="VcsDirectoryMappings">
 | 
					  <component name="VcsDirectoryMappings">
 | 
				
			||||||
    <mapping directory="$PROJECT_DIR$" vcs="Git" />
 | 
					    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
 | 
				
			||||||
  </component>
 | 
					  </component>
 | 
				
			||||||
</project>
 | 
					</project>
 | 
				
			||||||
| 
						 | 
					@ -7,7 +7,7 @@ buildscript {
 | 
				
			||||||
        jcenter()
 | 
					        jcenter()
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    dependencies {
 | 
					    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
 | 
					        // NOTE: Do not place your application dependencies here; they belong
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -7,4 +7,4 @@ distributionBase=GRADLE_USER_HOME
 | 
				
			||||||
distributionPath=wrapper/dists
 | 
					distributionPath=wrapper/dists
 | 
				
			||||||
zipStoreBase=GRADLE_USER_HOME
 | 
					zipStoreBase=GRADLE_USER_HOME
 | 
				
			||||||
zipStorePath=wrapper/dists
 | 
					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
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue