Update to Kotlin 1.8.21 (#95)

mattmook · web-flow · commit ea9a68630aa1 · 2023-04-28T19:14:04.000+01:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -27,7 +27,7 @@ jobs:
     - uses: actions/setup-java@v2
       with:
         distribution: 'zulu'
-        java-version: '11'
+        java-version: '17'
 
     - name: Build with Gradle
       run: ./gradlew assemble check --stacktrace
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Appmattus Limited
+ * Copyright 2021-2023 Appmattus Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 import org.jetbrains.dokka.gradle.DokkaPlugin
 import org.jetbrains.dokka.gradle.DokkaTask
-import java.net.URL
+import java.net.URI
 
 plugins {
     kotlin("jvm") version Versions.kotlin apply false
@@ -42,7 +42,6 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        jcenter()
         maven { setUrl("https://jitpack.io") }
     }
 
@@ -61,7 +60,7 @@ allprojects {
 
                     sourceLink {
                         localDirectory.set(rootDir)
-                        remoteUrl.set(URL("https://github.com/appmattus/kotlinfixture/blob/main"))
+                        remoteUrl.set(URI("https://github.com/appmattus/kotlinfixture/blob/main").toURL())
                         remoteLineSuffix.set("#L")
                     }
                 }
@@ -79,7 +78,14 @@ dependencies {
 }
 
 detekt {
-    input = files("$projectDir")
+    source = files(fileTree(projectDir).matching {
+        include("**/*.kt")
+        include("**/*.kts")
+        exclude("**/resources/**")
+        exclude("**/build/**")
+    }.files)
+
+    // input = files("$projectDir")
 
     buildUponDefaultConfig = true
 
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Appmattus Limited
+ * Copyright 2021-2023 Appmattus Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,11 +21,12 @@ plugins {
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
-kotlinDslPluginOptions {
-    experimentalWarning.set(false)
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 tasks.withType(KotlinCompile::class.java).all {
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Appmattus Limited
+ * Copyright 2021-2023 Appmattus Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,37 +16,37 @@
 
 object Versions {
 
-    const val kotlin = "1.6.0"
+    const val kotlin = "1.8.21"
 
-    const val androidGradlePlugin = "7.0.3"
+    const val androidGradlePlugin = "8.0.0"
     const val dependencyCheckGradlePlugin = "6.1.1"
     const val detektGradlePlugin = "1.18.1"
-    const val dokkaPlugin = "1.5.31"
+    const val dokkaPlugin = "1.8.10"
     const val gradleMavenPublishPlugin = "0.18.0"
     const val gradleVersionsPlugin = "0.36.0"
     const val markdownlintGradlePlugin = "0.6.0"
 
-    const val classgraph = "4.8.133"
-    const val coroutines = "1.5.2"
+    const val classgraph = "4.8.157"
+    const val coroutines = "1.6.4"
     const val generex = "1.0.2"
     const val javafaker = "1.0.2"
-    const val jodaTime = "2.10.13"
+    const val jodaTime = "2.12.5"
     const val multiplatformSettings = "0.7.2"
-    const val threeTen = "1.5.2"
-    const val kTorm = "3.4.1"
+    const val threeTen = "1.6.8"
+    const val kTorm = "3.6.0"
 
     const val junit4 = "4.13.2"
     const val kotest = "4.6.3"
     const val mockitoKotlin = "2.2.0"
-    const val robolectric = "4.7"
+    const val robolectric = "4.10"
 
     const val easyrandom = "5.0.0"
     const val flextrade = "0.2.0"
     const val marcellogalhardo = "0.0.2"
 
     object AndroidX {
-        const val testCore = "1.4.0"
-        const val testExtJunit = "1.1.3"
-        const val testRunner = "1.4.0"
+        const val testCore = "1.5.0"
+        const val testExtJunit = "1.1.5"
+        const val testRunner = "1.5.2"
     }
 }
diff --git a/fixture-android-tests/build.gradle.kts b/fixture-android-tests/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Appmattus Limited
+ * Copyright 2021-2023 Appmattus Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,11 +24,12 @@ plugins {
 apply(from = "$rootDir/gradle/scripts/jacoco-android.gradle.kts")
 
 android {
-    compileSdk = 30
+    namespace = "com.appmattus.fixture.android.tests"
+
+    compileSdk = 33
 
     defaultConfig {
         minSdk = 19
-        targetSdk = 30
     }
 
     testOptions {
@@ -37,9 +38,9 @@ android {
         }
     }
 
-    lintOptions {
-        isAbortOnError = true
-        isWarningsAsErrors = true
+    lint {
+        abortOnError = true
+        warningsAsErrors = true
     }
 
     java {
diff --git a/fixture-android-tests/src/main/AndroidManifest.xml b/fixture-android-tests/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright 2019 Appmattus Limited
+  ~ Copyright 2019-2023 Appmattus Limited
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -14,4 +14,4 @@
   ~ limitations under the License.
   -->
 
-<manifest package="com.appmattus.fixture.android.tests" />
+<manifest />
diff --git a/fixture-generex/build.gradle.kts b/fixture-generex/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Appmattus Limited
+ * Copyright 2021-2023 Appmattus Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,9 +39,9 @@ dependencies {
     testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:${Versions.coroutines}")
 }
 
-lintOptions {
-    isAbortOnError = true
-    isWarningsAsErrors = true
+lint {
+    abortOnError = true
+    warningsAsErrors = true
     htmlOutput = file("$buildDir/reports/lint-results.html")
     xmlOutput = file("$buildDir/reports/lint-results.xml")
 }
diff --git a/fixture-javafaker/build.gradle.kts b/fixture-javafaker/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Appmattus Limited
+ * Copyright 2021-2023 Appmattus Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,9 +44,9 @@ dependencies {
     testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:${Versions.coroutines}")
 }
 
-lintOptions {
-    isAbortOnError = true
-    isWarningsAsErrors = true
+lint {
+    abortOnError = true
+    warningsAsErrors = true
     htmlOutput = file("$buildDir/reports/lint-results.html")
     xmlOutput = file("$buildDir/reports/lint-results.xml")
 }
diff --git a/fixture-kotest/build.gradle.kts b/fixture-kotest/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Appmattus Limited
+ * Copyright 2021-2023 Appmattus Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,9 +39,9 @@ dependencies {
     testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:${Versions.coroutines}")
 }
 
-lintOptions {
-    isAbortOnError = true
-    isWarningsAsErrors = true
+lint {
+    abortOnError = true
+    warningsAsErrors = true
     htmlOutput = file("$buildDir/reports/lint-results.html")
     xmlOutput = file("$buildDir/reports/lint-results.xml")
 }
diff --git a/fixture/build.gradle.kts b/fixture/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Appmattus Limited
+ * Copyright 2021-2023 Appmattus Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,9 +53,9 @@ dependencies {
     testImplementation("org.jeasy:easy-random-core:${Versions.easyrandom}")
 }
 
-lintOptions {
-    isAbortOnError = true
-    isWarningsAsErrors = true
+lint {
+    abortOnError = true
+    warningsAsErrors = true
     htmlOutput = file("$buildDir/reports/lint-results.html")
     xmlOutput = file("$buildDir/reports/lint-results.xml")
 }
diff --git a/fixture/src/main/kotlin/com/appmattus/kotlinfixture/decorator/constructor/ArrayFavouringConstructorStrategy.kt b/fixture/src/main/kotlin/com/appmattus/kotlinfixture/decorator/constructor/ArrayFavouringConstructorStrategy.kt
@@ -27,7 +27,7 @@ import kotlin.reflect.full.starProjectedType
  */
 object ArrayFavouringConstructorStrategy : ConstructorStrategy {
 
-    @Suppress("EXPERIMENTAL_API_USAGE")
+    @OptIn(ExperimentalUnsignedTypes::class)
     private val arrayTypes = listOf(
         Array<Any>::class,
 
diff --git a/fixture/src/main/kotlin/com/appmattus/kotlinfixture/resolver/PrimitiveArrayResolver.kt b/fixture/src/main/kotlin/com/appmattus/kotlinfixture/resolver/PrimitiveArrayResolver.kt
@@ -21,7 +21,8 @@ import com.appmattus.kotlinfixture.Unresolved
 
 internal class PrimitiveArrayResolver : Resolver {
 
-    @Suppress("EXPERIMENTAL_API_USAGE", "ComplexMethod")
+    @OptIn(ExperimentalUnsignedTypes::class)
+    @Suppress("ComplexMethod")
     override fun resolve(context: Context, obj: Any): Any? = when (obj) {
         BooleanArray::class -> context.resolveConstructor(::BooleanArray)
 
diff --git a/fixture/src/test/kotlin/com/appmattus/kotlinfixture/ComparisonTest.kt b/fixture/src/test/kotlin/com/appmattus/kotlinfixture/ComparisonTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Appmattus Limited
+ * Copyright 2021-2023 Appmattus Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -336,8 +336,9 @@ class ComparisonTest {
         }
 
         companion object {
+            @OptIn(ExperimentalUnsignedTypes::class)
             @JvmStatic
-            @Suppress("EXPERIMENTAL_API_USAGE", "LongMethod")
+            @Suppress("LongMethod")
             @Parameterized.Parameters(name = "{0}")
             fun data() = arrayOf(
                 // Boolean
@@ -504,17 +505,17 @@ class ComparisonTest {
                 arrayOf(typeOf<DateFormat>(), VALID, UNSUPPORTED, UNSUPPORTED, UNSUPPORTED),
                 arrayOf(typeOf<SimpleDateFormat>(), VALID, UNSUPPORTED, NOT_RANDOM, UNSUPPORTED),
                 arrayOf(typeOf<NumberFormat>(), VALID, UNSUPPORTED, UNSUPPORTED, UNSUPPORTED),
-                arrayOf(typeOf<DecimalFormat>(), VALID, UNSUPPORTED, NOT_RANDOM, VALID),
+                arrayOf(typeOf<DecimalFormat>(), VALID, UNSUPPORTED, NOT_RANDOM, UNSUPPORTED),
 
-                arrayOf(typeOf<Currency>(), VALID, UNSUPPORTED, UNSUPPORTED, VALID),
+                arrayOf(typeOf<Currency>(), VALID, UNSUPPORTED, UNSUPPORTED, UNSUPPORTED),
                 arrayOf(typeOf<Locale>(), VALID, UNSUPPORTED, VALID, VALID),
 
                 // Atomic class
-                arrayOf(typeOf<AtomicBoolean>(), VALID, VALID, VALID, VALID),
+                arrayOf(typeOf<AtomicBoolean>(), VALID, VALID, VALID, UNSUPPORTED),
                 arrayOf(typeOf<AtomicInteger>(), VALID, VALID, VALID, VALID),
                 arrayOf(typeOf<AtomicLong>(), VALID, VALID, VALID, VALID),
-                arrayOf(typeOf<AtomicIntegerArray>(), VALID, VALID, IGNORE, VALID),
-                arrayOf(typeOf<AtomicLongArray>(), VALID, VALID, IGNORE, VALID),
+                arrayOf(typeOf<AtomicIntegerArray>(), VALID, VALID, IGNORE, UNSUPPORTED),
+                arrayOf(typeOf<AtomicLongArray>(), VALID, VALID, IGNORE, UNSUPPORTED),
                 arrayOf(typeOf<AtomicReference<String>>(), VALID, UNSUPPORTED, VALID, UNSUPPORTED),
 
                 // Enum
diff --git a/fixture/src/test/kotlin/com/appmattus/kotlinfixture/resolver/PrimitiveArrayResolverTest.kt b/fixture/src/test/kotlin/com/appmattus/kotlinfixture/resolver/PrimitiveArrayResolverTest.kt
@@ -87,8 +87,8 @@ class PrimitiveArrayResolverTest {
         }
 
         companion object {
+            @OptIn(ExperimentalUnsignedTypes::class)
             @JvmStatic
-            @Suppress("EXPERIMENTAL_API_USAGE")
             @Parameterized.Parameters(name = "{0}")
             fun data() = arrayOf(
                 arrayOf(BooleanArray::class),
diff --git a/gradle/scripts/dependencyUpdates.gradle.kts b/gradle/scripts/dependencyUpdates.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Appmattus Limited
+ * Copyright 2021-2023 Appmattus Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven(url = "https://plugins.gradle.org/m2/")
     }
     dependencies {
@@ -31,7 +31,7 @@ buildscript {
 apply<VersionsPlugin>()
 
 fun isNonStable(version: String): Boolean {
-    val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) }
+    val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.uppercase().contains(it) }
     val regex = "^[0-9,.v-]+(-r)?$".toRegex()
     return !stableKeyword && !regex.matches(version)
 }
diff --git a/gradle/scripts/jacoco-android.gradle.kts b/gradle/scripts/jacoco-android.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Appmattus Limited
+ * Copyright 2019-2023 Appmattus Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,9 +20,9 @@ val jacocoTask = tasks.register<JacocoReport>("jacocoTestReport") {
     dependsOn(tasks.named("testDebugUnitTest"))
 
     reports {
-        html.isEnabled = true
-        xml.isEnabled = true
-        csv.isEnabled = false
+        html.required.set(true)
+        xml.required.set(true)
+        csv.required.set(false)
     }
 
     val fileFilter = listOf(
@@ -51,3 +51,7 @@ val jacocoTask = tasks.register<JacocoReport>("jacocoTestReport") {
 tasks.named("check") {
     finalizedBy(jacocoTask)
 }
+
+configure<JacocoPluginExtension> {
+    toolVersion = "0.8.9"
+}
diff --git a/gradle/scripts/jacoco.gradle.kts b/gradle/scripts/jacoco.gradle.kts
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
diff --git a/owaspDependencyCheck.gradle.kts b/owaspDependencyCheck.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2021 Appmattus Limited`
	`2`	`+ * Copyright 2021-2023 Appmattus Limited`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -21,11 +21,12 @@ plugins {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`repositories {`
`24`		`- jcenter()`
	`24`	`+ mavenCentral()`
`25`	`25`	`}`
`26`	`26`
`27`		`-kotlinDslPluginOptions {`
`28`		`- experimentalWarning.set(false)`
	`27`	`+java {`
	`28`	`+ sourceCompatibility = JavaVersion.VERSION_1_8`
	`29`	`+ targetCompatibility = JavaVersion.VERSION_1_8`
`29`	`30`	`}`
`30`	`31`
`31`	`32`	`tasks.withType(KotlinCompile::class.java).all {`