Skip to content

Commit 1ef70e8

Browse files
committed
AGP 7.1.0. Build tools 32.0.0, compileSdkVersion and targetSdkVersion 32.
1 parent 620d7dd commit 1ef70e8

File tree

6 files changed

+17
-10
lines changed

6 files changed

+17
-10
lines changed

buildSrc/src/main/kotlin/reactivecircus/flowbinding/AndroidSdk.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package reactivecircus.flowbinding
55
object androidSdk {
66
const val minSdk = 14
77
const val testMinSdk = 21
8-
const val targetSdk = 31
9-
const val compileSdk = 31
10-
const val buildTools = "31.0.0"
8+
const val targetSdk = 32
9+
const val compileSdk = 32
10+
const val buildTools = "32.0.0"
1111
}

flowbinding-material/src/main/java/reactivecircus/flowbinding/material/RangeSliderTouchEventFlow.kt

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package reactivecircus.flowbinding.material
22

3+
import android.annotation.SuppressLint
34
import androidx.annotation.CheckResult
45
import com.google.android.material.slider.RangeSlider
56
import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -30,10 +31,12 @@ import reactivecircus.flowbinding.common.checkMainThread
3031
public fun RangeSlider.touchEvents(): Flow<RangeSliderTouchEvent> = callbackFlow {
3132
checkMainThread()
3233
val listener = object : RangeSlider.OnSliderTouchListener {
34+
@SuppressLint("RestrictedApi")
3335
override fun onStartTrackingTouch(rangeSlider: RangeSlider) {
3436
trySend(RangeSliderTouchEvent.StartTracking(rangeSlider))
3537
}
3638

39+
@SuppressLint("RestrictedApi")
3740
override fun onStopTrackingTouch(rangeSlider: RangeSlider) {
3841
trySend(RangeSliderTouchEvent.StopTracking(rangeSlider))
3942
}

flowbinding-material/src/main/java/reactivecircus/flowbinding/material/SliderTouchEventFlow.kt

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package reactivecircus.flowbinding.material
22

3+
import android.annotation.SuppressLint
34
import androidx.annotation.CheckResult
45
import com.google.android.material.slider.Slider
56
import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -30,10 +31,12 @@ import reactivecircus.flowbinding.common.checkMainThread
3031
public fun Slider.touchEvents(): Flow<SliderTouchEvent> = callbackFlow {
3132
checkMainThread()
3233
val listener = object : Slider.OnSliderTouchListener {
34+
@SuppressLint("RestrictedApi")
3335
override fun onStartTrackingTouch(slider: Slider) {
3436
trySend(SliderTouchEvent.StartTracking(slider))
3537
}
3638

39+
@SuppressLint("RestrictedApi")
3740
override fun onStopTrackingTouch(slider: Slider) {
3841
trySend(SliderTouchEvent.StopTracking(slider))
3942
}

gradle/libs.versions.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[versions]
22
kotlin = "1.6.10"
33
dokka = "1.6.10"
4-
androidGradlePlugin = "7.0.3"
5-
androidLint = "30.0.3"
4+
androidGradlePlugin = "7.1.0"
5+
androidLint = "30.1.0"
66
gradleMavenPublishPlugin = "0.17.0"
77
binaryCompatibilityValidator = "0.8.0"
88
detekt = "1.19.0"

lint-rules/src/main/java/reactivecircus/flowbinding/lint/MissingListenerRemovalDetector.kt

+5-4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import org.jetbrains.uast.USimpleNameReferenceExpression
2222
import org.jetbrains.uast.UastBinaryExpressionWithTypeKind
2323
import org.jetbrains.uast.UastBinaryOperator
2424
import org.jetbrains.uast.isNullLiteral
25+
import org.jetbrains.uast.skipParenthesizedExprDown
2526
import org.jetbrains.uast.visitor.AbstractUastVisitor
2627
import java.util.EnumSet
2728

@@ -211,9 +212,9 @@ class MissingListenerRemovalDetector : Detector(), SourceCodeScanner {
211212
// otherwise must have a null argument for a set*Listener method
212213
if (node.valueArgumentCount == 1 && (
213214
name.matches(PATTERN_REMOVE_LISTENER_METHOD.toRegex()) &&
214-
!node.valueArguments[0].isNullLiteralOrCastedNullLiteral() ||
215+
node.valueArguments[0].skipParenthesizedExprDown()?.isNullLiteralOrCastedNullLiteral() == false ||
215216
name.matches(PATTERN_SET_LISTENER.toRegex()) &&
216-
node.valueArguments[0].isNullLiteralOrCastedNullLiteral()
217+
node.valueArguments[0].skipParenthesizedExprDown()?.isNullLiteralOrCastedNullLiteral() == true
217218
)
218219
) {
219220
return true
@@ -228,7 +229,7 @@ class MissingListenerRemovalDetector : Detector(), SourceCodeScanner {
228229
// try to find the pattern `*Listener = null`
229230
is USimpleNameReferenceExpression -> {
230231
if (leftOperand.identifier.endsWith(SUFFIX_LISTENER, ignoreCase = true) &&
231-
node.rightOperand.isNullLiteralOrCastedNullLiteral()
232+
node.rightOperand.skipParenthesizedExprDown()?.isNullLiteralOrCastedNullLiteral() == true
232233
) {
233234
return true
234235
}
@@ -239,7 +240,7 @@ class MissingListenerRemovalDetector : Detector(), SourceCodeScanner {
239240
SUFFIX_LISTENER,
240241
ignoreCase = true
241242
) &&
242-
node.rightOperand.isNullLiteralOrCastedNullLiteral()
243+
node.rightOperand.skipParenthesizedExprDown()?.isNullLiteralOrCastedNullLiteral() == true
243244
) {
244245
return true
245246
}

testing-infra/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66

77
android {
88
lint {
9-
disable("FragmentGradleConfiguration")
9+
disable.add("FragmentGradleConfiguration")
1010
}
1111
}
1212

0 commit comments

Comments
 (0)