From debcf4e337f2b2fe622ab55825a79889ab873234 Mon Sep 17 00:00:00 2001
From: Anthony Cicchetti <cicchetti.a@husky.neu.edu>
Date: Mon, 7 May 2018 15:41:20 -0400
Subject: [PATCH] Updated some version of things

---
 .idea/gradle.xml      |  2 +-
 .idea/kotlinc.xml     |  4 ++++
 .idea/misc.xml        |  2 +-
 app/build.gradle      | 10 +++++-----
 app/gradle.properties |  1 +
 build.gradle          |  6 +++---
 common/build.gradle   |  2 +-
 gradle.properties     |  1 +
 8 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 app/gradle.properties

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 9e186e9..7899f30 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,7 +6,7 @@
         <option name="distributionType" value="WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="C:/Gradle/gradle-4.0.1" />
-        <option name="gradleJvm" value="JDK 8" />
+        <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 0dd4b35..91afacf 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="Kotlin2JsCompilerArguments">
+    <option name="sourceMapEmbedSources" />
+    <option name="sourceMapPrefix" />
+  </component>
   <component name="Kotlin2JvmCompilerArguments">
     <option name="jvmTarget" value="1.8" />
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3dded9b..75dac50 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -24,7 +24,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK 8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index cef00bc..e3bbedd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,10 +32,10 @@ dependencies {
     implementation project(':common')
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:27.1.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    implementation 'com.android.support:design:27.1.0'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
+    implementation 'com.android.support:design:27.1.1'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
diff --git a/app/gradle.properties b/app/gradle.properties
new file mode 100644
index 0000000..fbbd9f8
--- /dev/null
+++ b/app/gradle.properties
@@ -0,0 +1 @@
+org.gradle.configureondemand=false
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 4dee4ef..3e81f49 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.31'
+    ext.kotlin_version = '1.2.41'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.android.tools.build:gradle:3.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -21,7 +21,7 @@ allprojects {
         jcenter()
     }
 
-    ext.kotlin_version = '1.2.31'
+    ext.kotlin_version = '1.2.41'
 }
 
 subprojects.findAll { it.name.equalsIgnoreCase("common") or it.name.equalsIgnoreCase("server")}.each { p ->
diff --git a/common/build.gradle b/common/build.gradle
index 62747d2..853a778 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    api 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.5'
+    api 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.+'
 }
 
 compileKotlin {
diff --git a/gradle.properties b/gradle.properties
index 743d692..d0bfef7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,3 +11,4 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+org.gradle.configureondemand=false
\ No newline at end of file