Update to latest dependencies (#63)

mattmook · web-flow · commit f5b03d080c27 · 2020-09-04T21:44:03.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,13 +15,15 @@
  */
 
 import com.android.build.gradle.internal.tasks.factory.dependsOn
+import org.jetbrains.dokka.gradle.DokkaMultiModuleTask
 import org.jetbrains.dokka.gradle.DokkaTask
+import java.net.URL
 
 plugins {
     kotlin("jvm") version "1.4.0" apply false
-    id("io.gitlab.arturbosch.detekt") version "1.11.2"
+    id("io.gitlab.arturbosch.detekt") version "1.12.0"
     id("com.appmattus.markdown") version "0.6.0"
-    id("org.jetbrains.dokka") version "0.10.1"
+    id("org.jetbrains.dokka") version "1.4.0"
 }
 
 buildscript {
@@ -43,14 +45,30 @@ allprojects {
         jcenter()
         maven { setUrl("https://jitpack.io") }
     }
+
+    tasks.withType<DokkaTask> {
+        outputDirectory.set(buildDir.resolve("reports/dokka"))
+
+        dokkaSourceSets {
+            configureEach {
+                skipDeprecated.set(true)
+
+                sourceLink {
+                    localDirectory.set(rootDir)
+                    remoteUrl.set(URL("https://github.com/appmattus/kotlinfixture/blob/main/"))
+                    remoteLineSuffix.set("#L")
+                }
+            }
+        }
+    }
 }
 
 tasks.register<Delete>("clean") {
     delete(rootProject.buildDir)
 }
 
 dependencies {
-    detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.11.2")
+    detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.12.0")
 }
 
 detekt {
@@ -63,26 +81,9 @@ detekt {
     config = files("detekt-config.yml")
 }
 
-val dokka = tasks.named<DokkaTask>("dokka") {
-    outputFormat = "html"
-    outputDirectory = "$buildDir/reports/dokka"
-
-    subProjects = listOf(
-        "fixture",
-        "fixture-generex",
-        "fixture-javafaker",
-        "fixture-kotest"
-    )
-
-    configuration {
-        skipDeprecated = true
-
-        sourceLink {
-            path = "$rootDir"
-            url = "https://github.com/appmattus/kotlinfixture/blob/main/"
-            lineSuffix = "#L"
-        }
-    }
+val dokka = tasks.named<DokkaMultiModuleTask>("dokkaHtmlMultiModule") {
+    outputDirectory.set(buildDir.resolve("dokkaCustomMultiModuleOutput"))
+    documentationFileName.set("module.md")
 }
 
 tasks.register("check").dependsOn(dokka)
diff --git a/cve-suppressions.xml b/cve-suppressions.xml
@@ -18,6 +18,43 @@
 
 <suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.2.xsd">
 
+    <suppress>
+        <notes><![CDATA[
+            CVE relates to use of jQuery by dokka which is considered safe
+        ]]></notes>
+        <sha1>46a436eba01c79acdb225757ed80bf54bad6416b</sha1>
+        <cve>CVE-2019-11358</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+            CVE relates to use of jQuery by dokka which is considered safe
+        ]]></notes>
+        <sha1>46a436eba01c79acdb225757ed80bf54bad6416b</sha1>
+        <cve>CVE-2020-11022</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+            CVE relates to use of jQuery by dokka which is considered safe
+        ]]></notes>
+        <sha1>46a436eba01c79acdb225757ed80bf54bad6416b</sha1>
+        <cve>CVE-2020-11022</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+            CVE relates to use of jQuery by dokka which is considered safe
+        ]]></notes>
+        <sha1>46a436eba01c79acdb225757ed80bf54bad6416b</sha1>
+        <cve>CVE-2020-11023</cve>
+    </suppress>
+
+    <suppress>
+        <notes><![CDATA[
+            CVE relates to Kotlin from 1.4-M1 to 1.4-RC. No vulnerability as using Kotlin ≥ 1.4.0
+        ]]></notes>
+        <gav regex="true">^org\.jetbrains\.(kotlin|dokka):kotlin-.*:.*$</gav>
+        <cve>CVE-2020-15824</cve>
+    </suppress>
+
     <suppress>
         <notes><![CDATA[
             CVE relates to dokka. No vulnerability as using Kotlin ≥ 1.3.30
diff --git a/fixture-android-tests/build.gradle.kts b/fixture-android-tests/build.gradle.kts
@@ -54,10 +54,10 @@ dependencies {
     implementation(kotlin("stdlib-jdk8"))
     api(project(":fixture"))
 
-    testImplementation("androidx.test:core:1.2.0")
-    testImplementation("androidx.test:runner:1.2.0")
-    testImplementation("androidx.test.ext:junit:1.1.1")
-    testImplementation("org.robolectric:robolectric:4.3.1") {
+    testImplementation("androidx.test:core:1.3.0")
+    testImplementation("androidx.test:runner:1.3.0")
+    testImplementation("androidx.test.ext:junit:1.1.2")
+    testImplementation("org.robolectric:robolectric:4.4") {
         exclude(group = "com.google.auto.service", module = "auto-service")
     }
 
diff --git a/fixture-generex/build.gradle.kts b/fixture-generex/build.gradle.kts
@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     kotlin("jvm")
     id("com.android.lint")
+    id("org.jetbrains.dokka")
 }
 
 apply(from = "$rootDir/gradle/scripts/bintray.gradle.kts")
diff --git a/fixture-generex/module.md b/fixture-generex/module.md
@@ -0,0 +1,4 @@
+# fixture-generex
+
+To generate a random string from a regular expression, look no further
+than the [Generex](https://github.com/mifmif/Generex) integration
diff --git a/fixture-javafaker/build.gradle.kts b/fixture-javafaker/build.gradle.kts
@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     kotlin("jvm")
     id("com.android.lint")
+    id("org.jetbrains.dokka")
 }
 
 apply(from = "$rootDir/gradle/scripts/bintray.gradle.kts")
@@ -29,6 +30,11 @@ dependencies {
     api(kotlin("stdlib-jdk8"))
     api(project(":fixture"))
     api("com.github.javafaker:javafaker:1.0.2")
+    api("org.yaml:snakeyaml:android") {
+        version {
+            strictly("1.26")
+        }
+    }
 
     testImplementation("junit:junit:4.13")
     testImplementation(kotlin("test"))
diff --git a/fixture-javafaker/module.md b/fixture-javafaker/module.md
@@ -0,0 +1,4 @@
+# fixture-javafaker
+
+Generate values with a closer match to real data using
+[Java Faker](http://dius.github.io/java-faker/)
diff --git a/fixture-javafaker/src/test/kotlin/com/appmattus/kotlinfixture/decorator/fake/javafaker/JavaFakerStrategyTest.kt b/fixture-javafaker/src/test/kotlin/com/appmattus/kotlinfixture/decorator/fake/javafaker/JavaFakerStrategyTest.kt
@@ -319,11 +319,14 @@ class JavaFakerStrategyTest {
         }
 
         repeat(100) {
-            assertEquals(2, fixture<Person> {
-                javaFakerStrategy {
-                    password = Password(2, 2)
-                }
-            }.password.length)
+            assertEquals(
+                2,
+                fixture<Person> {
+                    javaFakerStrategy {
+                        password = Password(2, 2)
+                    }
+                }.password.length
+            )
         }
     }
 
diff --git a/fixture-kotest/build.gradle.kts b/fixture-kotest/build.gradle.kts
@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     kotlin("jvm")
     id("com.android.lint")
+    id("org.jetbrains.dokka")
 }
 
 apply(from = "$rootDir/gradle/scripts/bintray.gradle.kts")
@@ -28,7 +29,7 @@ apply(from = "$rootDir/gradle/scripts/dokka-javadoc.gradle.kts")
 dependencies {
     api(kotlin("stdlib-jdk8"))
     api(project(":fixture"))
-    api("io.kotest:kotest-property-jvm:4.2.0")
+    api("io.kotest:kotest-property-jvm:4.2.3")
 
     testImplementation("junit:junit:4.13")
     testImplementation(kotlin("test"))
diff --git a/fixture-kotest/module.md b/fixture-kotest/module.md
@@ -0,0 +1,4 @@
+# fixture-kotest
+
+[KotlinFixture](https://github.com/appmattus/kotlinfixture) powered
+property based testing for [Kotest](https://github.com/kotest/kotest/)
diff --git a/fixture/build.gradle.kts b/fixture/build.gradle.kts
@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     kotlin("jvm")
     id("com.android.lint")
+    id("org.jetbrains.dokka")
 }
 
 apply(from = "$rootDir/gradle/scripts/bintray.gradle.kts")
@@ -27,7 +28,7 @@ apply(from = "$rootDir/gradle/scripts/dokka-javadoc.gradle.kts")
 
 dependencies {
     api(kotlin("stdlib-jdk8"))
-    api("io.github.classgraph:classgraph:4.8.87")
+    api("io.github.classgraph:classgraph:4.8.89")
     api(kotlin("reflect"))
 
     compileOnly("joda-time:joda-time:2.10.6")
diff --git a/fixture/module.md b/fixture/module.md
@@ -0,0 +1,4 @@
+# fixture
+
+A tool to generate well-defined, but essentially random, input following
+the idea of constrained non-determinism
diff --git a/fixture/src/main/kotlin/com/appmattus/kotlinfixture/decorator/optional/OptionalStrategyBuilder.kt b/fixture/src/main/kotlin/com/appmattus/kotlinfixture/decorator/optional/OptionalStrategyBuilder.kt
@@ -72,7 +72,8 @@ class OptionalStrategyBuilder internal constructor(private val defaultStrategy:
 
     @Deprecated(
         "Use the propertyOverride<Class>(propertyName, strategy) or " +
-                "propertyOverride(Class::propertyName, strategy) function", level = DeprecationLevel.ERROR
+                "propertyOverride(Class::propertyName, strategy) function",
+        level = DeprecationLevel.ERROR
     )
     fun propertyOverride(clazz: KClass<*>, propertyName: String, strategy: OptionalStrategy) {
         val classProperties = properties.getOrElse(clazz) { mutableMapOf() }
diff --git a/fixture/src/test/kotlin/com/appmattus/kotlinfixture/decorator/nullability/AlwaysNullStrategyTest.kt b/fixture/src/test/kotlin/com/appmattus/kotlinfixture/decorator/nullability/AlwaysNullStrategyTest.kt
@@ -47,9 +47,11 @@ class AlwaysNullStrategyTest {
     @Test
     fun `always null`() {
         repeat(100) {
-            assertNull(context.wrapNullability(typeOf<String?>()) {
-                "value"
-            })
+            assertNull(
+                context.wrapNullability(typeOf<String?>()) {
+                    "value"
+                }
+            )
         }
     }
 }
diff --git a/fixture/src/test/kotlin/com/appmattus/kotlinfixture/decorator/nullability/NeverNullStrategyTest.kt b/fixture/src/test/kotlin/com/appmattus/kotlinfixture/decorator/nullability/NeverNullStrategyTest.kt
@@ -47,9 +47,11 @@ class NeverNullStrategyTest {
     @Test
     fun `never null`() {
         repeat(100) {
-            assertNotNull(context.wrapNullability(typeOf<String?>()) {
-                "value"
-            })
+            assertNotNull(
+                context.wrapNullability(typeOf<String?>()) {
+                    "value"
+                }
+            )
         }
     }
 }
diff --git a/gradle/scripts/dokka-javadoc.gradle.kts b/gradle/scripts/dokka-javadoc.gradle.kts
@@ -14,38 +14,8 @@
  * limitations under the License.
  */
 
-import org.jetbrains.dokka.gradle.DokkaPlugin
-import org.jetbrains.dokka.gradle.DokkaTask
-
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath("org.jetbrains.dokka:dokka-gradle-plugin:0.10.1")
-    }
-}
-
-apply<DokkaPlugin>()
-
-val dokka = tasks.named<DokkaTask>("dokka") {
-    outputFormat = "html"
-    outputDirectory = "$buildDir/reports/dokka"
-
-    configuration {
-        cacheRoot = "default"
-        skipDeprecated = true
-
-        sourceLink {
-            path = "$rootDir"
-            url = "https://github.com/appmattus/kotlinfixture/blob/main/"
-            lineSuffix = "#L"
-        }
-    }
-}
-
 tasks.register<Jar>("dokkaJar") {
-    dependsOn(dokka)
+    dependsOn(tasks.named("dokkaJavadoc"))
 
     archiveClassifier.set("javadoc")
     from("$buildDir/reports/dokka")
diff --git a/gradle/scripts/jacoco-android.gradle.kts b/gradle/scripts/jacoco-android.gradle.kts
@@ -26,7 +26,11 @@ val jacocoTask = tasks.register<JacocoReport>("jacocoTestReport") {
     }
 
     val fileFilter = listOf(
-        "**/R.class", "**/R\$*.class", "**/BuildConfig.*", "**/Manifest*.*", "**/*Test*.*",
+        "**/R.class",
+        "**/R\$*.class",
+        "**/BuildConfig.*",
+        "**/Manifest*.*",
+        "**/*Test*.*",
         "android/**/*.*"
     )
     val debugTree = fileTree("${project.buildDir}/intermediates/javac/debug") {
@@ -37,9 +41,11 @@ val jacocoTask = tasks.register<JacocoReport>("jacocoTestReport") {
 
     sourceDirectories.setFrom(files(listOf(mainSrc)))
     classDirectories.setFrom(files(listOf(debugTree)))
-    executionData.setFrom(fileTree(project.buildDir) {
-        include(listOf("jacoco/testDebugUnitTest.exec"))
-    })
+    executionData.setFrom(
+        fileTree(project.buildDir) {
+            include(listOf("jacoco/testDebugUnitTest.exec"))
+        }
+    )
 }
 
 tasks.named("check") {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
diff --git a/gradlew.bat b/gradlew.bat

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile`
`19`	`19`	`plugins {`
`20`	`20`	`kotlin("jvm")`
`21`	`21`	`id("com.android.lint")`
	`22`	`+ id("org.jetbrains.dokka")`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`apply(from = "$rootDir/gradle/scripts/bintray.gradle.kts")`
Original file line number	Diff line number	Diff line change
`@@ -319,11 +319,14 @@ class JavaFakerStrategyTest {`
`319`	`319`	`}`
`320`	`320`
`321`	`321`	`repeat(100) {`
`322`		`- assertEquals(2, fixture<Person> {`
`323`		`- javaFakerStrategy {`
`324`		`- password = Password(2, 2)`
`325`		`- }`
`326`		`- }.password.length)`
	`322`	`+ assertEquals(`
	`323`	`+ 2,`
	`324`	`+ fixture<Person> {`
	`325`	`+ javaFakerStrategy {`
	`326`	`+ password = Password(2, 2)`
	`327`	`+ }`
	`328`	`+ }.password.length`
	`329`	`+ )`
`327`	`330`	`}`
`328`	`331`	`}`
`329`	`332`