update kotlin to 1.6.21

RBusarow · RBusarow · commit 35662134fb93 · 2022-09-19T14:44:38.000-05:00
diff --git a/benchmarks/dungeon-benchmark/build.gradle.kts b/benchmarks/dungeon-benchmark/build.gradle.kts
@@ -16,6 +16,7 @@ android {
 
   kotlinOptions {
     jvmTarget = "1.8"
+    freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
   }
 
   defaultConfig {
diff --git a/benchmarks/dungeon-benchmark/src/main/java/com/squareup/sample/dungeon/benchmark/DungeonGatherBaselineProfile.kt b/benchmarks/dungeon-benchmark/src/main/java/com/squareup/sample/dungeon/benchmark/DungeonGatherBaselineProfile.kt
@@ -13,7 +13,6 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import kotlin.time.ExperimentalTime
 
 /**
  * Shamelessly copied from the example the Google Benchmark team made on the Lottie library
@@ -37,7 +36,7 @@ class DungeonGatherBaselineProfile {
   }
 
   @Test
-  @OptIn(ExperimentalTime::class) fun baselineProfiles() {
+  fun baselineProfiles() {
     baselineProfileRule.collectBaselineProfile(
       packageName = PACKAGE_NAME,
     ) {
diff --git a/benchmarks/performance-poetry/complex-benchmark/build.gradle.kts b/benchmarks/performance-poetry/complex-benchmark/build.gradle.kts
@@ -16,6 +16,7 @@ android {
 
   kotlinOptions {
     jvmTarget = "1.8"
+    freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
   }
 
   defaultConfig {
diff --git a/dependencies/classpath.txt b/dependencies/classpath.txt
@@ -49,10 +49,10 @@ com.google.android:annotations:4.1.1.4
 com.google.api.grpc:proto-google-common-protos:1.12.0
 com.google.auto.value:auto-value-annotations:1.6.2
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.6
+com.google.code.gson:gson:2.8.9
 com.google.crypto.tink:tink:1.3.0-rc2
 com.google.dagger:dagger:2.28.3
-com.google.devtools.ksp:symbol-processing-gradle-plugin:1.6.10-1.0.2
+com.google.devtools.ksp:symbol-processing-gradle-plugin:1.6.21-1.0.6
 com.google.errorprone:error_prone_annotations:2.3.4
 com.google.flatbuffers:flatbuffers-java:1.12.0
 com.google.guava:failureaccess:1.0.1
@@ -127,34 +127,34 @@ org.glassfish.jaxb:txw2:2.3.2
 org.jdom:jdom2:2.0.6
 org.jetbrains.dokka:dokka-core:1.5.31
 org.jetbrains.dokka:dokka-gradle-plugin:1.5.31
-org.jetbrains.intellij.deps:trove4j:1.0.20181211
-org.jetbrains.kotlin:kotlin-android-extensions:1.6.10
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.6.10
-org.jetbrains.kotlin:kotlin-build-common:1.6.10
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.10
-org.jetbrains.kotlin:kotlin-compiler-runner:1.6.10
-org.jetbrains.kotlin:kotlin-daemon-client:1.6.10
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.10
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.6.10
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.6.10
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10
-org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.6.10
-org.jetbrains.kotlin:kotlin-native-utils:1.6.10
-org.jetbrains.kotlin:kotlin-project-model:1.6.10
+org.jetbrains.intellij.deps:trove4j:1.0.20200330
+org.jetbrains.kotlin:kotlin-android-extensions:1.6.21
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.6.21
+org.jetbrains.kotlin:kotlin-build-common:1.6.21
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.21
+org.jetbrains.kotlin:kotlin-compiler-runner:1.6.21
+org.jetbrains.kotlin:kotlin-daemon-client:1.6.21
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.21
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.6.21
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.6.21
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.6.21
+org.jetbrains.kotlin:kotlin-native-utils:1.6.21
+org.jetbrains.kotlin:kotlin-project-model:1.6.21
 org.jetbrains.kotlin:kotlin-reflect:1.5.31
-org.jetbrains.kotlin:kotlin-scripting-common:1.6.10
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.10
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.10
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.10
-org.jetbrains.kotlin:kotlin-serialization:1.6.10
+org.jetbrains.kotlin:kotlin-scripting-common:1.6.21
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.21
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.21
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.21
+org.jetbrains.kotlin:kotlin-serialization:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31
 org.jetbrains.kotlin:kotlin-stdlib:1.5.31
-org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.10
-org.jetbrains.kotlin:kotlin-util-io:1.6.10
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.21
+org.jetbrains.kotlin:kotlin-util-io:1.6.21
 org.jetbrains.kotlin:kotlin-util-klib-metadata:1.6.0
-org.jetbrains.kotlin:kotlin-util-klib:1.6.10
+org.jetbrains.kotlin:kotlin-util-klib:1.6.21
 org.jetbrains.kotlinx:binary-compatibility-validator:0.11.1
 org.jetbrains.kotlinx:kotlinx-benchmark-plugin:0.4.2
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.1
diff --git a/gradle.properties b/gradle.properties
@@ -25,7 +25,3 @@ POM_DEVELOPER_ID=square
 POM_DEVELOPER_NAME=Square, Inc.
 POM_DEVELOPER_URL=https://github.com/square/
 SONATYPE_STAGING_PROFILE=com.squareup
-
-# For KMP in the IDE, until we get to Kotlin version 1.6.20
-kotlin.mpp.enableGranularSourceSetsMetadata=true
-kotlin.native.enableDependencyPropagation=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -11,7 +11,7 @@ androidx-appcompat = "1.3.1"
 androidx-benchmark = "1.1.0-rc03"
 androidx-cardview = "1.0.0"
 androidx-compose = "1.1.0-rc01"
-androidx-compose-compiler = "1.1.0-rc02"
+androidx-compose-compiler = "1.2.0-rc02"
 androidx-constraintlayout = "2.1.2"
 androidx-core = "1.6.0"
 androidx-fragment = "1.3.6"
@@ -39,15 +39,15 @@ dependencyGuard = "0.1.0"
 
 google-accompanist = "0.18.0"
 google-dagger = "2.40.5"
-google-ksp = "1.6.10-1.0.2"
+google-ksp = "1.6.21-1.0.6"
 google-material = "1.4.0"
 
 groovy = "3.0.9"
 jUnit = "4.13.2"
 javaParser = "3.24.0"
 jmh = "1.34"
 kotest = "5.1.0"
-kotlin = "1.6.10"
+kotlin = "1.6.21"
 
 kotlinx-binary-compatibility = "0.11.1"
 kotlinx-coroutines = "1.6.4"
diff --git a/internal-testing-utils/dependencies/runtimeClasspath.txt b/internal-testing-utils/dependencies/runtimeClasspath.txt
@@ -1,6 +1,6 @@
-org.jetbrains.kotlin:kotlin-bom:1.6.10
-org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10
-org.jetbrains.kotlin:kotlin-stdlib:1.6.10
+org.jetbrains.kotlin:kotlin-bom:1.6.21
+org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21
+org.jetbrains.kotlin:kotlin-stdlib:1.6.21
 org.jetbrains:annotations:13.0
diff --git a/trace-encoder/dependencies/runtimeClasspath.txt b/trace-encoder/dependencies/runtimeClasspath.txt
@@ -2,7 +2,7 @@ com.squareup.moshi:moshi-adapters:1.13.0
 com.squareup.moshi:moshi:1.13.0
 com.squareup.okio:okio-jvm:3.0.0
 com.squareup.okio:okio:3.0.0
-org.jetbrains.kotlin:kotlin-bom:1.6.10
+org.jetbrains.kotlin:kotlin-bom:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21
diff --git a/workflow-config/config-android/dependencies/releaseRuntimeClasspath.txt b/workflow-config/config-android/dependencies/releaseRuntimeClasspath.txt
@@ -2,7 +2,7 @@
 :workflow-runtime
 com.squareup.okio:okio-jvm:3.0.0
 com.squareup.okio:okio:3.0.0
-org.jetbrains.kotlin:kotlin-bom:1.6.10
+org.jetbrains.kotlin:kotlin-bom:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21
diff --git a/workflow-config/config-jvm/dependencies/runtimeClasspath.txt b/workflow-config/config-jvm/dependencies/runtimeClasspath.txt
@@ -2,7 +2,7 @@
 :workflow-runtime
 com.squareup.okio:okio-jvm:3.0.0
 com.squareup.okio:okio:3.0.0
-org.jetbrains.kotlin:kotlin-bom:1.6.10
+org.jetbrains.kotlin:kotlin-bom:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21
diff --git a/workflow-core/dependencies/jvmRuntimeClasspath.txt b/workflow-core/dependencies/jvmRuntimeClasspath.txt
@@ -1,6 +1,6 @@
 com.squareup.okio:okio-jvm:3.0.0
 com.squareup.okio:okio:3.0.0
-org.jetbrains.kotlin:kotlin-bom:1.6.10
+org.jetbrains.kotlin:kotlin-bom:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib:1.6.21
diff --git a/workflow-core/dependencies/runtimeClasspath.txt b/workflow-core/dependencies/runtimeClasspath.txt
@@ -1,6 +1,6 @@
 com.squareup.okio:okio-jvm:3.0.0
 com.squareup.okio:okio:3.0.0
-org.jetbrains.kotlin:kotlin-bom:1.6.10
+org.jetbrains.kotlin:kotlin-bom:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21
diff --git a/workflow-runtime/build.gradle.kts b/workflow-runtime/build.gradle.kts
@@ -16,7 +16,7 @@ kotlin {
       val workflowNode by creating {
         kotlinOptions {
           val compileKotlinJvm: KotlinCompile by tasks
-          freeCompilerArgs += "-Xfriend-paths=${compileKotlinJvm.destinationDir}"
+          freeCompilerArgs += "-Xfriend-paths=${compileKotlinJvm.destinationDirectory}"
         }
         defaultSourceSet {
           dependencies {
diff --git a/workflow-runtime/dependencies/jvmRuntimeClasspath.txt b/workflow-runtime/dependencies/jvmRuntimeClasspath.txt
@@ -1,7 +1,7 @@
 :workflow-core
 com.squareup.okio:okio-jvm:3.0.0
 com.squareup.okio:okio:3.0.0
-org.jetbrains.kotlin:kotlin-bom:1.6.10
+org.jetbrains.kotlin:kotlin-bom:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib:1.6.21
diff --git a/workflow-runtime/dependencies/jvmWorkflowNodeRuntimeClasspath.txt b/workflow-runtime/dependencies/jvmWorkflowNodeRuntimeClasspath.txt
@@ -1,8 +1,8 @@
 net.sf.jopt-simple:jopt-simple:5.0.4
 org.apache.commons:commons-math3:3.2
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10
-org.jetbrains.kotlin:kotlin-stdlib:1.6.10
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21
+org.jetbrains.kotlin:kotlin-stdlib:1.6.21
 org.jetbrains.kotlinx:kotlinx-benchmark-runtime-jvm:0.4.2
 org.jetbrains.kotlinx:kotlinx-benchmark-runtime:0.4.2
 org.jetbrains:annotations:13.0
diff --git a/workflow-runtime/src/commonTest/kotlin/com/squareup/workflow1/internal/RealRenderContextTest.kt b/workflow-runtime/src/commonTest/kotlin/com/squareup/workflow1/internal/RealRenderContextTest.kt
@@ -14,6 +14,7 @@ import com.squareup.workflow1.internal.RealRenderContextTest.TestRenderer.Render
 import com.squareup.workflow1.renderChild
 import com.squareup.workflow1.stateless
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.Channel.Factory.UNLIMITED
 import kotlin.test.Test
@@ -96,6 +97,7 @@ internal class RealRenderContextTest {
   private val eventActionsChannel =
     Channel<WorkflowAction<String, String, String>>(capacity = UNLIMITED)
 
+  @OptIn(ExperimentalCoroutinesApi::class)
   @Test fun `send completes update`() {
     val context = createdPoisonedContext()
     val stringAction = action<String, String, String>({ "stringAction" }) { }
diff --git a/workflow-rx2/dependencies/runtimeClasspath.txt b/workflow-rx2/dependencies/runtimeClasspath.txt
@@ -2,7 +2,7 @@
 com.squareup.okio:okio-jvm:3.0.0
 com.squareup.okio:okio:3.0.0
 io.reactivex.rxjava2:rxjava:2.2.21
-org.jetbrains.kotlin:kotlin-bom:1.6.10
+org.jetbrains.kotlin:kotlin-bom:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21
diff --git a/workflow-testing/dependencies/runtimeClasspath.txt b/workflow-testing/dependencies/runtimeClasspath.txt
@@ -4,8 +4,8 @@
 :workflow-runtime
 com.squareup.okio:okio-jvm:3.0.0
 com.squareup.okio:okio:3.0.0
-org.jetbrains.kotlin:kotlin-bom:1.6.10
-org.jetbrains.kotlin:kotlin-reflect:1.6.10
+org.jetbrains.kotlin:kotlin-bom:1.6.21
+org.jetbrains.kotlin:kotlin-reflect:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21
diff --git a/workflow-tracing/dependencies/runtimeClasspath.txt b/workflow-tracing/dependencies/runtimeClasspath.txt
@@ -5,7 +5,7 @@ com.squareup.moshi:moshi-adapters:1.13.0
 com.squareup.moshi:moshi:1.13.0
 com.squareup.okio:okio-jvm:3.0.0
 com.squareup.okio:okio:3.0.0
-org.jetbrains.kotlin:kotlin-bom:1.6.10
+org.jetbrains.kotlin:kotlin-bom:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21
diff --git a/workflow-ui/compose-tooling/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/compose-tooling/dependencies/releaseRuntimeClasspath.txt
@@ -40,7 +40,7 @@ androidx.transition:transition:1.4.1
 androidx.versionedparcelable:versionedparcelable:1.1.1
 com.squareup.okio:okio-jvm:3.0.0
 com.squareup.okio:okio:3.0.0
-org.jetbrains.kotlin:kotlin-bom:1.6.10
+org.jetbrains.kotlin:kotlin-bom:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21
diff --git a/workflow-ui/compose/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/compose/dependencies/releaseRuntimeClasspath.txt
@@ -35,7 +35,7 @@ androidx.transition:transition:1.4.1
 androidx.versionedparcelable:versionedparcelable:1.1.1
 com.squareup.okio:okio-jvm:3.0.0
 com.squareup.okio:okio:3.0.0
-org.jetbrains.kotlin:kotlin-bom:1.6.10
+org.jetbrains.kotlin:kotlin-bom:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21
diff --git a/workflow-ui/container-android/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/container-android/dependencies/releaseRuntimeClasspath.txt
@@ -35,7 +35,7 @@ androidx.versionedparcelable:versionedparcelable:1.1.1
 androidx.viewpager:viewpager:1.0.0
 com.squareup.okio:okio-jvm:3.0.0
 com.squareup.okio:okio:3.0.0
-org.jetbrains.kotlin:kotlin-bom:1.6.10
+org.jetbrains.kotlin:kotlin-bom:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21
diff --git a/workflow-ui/container-common/dependencies/runtimeClasspath.txt b/workflow-ui/container-common/dependencies/runtimeClasspath.txt
@@ -1,7 +1,7 @@
 :workflow-ui:core-common
 com.squareup.okio:okio-jvm:3.0.0
 com.squareup.okio:okio:3.0.0
-org.jetbrains.kotlin:kotlin-bom:1.6.10
+org.jetbrains.kotlin:kotlin-bom:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21
diff --git a/workflow-ui/core-android/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/core-android/dependencies/releaseRuntimeClasspath.txt
@@ -21,7 +21,7 @@ androidx.transition:transition:1.4.1
 androidx.versionedparcelable:versionedparcelable:1.1.1
 com.squareup.okio:okio-jvm:3.0.0
 com.squareup.okio:okio:3.0.0
-org.jetbrains.kotlin:kotlin-bom:1.6.10
+org.jetbrains.kotlin:kotlin-bom:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21
diff --git a/workflow-ui/core-common/dependencies/runtimeClasspath.txt b/workflow-ui/core-common/dependencies/runtimeClasspath.txt
@@ -1,6 +1,6 @@
 com.squareup.okio:okio-jvm:3.0.0
 com.squareup.okio:okio:3.0.0
-org.jetbrains.kotlin:kotlin-bom:1.6.10
+org.jetbrains.kotlin:kotlin-bom:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21
diff --git a/workflow-ui/radiography/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/radiography/dependencies/releaseRuntimeClasspath.txt
@@ -24,7 +24,7 @@ com.squareup.curtains:curtains:1.2.1
 com.squareup.okio:okio-jvm:3.0.0
 com.squareup.okio:okio:3.0.0
 com.squareup.radiography:radiography:2.4.0
-org.jetbrains.kotlin:kotlin-bom:1.6.10
+org.jetbrains.kotlin:kotlin-bom:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ android {`
`16`	`16`
`17`	`17`	`kotlinOptions {`
`18`	`18`	`jvmTarget = "1.8"`
	`19`	`+ freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`defaultConfig {`