Update ktlint to 0.46.0-SNAPSHOT (actual 0.46.0-20220520.192227-74)
This snapshot version of ktlint supports Kotlin's context receivers syntax.
See: https://github.com/pinterest/ktlint/issues/1436
Bug: 218707899
Bug: 231447570
Bug: 234161459
Test: ./gradlew ktlint
Change-Id: I61a1055693e79997fdcf75929f4572fb5488d419
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/Ktlint.kt b/buildSrc/private/src/main/kotlin/androidx/build/Ktlint.kt
index f6ca335..78aa90c 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/Ktlint.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/Ktlint.kt
@@ -65,6 +65,9 @@
"final-newline",
// TODO: reenable when https://github.com/pinterest/ktlint/issues/1221 is resolved
"indent",
+ // TODO: reenable when 'indent' is also enabled, meanwhile its to keep the status-quo
+ // see: https://github.com/pinterest/ktlint/releases/tag/0.45.0
+ "wrapping",
).joinToString(",")
private const val ExcludeTestDataFiles = "**/test-data/**/*.kt"
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionRegistrarImpl.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionRegistrarImpl.kt
index c2a6216..b07e058 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionRegistrarImpl.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionRegistrarImpl.kt
@@ -64,9 +64,8 @@
/**
* The callback to be invoked when the selection is initiated.
*/
- internal var onSelectionUpdateStartCallback: (
- (LayoutCoordinates, Offset, SelectionAdjustment) -> Unit
- )? = null
+ internal var onSelectionUpdateStartCallback:
+ ((LayoutCoordinates, Offset, SelectionAdjustment) -> Unit)? = null
/**
* The callback to be invoked when the selection is initiated with selectAll [Selection].
@@ -79,9 +78,8 @@
* The callback to be invoked when the selection is updated.
* If the first offset is null it means that the start of selection is unknown for the caller.
*/
- internal var onSelectionUpdateCallback: (
- (LayoutCoordinates, Offset, Offset, Boolean, SelectionAdjustment) -> Boolean
- )? = null
+ internal var onSelectionUpdateCallback:
+ ((LayoutCoordinates, Offset, Offset, Boolean, SelectionAdjustment) -> Boolean)? = null
/**
* The callback to be invoked when selection update finished.
diff --git a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/input/EditingBuffer.kt b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/input/EditingBuffer.kt
index e4e990d8..03b9dea 100644
--- a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/input/EditingBuffer.kt
+++ b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/input/EditingBuffer.kt
@@ -242,7 +242,7 @@
"start ($start) offset is outside of text region ${gapBuffer.length}"
)
}
- if (end < 0 || end> gapBuffer.length) {
+ if (end < 0 || end > gapBuffer.length) {
throw IndexOutOfBoundsException(
"end ($end) offset is outside of text region ${gapBuffer.length}"
)
@@ -274,7 +274,7 @@
"start ($start) offset is outside of text region ${gapBuffer.length}"
)
}
- if (end < 0 || end> gapBuffer.length) {
+ if (end < 0 || end > gapBuffer.length) {
throw IndexOutOfBoundsException(
"end ($end) offset is outside of text region ${gapBuffer.length}"
)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3e702d3..dead417 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -35,7 +35,7 @@
kotlinCompileTesting = "1.4.1"
kotlinCoroutines = "1.6.1"
ksp = "1.6.21-1.0.5"
-ktlint = "0.43.0"
+ktlint = "0.46.0-SNAPSHOT" # Actual: 0.46.0-20220520.192227-74
leakcanary = "2.8.1"
metalava = "1.0.0-alpha06"
mockito = "2.25.0"
diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index c7e8396..26287ca 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -2387,6 +2387,41 @@
-----END PGP PUBLIC KEY BLOCK-----
+pub 36D4E9618F3ADAB5
+sub C4935FA8AC763C70
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v1.68
+
+mQGNBGGiftwBDAC94Yhhh/5yO8jYFkg01MPnooXKZEPwxAbAg9wn5iM0tHxhEpkU
+zJVYZ+JYq013+Ldp8Of7A/d6hKTtZ0xwSeY7S/WFykIk6tc0P5j0sfFS3pGPDk+W
+D3DwUa+8m0PriF7iA57vCOE51znO/IUIA3PG2YAK6jv2/i8MDXOOq3qB7VrbvKGB
+kIPubp5PbjvP+LFhLuUReU9m2y/3q9lNFXdd9kE2iScqGmu3FDhRJxBK/WQ2kqiv
+sJZjAYeHEVNcc88Ah6vXI73uYrvWVGCErzswYy9UrxCAQ/x2OxUdLw7NTHwjZSYC
+JvH5JPPTlDxMgfwTIsmaECtw4QgiVmvDp+RVa9zyrdI++RNr0InsXv9gWMv3p3yf
+TF20ZL8znFYVUi6XkeQhZjT4fHwDqDVnxhSAFe3E0cwHFJBQe2EFLljwNy6VYnio
+wBr7HrAxczRRqlUy4a3bH5KwiNwwvxgqfdMj9KTVpP9t98/TA36bIohwGFRWB7W4
+i395S90NsTbCh/cAEQEAAbkBjQRhon7cAQwAtPmKcM1/z8sMJnt4sHe3ndXsOdSq
+TJbRkAcdyDO1F4qgj5z9wkrlVVKGuVtmJS3qmR901Q+oH+JqM6UeGqhNig4IQvME
+iQjjelvKXMX9PPVzlP+ga5Y1/2mnUmgmYXK406CU7aaQ3hs7++XDonnQUt5nWF9d
+XT+xK/SDLYMk5i1TNqPVFZBPm44HpIjKGNJXD7Vv/5z62+hKswpLXgYt8Rz95ByG
+ncjQ1Lo2M1T1Y/EuwlRoc9RTdyABavSQWVLKIz6kKM4LejajjRvLnybMUug0CJl5
+mni4cHXx9t0pMlG5DE2O3mZLwTgWcJ8cu2CtPxA9iLfVvFAThxk3ZitkEhChBtG9
+/V8D4DiTIht6bd49xkHP5pxtB/fuo9lNb0axSBaOAeant3KA6F6vki+chnGhOFqV
+1KJHcxYG7VsG1hYhy5IbZsg4GdcXfTwwF1/mq8kvHfyTkBy6HMDGwpr0ATNnrxO7
+tJTiVqDuxfviGQUjqJIQDns6fM9BI4OfpXyjABEBAAGJAbYEGAEIACAWIQRH62g2
+JF0tQOid+0E21OlhjzratQUCYaJ+3AIbDAAKCRA21OlhjzratRBcDACCfhsaCFvM
+JTls5lT/dcTqSCYJYZyDj95DlTiaRNkXnAGrTyE45PnmJLv6FFZzSZdu/eLE8ls2
+MY/KWqnZYYV2Mct/pwDDLSjdAN/NSRe9HeAh2OS1kNeN2SIcoL55gEodKBNSMisY
+9N3ylLMxHZPa5LNBo+j9wftEaVi2fTX8LDJFQvUOZ3f7cz3f6u42FeHUqaLm2alH
+QSkfTB3yIu8Hmo2EXHh4UfwTmS55OBGLQ91d8neu7PcimqCeadeHW+qY5g5hr5NN
+LxMA+n+vwPGcQNxg0lH2XBdlFBbAELEGxMcKbW51QL2h+EdwGzT/nK3Iia/qm3N5
+0Z12j/hhzohlf7TQjhzB43Wbxef94JbKacvng8t/hG3+n8UASQzizCSn/oMkXQom
+XdQe5JFgJCroU2CfrdFmZfbkkq9mAi80BLUEAGNTUQrg/W39VX1/klGiXiWtpU8g
+q/tSGRQHXTwG53qejlUtKI315ZizOhJiniSDx4fZaK2zB9RlZkrnd1Y=
+=KPJF
+-----END PGP PUBLIC KEY BLOCK-----
+
+
pub 379CE192D401AB61
sub 0CFE993CDBE1D0A2
-----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -4157,6 +4192,54 @@
-----END PGP PUBLIC KEY BLOCK-----
+pub 6601E5C08DCCBB96
+uid Popma Remko <[email protected]>
+
+sub 0AC07D0BBD11498C
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v1.68
+
+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
+Ds1RyzdSprcN2g==
+=S4Fa
+-----END PGP PUBLIC KEY BLOCK-----
+
+
pub 6A65176A0FB1CD0B
uid Paul King <[email protected]>
uid keybase.io/paulk_asert <[email protected]>
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 9a00a6c..e409daf 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -15,6 +15,14 @@
<trust group="com.google.android.gms"/> <!-- b/215442095 -->
<trust group="com.google.android.material"/> <!-- b/216192082 -->
<trust file=".*kotlin-native-prebuilt-macos-.*" regex="true"/> <!-- b/228184608 -->
+ <trust group="ch.qos.logback" name="logback-classic" version="1.2.11"/> <!-- b/234161459 -->
+ <trust group="ch.qos.logback" name="logback-core" version="1.2.11"/> <!-- b/234161459 -->
+ <trust group="ch.qos.logback" name="logback-parent" version="1.2.11"/> <!-- b/234161459 -->
+ <trust group="info.picocli" name="picocli" version="4.6.3"/> <!-- b/234161459 -->
+ <trust group="org.slf4j" name="slf4j-api" version="1.7.32"/> <!-- b/234161459 -->
+ <trust group="org.slf4j" name="slf4j-parent" version="1.7.32"/> <!-- b/234161459 -->
+ <trust group="com.pinterest" name="ktlint" version="0.46.0-SNAPSHOT"/> <!-- b/234161459 -->
+ <trust group="com.pinterest.ktlint" version="0.46.0-SNAPSHOT"/> <!-- b/234161459 -->
</trusted-artifacts>
<trusted-keys>
<trusted-key id="00089ee8c3afa95a854d0f1df800dd0933ecf7f7" group="com.google.guava" name="guava"/>
@@ -147,7 +155,10 @@
<trusting group="com.google.oauth-client"/>
</trusted-key>
<trusted-key id="47586a1b75ef0de5" group="com.squareup.wire"/>
- <trusted-key id="475f3b8e59e6e63aa78067482c7b12f2a511e325" group="org.slf4j"/>
+ <trusted-key id="475f3b8e59e6e63aa78067482c7b12f2a511e325">
+ <trusting group="ch.qos.logback"/>
+ <trusting group="org.slf4j"/>
+ </trusted-key>
<trusted-key id="476634a4694e716a" group="com.googlecode.java-diff-utils"/>
<trusted-key id="4791825bdea86eb9286a2ace88bb19a33a18445f" group="net.ltgt.gradle.incap"/>
<trusted-key id="47bf592261cd1a8a69b703b4e0cb7823cfd00fbf">
@@ -156,6 +167,7 @@
<trusting group="^com[.]jakewharton($|([.].*))" regex="true"/>
</trusted-key>
<trusted-key id="47dcfc2a59f59b5b" group="io.outfoxx"/>
+ <trusted-key id="47eb6836245d2d40e89dfb4136d4e9618f3adab5" group="io.github.microutils" name="kotlin-logging-jvm"/>
<trusted-key id="4896f7312a5ace4d">
<trusting group="com.google.gradle"/>
<trusting group="com.google.protobuf"/>
@@ -257,7 +269,6 @@
<trusted-key id="8756c4f765c9ac3cb6b85d62379ce192d401ab61">
<trusting group="com.github.ajalt"/>
<trusting group="com.github.javaparser"/>
- <trusting group="info.picocli"/>
<trusting group="org.jetbrains.intellij.deps"/>
<trusting group="org.jetbrains.kotlinx"/>
<trusting group="^org[.]jetbrains($|([.].*))" regex="true"/>
@@ -318,6 +329,7 @@
<trusted-key id="a730529ca355a63e" group="org.ccil.cowan.tagsoup"/>
<trusted-key id="a7764f502a938c99" group="com.google.protobuf"/>
<trusted-key id="a7892505cf1a58076453e52d7999befba1039e8b" group="net.bytebuddy"/>
+ <trusted-key id="aa417737bd805456db3cbdde6601e5c08dccbb96" group="info.picocli" name="picocli"/>
<trusted-key id="aa70c7c433d501636392ec02153e7a3c2b4e5118" group="org.eclipse.ee4j"/>
<trusted-key id="ac5ec74981f9cda6">
<trusting group="com.beust"/>
