Update to Kotlin 1.5.31 (#86)

Plus other dependencies

Author: mattmook

.github/workflows/main.yml

@@ -23,12 +23,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
-      
-    - name: set up JDK 1.8
-      uses: actions/setup-java@v1
+    - uses: actions/checkout@v2
+    - uses: actions/setup-java@v2
       with:
-        java-version: 1.8
+        distribution: 'zulu'
+        java-version: '11'
 
     - name: Build with Gradle
       run: ./gradlew assemble check --stacktrace

buildSrc/src/main/kotlin/Versions.kt

@@ -16,36 +16,36 @@
 
 object Versions {
 
-    const val kotlin = "1.4.30"
+    const val kotlin = "1.5.31"
 
-    const val androidGradlePlugin = "4.1.2"
+    const val androidGradlePlugin = "7.0.2"
     const val dependencyCheckGradlePlugin = "6.1.1"
-    const val detektGradlePlugin = "1.16.0-RC1"
-    const val dokkaPlugin = "1.4.20"
-    const val gradleMavenPublishPlugin = "0.14.2"
+    const val detektGradlePlugin = "1.18.1"
+    const val dokkaPlugin = "1.5.30"
+    const val gradleMavenPublishPlugin = "0.18.0"
     const val gradleVersionsPlugin = "0.36.0"
     const val markdownlintGradlePlugin = "0.6.0"
 
-    const val classgraph = "4.8.102"
-    const val coroutines = "1.4.2"
+    const val classgraph = "4.8.117"
+    const val coroutines = "1.5.2"
     const val generex = "1.0.2"
     const val javafaker = "1.0.2"
-    const val jodaTime = "2.10.10"
+    const val jodaTime = "2.10.12"
     const val multiplatformSettings = "0.7.2"
-    const val threeTen = "1.5.0"
+    const val threeTen = "1.5.1"
 
     const val junit4 = "4.13.2"
-    const val kotest = "4.4.1"
+    const val kotest = "4.6.3"
     const val mockitoKotlin = "2.2.0"
-    const val robolectric = "4.5.1"
+    const val robolectric = "4.6.1"
 
-    const val easyrandom = "4.3.0"
+    const val easyrandom = "5.0.0"
     const val flextrade = "0.2.0"
     const val marcellogalhardo = "0.0.2"
 
     object AndroidX {
-        const val testCore = "1.3.0"
-        const val testExtJunit = "1.1.2"
-        const val testRunner = "1.3.0"
+        const val testCore = "1.4.0"
+        const val testExtJunit = "1.1.3"
+        const val testRunner = "1.4.0"
     }
 }

fixture-android-tests/build.gradle.kts

@@ -24,13 +24,11 @@ plugins {
 apply(from = "$rootDir/gradle/scripts/jacoco-android.gradle.kts")
 
 android {
-    compileSdkVersion(30)
+    compileSdk = 30
 
     defaultConfig {
-        minSdkVersion(19)
-        targetSdkVersion(30)
-        versionCode = 1
-        versionName = "1.0"
+        minSdk = 19
+        targetSdk = 30
     }
 
     testOptions {

fixture-kotest/src/main/kotlin/com/appmattus/kotlinfixture/kotest/ForAllExt.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Appmattus Limited
+ * Copyright 2021 Appmattus Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,54 +19,43 @@
 package com.appmattus.kotlinfixture.kotest
 
 import com.appmattus.kotlinfixture.Fixture
-import io.kotest.matchers.shouldBe
 import io.kotest.property.PropTestConfig
 import io.kotest.property.PropertyContext
-import io.kotest.property.PropertyTesting
 import io.kotest.property.forAll
-import io.kotest.property.internal.proptest
 
 // 1 parameter
 
 /**
  * Use [Fixture] to generate random objects for type parameters and validate the [function] returns true `forAll`.
  */
 suspend inline fun <reified A> Fixture.forAll(
-    crossinline function: suspend PropertyContext.(a: A) -> Boolean
-) = proptest(PropertyTesting.defaultIterationCount, kotestGen<A>(), PropTestConfig()) { a ->
-    function(a) shouldBe true
-}
+    noinline function: suspend PropertyContext.(a: A) -> Boolean
+) = forAll(kotestGen(), function)
 
 /**
  * Use [Fixture] to generate random objects for type parameters and validate the [function] returns true `forAll`.
  */
 suspend inline fun <reified A> Fixture.forAll(
     iterations: Int,
-    crossinline function: suspend PropertyContext.(a: A) -> Boolean
-) = proptest(iterations, kotestGen<A>(), PropTestConfig()) { a ->
-    function(a) shouldBe true
-}
+    noinline function: suspend PropertyContext.(a: A) -> Boolean
+) = forAll(iterations, kotestGen(), function)
 
 /**
  * Use [Fixture] to generate random objects for type parameters and validate the [function] returns true `forAll`.
  */
 suspend inline fun <reified A> Fixture.forAll(
     config: PropTestConfig,
-    crossinline function: suspend PropertyContext.(a: A) -> Boolean
-) = proptest(PropertyTesting.defaultIterationCount, kotestGen<A>(), config) { a ->
-    function(a) shouldBe true
-}
+    noinline function: suspend PropertyContext.(a: A) -> Boolean
+) = forAll(config, kotestGen(), function)
 
 /**
  * Use [Fixture] to generate random objects for type parameters and validate the [function] returns true `forAll`.
  */
 suspend inline fun <reified A> Fixture.forAll(
     iterations: Int,
     config: PropTestConfig,
-    crossinline function: suspend PropertyContext.(a: A) -> Boolean
-) = proptest(iterations, kotestGen<A>(), config) { a ->
-    function(a) shouldBe true
-}
+    noinline function: suspend PropertyContext.(a: A) -> Boolean
+) = forAll(iterations, config, kotestGen(), function)
 
 // 2 parameters
 

