Merge branch 'master' into dependabot/gradle/org.json-json-20180813

adamint · web-flow · commit b31889aac47b · 2019-02-07T15:10:54.000-05:00
diff --git a/build.gradle b/build.gradle
@@ -50,10 +50,9 @@ dependencies {
         exclude group: 'org.jetbrains.kotlin'
     }
 
-    testImplementation('org.junit.jupiter:junit-jupiter-api:5.2.0')
-    testImplementation(group: 'org.json', name: 'json', version: '20180813')
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.2.0'
-
+    testImplementation('org.junit.jupiter:junit-jupiter-api:5.3.2')
+    testImplementation(group: 'org.json', name: 'json', version: '20180130')
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.2'
 }
 
 dokka {

Original file line number	Diff line number	Diff line change
`@@ -50,10 +50,9 @@ dependencies {`
`50`	`50`	`exclude group: 'org.jetbrains.kotlin'`
`51`	`51`	`}`
`52`	`52`
`53`		`- testImplementation('org.junit.jupiter:junit-jupiter-api:5.2.0')`
`54`		`- testImplementation(group: 'org.json', name: 'json', version: '20180813')`
`55`		`- testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.2.0'`
`56`		`-`
	`53`	`+ testImplementation('org.junit.jupiter:junit-jupiter-api:5.3.2')`
	`54`	`+ testImplementation(group: 'org.json', name: 'json', version: '20180130')`
	`55`	`+ testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.2'`
`57`	`56`	`}`
`58`	`57`
`59`	`58`	`dokka {`