From 9c92e1a9f8feee7c15689fddf0a20d75577fb483 Mon Sep 17 00:00:00 2001
From: "anthony.cicchetti" <anthony.cicchetti@ert.com>
Date: Wed, 4 Apr 2018 15:26:58 -0400
Subject: [PATCH] Changed up testing, updated Kotlin version

---
 build.gradle        | 16 +++++++---------
 common/build.gradle |  2 +-
 server/build.gradle |  1 -
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6af9d19..4dee4ef 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.21'
+    ext.kotlin_version = '1.2.31'
     repositories {
         google()
         jcenter()
@@ -9,7 +9,6 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.junit.platform:junit-platform-gradle-plugin:+"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -22,14 +21,13 @@ allprojects {
         jcenter()
     }
 
-    ext.kotlin_version = '1.2.21'
+    ext.kotlin_version = '1.2.31'
 }
 
 subprojects.findAll { it.name.equalsIgnoreCase("common") or it.name.equalsIgnoreCase("server")}.each { p ->
     configure(p) {
         apply plugin: 'kotlin'
-        apply plugin: 'org.junit.platform.gradle.plugin'
-        
+
         dependencies {
             implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"){
                 because 'This is the latest version of kotlin?'
@@ -39,12 +37,12 @@ subprojects.findAll { it.name.equalsIgnoreCase("common") or it.name.equalsIgnore
                 because 'This is required by Jackson'
             }
 
-            testImplementation 'org.junit.jupiter:junit-jupiter-api:+'
-            testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:+'
+            testImplementation 'org.junit.jupiter:junit-jupiter-api:5.1.0'
+            testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.1.0'
         }
 
-        junitPlatform {
-            details 'tree'
+        test {
+            useJUnitPlatform()
         }
     }
 }
diff --git a/common/build.gradle b/common/build.gradle
index 853a778..62747d2 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.+'
+    api 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.5'
 }
 
 compileKotlin {
diff --git a/server/build.gradle b/server/build.gradle
index 1605ed9..dfe2ed6 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -4,7 +4,6 @@ buildscript {
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.junit.platform:junit-platform-gradle-plugin:+"
     }
 }