fixture/src/main/kotlin/com/appmattus/kotlinfixture/resolver/CharResolver.kt

@@ -21,8 +21,8 @@ import com.appmattus.kotlinfixture.Unresolved
 
 internal class CharResolver : Resolver {
 
-    override fun resolve(context: Context, obj: Any): Any? =
-        if (obj == Char::class) (context.random.nextInt(LETTERS) + 'a'.toInt()).toChar() else Unresolved.Unhandled
+    override fun resolve(context: Context, obj: Any): Any =
+        if (obj == Char::class) (context.random.nextInt(LETTERS) + 'a'.code).toChar() else Unresolved.Unhandled
 
     companion object {
         private const val LETTERS = 26

fixture/src/main/kotlin/com/appmattus/kotlinfixture/resolver/DateResolver.kt

@@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit
 
 internal class DateResolver : Resolver {
 
-    override fun resolve(context: Context, obj: Any): Any? {
+    override fun resolve(context: Context, obj: Any): Any {
         return when (obj) {
             Date::class -> context.generateJavaUtilDate()
             java.sql.Date::class -> java.sql.Date(context.generateJavaUtilDate().time)
@@ -39,8 +39,8 @@ internal class DateResolver : Resolver {
         return Date(
             @Suppress("MagicNumber")
             random.nextLong(
-                referenceTime - TimeUnit.DAYS.toMillis(365 * 10),
-                referenceTime + TimeUnit.DAYS.toMillis(365 * 10)
+                referenceTime - TimeUnit.DAYS.toMillis(3650),
+                referenceTime + TimeUnit.DAYS.toMillis(3650)
             )
         )
     }

fixture/src/main/kotlin/com/appmattus/kotlinfixture/resolver/PopulateInstance.kt

@@ -55,8 +55,7 @@ internal interface PopulateInstance {
         callContext.obj.memberFunctions.filter {
             it.name.startsWith("set") && it.valueParameters.size == 1
         }.filterNot {
-            @Suppress("EXPERIMENTAL_API_USAGE_ERROR")
-            val name = it.name.removePrefix("set").decapitalize(Locale.getDefault())
+            val name = it.name.removePrefix("set").replaceFirstChar { it.lowercase(Locale.getDefault()) }
             callContext.constructorParameterNames.contains(name)
         }.forEach {
             val propertyResult = callContext.context.resolve(

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists