From a1819e4034dbf20b870f25a672b8e7fc5bd51b3c Mon Sep 17 00:00:00 2001 From: Jake Staahl Date: Fri, 10 Jun 2022 15:06:52 -0700 Subject: [PATCH 1/4] Use MessageCompat.setAsynchronous to support API 16+ --- papa/src/main/java/papa/internal/Handlers.kt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/papa/src/main/java/papa/internal/Handlers.kt b/papa/src/main/java/papa/internal/Handlers.kt index 1c78d45..960a4ef 100644 --- a/papa/src/main/java/papa/internal/Handlers.kt +++ b/papa/src/main/java/papa/internal/Handlers.kt @@ -1,17 +1,15 @@ package papa.internal -import android.os.Build import android.os.Handler import android.os.Looper import android.os.Message +import androidx.core.os.MessageCompat // Thx @chet and @jreck // https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:metrics/metrics-performance/src/main/java/androidx/metrics/performance/JankStatsApi16Impl.kt;l=66;drc=523d7a11e46390281ed3f77893671730cd6edb98 internal fun Handler.postAtFrontOfQueueAsync(callback: () -> Unit) { sendMessageAtFrontOfQueue(Message.obtain(this, callback).apply { - if (Build.VERSION.SDK_INT >= 22) { - isAsynchronous = true - } + MessageCompat.setAsynchronous(this, true) }) } @@ -25,4 +23,4 @@ internal fun checkMainThread() { internal val mainHandler by lazy { Handler(Looper.getMainLooper()) -} \ No newline at end of file +} From 4d1a7bf2b16001d8236c312bf1b51480f68e3b2b Mon Sep 17 00:00:00 2001 From: Jake Staahl Date: Sat, 11 Jun 2022 15:22:31 -0700 Subject: [PATCH 2/4] upgrade agp, remove unused imports --- buildSrc/src/main/java/Dependencies.kt | 2 +- papa-dev-receivers/build.gradle.kts | 2 -- papa-safetrace/build.gradle.kts | 2 -- papa/build.gradle.kts | 2 -- sample/src/main/java/com/example/papa/TouchLagActivity.kt | 2 -- 5 files changed, 1 insertion(+), 9 deletions(-) diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index 4ef27cb..b7173ea 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -10,7 +10,7 @@ object Versions { object Dependencies { object Build { - const val Android = "com.android.tools.build:gradle:4.2.0" + const val Android = "com.android.tools.build:gradle:7.2.0" const val MavenPublish = "com.vanniktech:gradle-maven-publish-plugin:0.18.0" val Kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.KotlinCompiler}" const val Ktlint = "org.jlleitschuh.gradle:ktlint-gradle:9.2.1" diff --git a/papa-dev-receivers/build.gradle.kts b/papa-dev-receivers/build.gradle.kts index 79f93c7..9cb9ea7 100644 --- a/papa-dev-receivers/build.gradle.kts +++ b/papa-dev-receivers/build.gradle.kts @@ -18,8 +18,6 @@ android { defaultConfig { minSdkVersion(21) - versionCode = 1 - versionName = "1.0" } buildFeatures { diff --git a/papa-safetrace/build.gradle.kts b/papa-safetrace/build.gradle.kts index 0a67577..563bfa6 100644 --- a/papa-safetrace/build.gradle.kts +++ b/papa-safetrace/build.gradle.kts @@ -18,8 +18,6 @@ android { defaultConfig { minSdkVersion(21) - versionCode = 1 - versionName = "1.0" } buildFeatures { diff --git a/papa/build.gradle.kts b/papa/build.gradle.kts index b0c359d..060be27 100644 --- a/papa/build.gradle.kts +++ b/papa/build.gradle.kts @@ -18,8 +18,6 @@ android { defaultConfig { minSdkVersion(21) - versionCode = 1 - versionName = "1.0" testInstrumentationRunner = "papa.test.utilities.PapaTestInstrumentationRunner" } diff --git a/sample/src/main/java/com/example/papa/TouchLagActivity.kt b/sample/src/main/java/com/example/papa/TouchLagActivity.kt index 470e3ef..6a8802c 100644 --- a/sample/src/main/java/com/example/papa/TouchLagActivity.kt +++ b/sample/src/main/java/com/example/papa/TouchLagActivity.kt @@ -5,8 +5,6 @@ import android.animation.AnimatorListenerAdapter import android.os.Bundle import android.view.View import androidx.appcompat.app.AppCompatActivity -import com.google.android.material.slider.Slider -import com.google.android.material.slider.Slider.OnSliderTouchListener import papa.Interaction import papa.InteractionLatencyReporter import papa.InteractionTrigger From cd04505d78694a584ae9ab571384ce9899a938c0 Mon Sep 17 00:00:00 2001 From: Jake Staahl Date: Mon, 13 Jun 2022 06:51:40 -0700 Subject: [PATCH 3/4] Revert "upgrade agp, remove unused imports" This reverts commit 4d1a7bf2b16001d8236c312bf1b51480f68e3b2b. --- buildSrc/src/main/java/Dependencies.kt | 2 +- papa-dev-receivers/build.gradle.kts | 2 ++ papa-safetrace/build.gradle.kts | 2 ++ papa/build.gradle.kts | 2 ++ sample/src/main/java/com/example/papa/TouchLagActivity.kt | 2 ++ 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index b7173ea..4ef27cb 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -10,7 +10,7 @@ object Versions { object Dependencies { object Build { - const val Android = "com.android.tools.build:gradle:7.2.0" + const val Android = "com.android.tools.build:gradle:4.2.0" const val MavenPublish = "com.vanniktech:gradle-maven-publish-plugin:0.18.0" val Kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.KotlinCompiler}" const val Ktlint = "org.jlleitschuh.gradle:ktlint-gradle:9.2.1" diff --git a/papa-dev-receivers/build.gradle.kts b/papa-dev-receivers/build.gradle.kts index 9cb9ea7..79f93c7 100644 --- a/papa-dev-receivers/build.gradle.kts +++ b/papa-dev-receivers/build.gradle.kts @@ -18,6 +18,8 @@ android { defaultConfig { minSdkVersion(21) + versionCode = 1 + versionName = "1.0" } buildFeatures { diff --git a/papa-safetrace/build.gradle.kts b/papa-safetrace/build.gradle.kts index 563bfa6..0a67577 100644 --- a/papa-safetrace/build.gradle.kts +++ b/papa-safetrace/build.gradle.kts @@ -18,6 +18,8 @@ android { defaultConfig { minSdkVersion(21) + versionCode = 1 + versionName = "1.0" } buildFeatures { diff --git a/papa/build.gradle.kts b/papa/build.gradle.kts index 060be27..b0c359d 100644 --- a/papa/build.gradle.kts +++ b/papa/build.gradle.kts @@ -18,6 +18,8 @@ android { defaultConfig { minSdkVersion(21) + versionCode = 1 + versionName = "1.0" testInstrumentationRunner = "papa.test.utilities.PapaTestInstrumentationRunner" } diff --git a/sample/src/main/java/com/example/papa/TouchLagActivity.kt b/sample/src/main/java/com/example/papa/TouchLagActivity.kt index 6a8802c..470e3ef 100644 --- a/sample/src/main/java/com/example/papa/TouchLagActivity.kt +++ b/sample/src/main/java/com/example/papa/TouchLagActivity.kt @@ -5,6 +5,8 @@ import android.animation.AnimatorListenerAdapter import android.os.Bundle import android.view.View import androidx.appcompat.app.AppCompatActivity +import com.google.android.material.slider.Slider +import com.google.android.material.slider.Slider.OnSliderTouchListener import papa.Interaction import papa.InteractionLatencyReporter import papa.InteractionTrigger From 50eba959bf04b47d5a23181251602a75cb37c57b Mon Sep 17 00:00:00 2001 From: Jake Staahl Date: Mon, 13 Jun 2022 06:51:50 -0700 Subject: [PATCH 4/4] remove unused imports --- sample/src/main/java/com/example/papa/TouchLagActivity.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/sample/src/main/java/com/example/papa/TouchLagActivity.kt b/sample/src/main/java/com/example/papa/TouchLagActivity.kt index 470e3ef..6a8802c 100644 --- a/sample/src/main/java/com/example/papa/TouchLagActivity.kt +++ b/sample/src/main/java/com/example/papa/TouchLagActivity.kt @@ -5,8 +5,6 @@ import android.animation.AnimatorListenerAdapter import android.os.Bundle import android.view.View import androidx.appcompat.app.AppCompatActivity -import com.google.android.material.slider.Slider -import com.google.android.material.slider.Slider.OnSliderTouchListener import papa.Interaction import papa.InteractionLatencyReporter import papa.InteractionTrigger