diff --git a/build-convention/gradle.lockfile b/build-convention/gradle.lockfile
index 98e737af..e512a2da 100644
--- a/build-convention/gradle.lockfile
+++ b/build-convention/gradle.lockfile
@@ -1,44 +1,44 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.1.2=runtimeClasspath
-androidx.databinding:databinding-compiler-common:7.1.2=runtimeClasspath
-com.android.databinding:baseLibrary:7.1.2=runtimeClasspath
-com.android.tools.analytics-library:crash:30.1.2=runtimeClasspath
-com.android.tools.analytics-library:protos:30.1.2=runtimeClasspath
-com.android.tools.analytics-library:shared:30.1.2=runtimeClasspath
-com.android.tools.analytics-library:tracker:30.1.2=runtimeClasspath
+androidx.databinding:databinding-common:7.1.3=runtimeClasspath
+androidx.databinding:databinding-compiler-common:7.1.3=runtimeClasspath
+com.android.databinding:baseLibrary:7.1.3=runtimeClasspath
+com.android.tools.analytics-library:crash:30.1.3=runtimeClasspath
+com.android.tools.analytics-library:protos:30.1.3=runtimeClasspath
+com.android.tools.analytics-library:shared:30.1.3=runtimeClasspath
+com.android.tools.analytics-library:tracker:30.1.3=runtimeClasspath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=runtimeClasspath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=runtimeClasspath
-com.android.tools.build:aapt2-proto:7.1.2-7984345=runtimeClasspath
-com.android.tools.build:aaptcompiler:7.1.2=runtimeClasspath
-com.android.tools.build:apksig:7.1.2=compileClasspath,runtimeClasspath
-com.android.tools.build:apkzlib:7.1.2=compileClasspath,runtimeClasspath
-com.android.tools.build:builder-model:7.1.2=compileClasspath,runtimeClasspath
-com.android.tools.build:builder-test-api:7.1.2=runtimeClasspath
-com.android.tools.build:builder:7.1.2=compileClasspath,runtimeClasspath
+com.android.tools.build:aapt2-proto:7.1.3-7984345=runtimeClasspath
+com.android.tools.build:aaptcompiler:7.1.3=runtimeClasspath
+com.android.tools.build:apksig:7.1.3=compileClasspath,runtimeClasspath
+com.android.tools.build:apkzlib:7.1.3=compileClasspath,runtimeClasspath
+com.android.tools.build:builder-model:7.1.3=compileClasspath,runtimeClasspath
+com.android.tools.build:builder-test-api:7.1.3=runtimeClasspath
+com.android.tools.build:builder:7.1.3=compileClasspath,runtimeClasspath
 com.android.tools.build:bundletool:1.8.0=runtimeClasspath
-com.android.tools.build:gradle-api:7.1.2=compileClasspath,runtimeClasspath
-com.android.tools.build:gradle:7.1.2=compileClasspath,runtimeClasspath
-com.android.tools.build:manifest-merger:30.1.2=compileClasspath,runtimeClasspath
+com.android.tools.build:gradle-api:7.1.3=compileClasspath,runtimeClasspath
+com.android.tools.build:gradle:7.1.3=compileClasspath,runtimeClasspath
+com.android.tools.build:manifest-merger:30.1.3=compileClasspath,runtimeClasspath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=runtimeClasspath
-com.android.tools.ddms:ddmlib:30.1.2=runtimeClasspath
-com.android.tools.layoutlib:layoutlib-api:30.1.2=runtimeClasspath
-com.android.tools.lint:lint-model:30.1.2=runtimeClasspath
-com.android.tools.utp:android-device-provider-ddmlib-proto:30.1.2=runtimeClasspath
-com.android.tools.utp:android-device-provider-gradle-proto:30.1.2=runtimeClasspath
-com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.1.2=runtimeClasspath
-com.android.tools.utp:android-test-plugin-host-coverage-proto:30.1.2=runtimeClasspath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.1.2=runtimeClasspath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.1.2=runtimeClasspath
-com.android.tools:annotations:30.1.2=runtimeClasspath
-com.android.tools:common:30.1.2=runtimeClasspath
-com.android.tools:dvlib:30.1.2=runtimeClasspath
-com.android.tools:repository:30.1.2=runtimeClasspath
-com.android.tools:sdk-common:30.1.2=runtimeClasspath
-com.android.tools:sdklib:30.1.2=runtimeClasspath
-com.android:signflinger:7.1.2=runtimeClasspath
-com.android:zipflinger:7.1.2=compileClasspath,runtimeClasspath
+com.android.tools.ddms:ddmlib:30.1.3=runtimeClasspath
+com.android.tools.layoutlib:layoutlib-api:30.1.3=runtimeClasspath
+com.android.tools.lint:lint-model:30.1.3=runtimeClasspath
+com.android.tools.utp:android-device-provider-ddmlib-proto:30.1.3=runtimeClasspath
+com.android.tools.utp:android-device-provider-gradle-proto:30.1.3=runtimeClasspath
+com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.1.3=runtimeClasspath
+com.android.tools.utp:android-test-plugin-host-coverage-proto:30.1.3=runtimeClasspath
+com.android.tools.utp:android-test-plugin-host-retention-proto:30.1.3=runtimeClasspath
+com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.1.3=runtimeClasspath
+com.android.tools:annotations:30.1.3=runtimeClasspath
+com.android.tools:common:30.1.3=runtimeClasspath
+com.android.tools:dvlib:30.1.3=runtimeClasspath
+com.android.tools:repository:30.1.3=runtimeClasspath
+com.android.tools:sdk-common:30.1.3=runtimeClasspath
+com.android.tools:sdklib:30.1.3=runtimeClasspath
+com.android:signflinger:7.1.3=runtimeClasspath
+com.android:zipflinger:7.1.3=compileClasspath,runtimeClasspath
 com.fasterxml.jackson.core:jackson-annotations:2.11.1=runtimeClasspath
 com.fasterxml.jackson.core:jackson-core:2.11.1=runtimeClasspath
 com.fasterxml.jackson.core:jackson-databind:2.11.1=runtimeClasspath
diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile
index 60cf07ad..f4461d24 100644
--- a/buildscript-gradle.lockfile
+++ b/buildscript-gradle.lockfile
@@ -1,44 +1,44 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.1.2=classpath
-androidx.databinding:databinding-compiler-common:7.1.2=classpath
-com.android.databinding:baseLibrary:7.1.2=classpath
-com.android.tools.analytics-library:crash:30.1.2=classpath
-com.android.tools.analytics-library:protos:30.1.2=classpath
-com.android.tools.analytics-library:shared:30.1.2=classpath
-com.android.tools.analytics-library:tracker:30.1.2=classpath
+androidx.databinding:databinding-common:7.1.3=classpath
+androidx.databinding:databinding-compiler-common:7.1.3=classpath
+com.android.databinding:baseLibrary:7.1.3=classpath
+com.android.tools.analytics-library:crash:30.1.3=classpath
+com.android.tools.analytics-library:protos:30.1.3=classpath
+com.android.tools.analytics-library:shared:30.1.3=classpath
+com.android.tools.analytics-library:tracker:30.1.3=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.1.2-7984345=classpath
-com.android.tools.build:aaptcompiler:7.1.2=classpath
-com.android.tools.build:apksig:7.1.2=classpath
-com.android.tools.build:apkzlib:7.1.2=classpath
-com.android.tools.build:builder-model:7.1.2=classpath
-com.android.tools.build:builder-test-api:7.1.2=classpath
-com.android.tools.build:builder:7.1.2=classpath
+com.android.tools.build:aapt2-proto:7.1.3-7984345=classpath
+com.android.tools.build:aaptcompiler:7.1.3=classpath
+com.android.tools.build:apksig:7.1.3=classpath
+com.android.tools.build:apkzlib:7.1.3=classpath
+com.android.tools.build:builder-model:7.1.3=classpath
+com.android.tools.build:builder-test-api:7.1.3=classpath
+com.android.tools.build:builder:7.1.3=classpath
 com.android.tools.build:bundletool:1.8.0=classpath
-com.android.tools.build:gradle-api:7.1.2=classpath
-com.android.tools.build:gradle:7.1.2=classpath
-com.android.tools.build:manifest-merger:30.1.2=classpath
+com.android.tools.build:gradle-api:7.1.3=classpath
+com.android.tools.build:gradle:7.1.3=classpath
+com.android.tools.build:manifest-merger:30.1.3=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.1.2=classpath
-com.android.tools.layoutlib:layoutlib-api:30.1.2=classpath
-com.android.tools.lint:lint-model:30.1.2=classpath
-com.android.tools.utp:android-device-provider-ddmlib-proto:30.1.2=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.1.2=classpath
-com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.1.2=classpath
-com.android.tools.utp:android-test-plugin-host-coverage-proto:30.1.2=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.1.2=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.1.2=classpath
-com.android.tools:annotations:30.1.2=classpath
-com.android.tools:common:30.1.2=classpath
-com.android.tools:dvlib:30.1.2=classpath
-com.android.tools:repository:30.1.2=classpath
-com.android.tools:sdk-common:30.1.2=classpath
-com.android.tools:sdklib:30.1.2=classpath
-com.android:signflinger:7.1.2=classpath
-com.android:zipflinger:7.1.2=classpath
+com.android.tools.ddms:ddmlib:30.1.3=classpath
+com.android.tools.layoutlib:layoutlib-api:30.1.3=classpath
+com.android.tools.lint:lint-model:30.1.3=classpath
+com.android.tools.utp:android-device-provider-ddmlib-proto:30.1.3=classpath
+com.android.tools.utp:android-device-provider-gradle-proto:30.1.3=classpath
+com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.1.3=classpath
+com.android.tools.utp:android-test-plugin-host-coverage-proto:30.1.3=classpath
+com.android.tools.utp:android-test-plugin-host-retention-proto:30.1.3=classpath
+com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.1.3=classpath
+com.android.tools:annotations:30.1.3=classpath
+com.android.tools:common:30.1.3=classpath
+com.android.tools:dvlib:30.1.3=classpath
+com.android.tools:repository:30.1.3=classpath
+com.android.tools:sdk-common:30.1.3=classpath
+com.android.tools:sdklib:30.1.3=classpath
+com.android:signflinger:7.1.3=classpath
+com.android:zipflinger:7.1.3=classpath
 com.fasterxml.jackson.core:jackson-annotations:2.11.1=classpath
 com.fasterxml.jackson.core:jackson-core:2.11.1=classpath
 com.fasterxml.jackson.core:jackson-databind:2.11.1=classpath
diff --git a/gradle.properties b/gradle.properties
index bbba5c9e..55fcdab3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -62,7 +62,7 @@ ANDROID_COMPILE_SDK_VERSION=31
 
 ANDROID_NDK_VERSION=23.0.7599858
 
-ANDROID_GRADLE_PLUGIN_VERSION=7.1.2
+ANDROID_GRADLE_PLUGIN_VERSION=7.1.3
 DETEKT_VERSION=1.19.0
 FLANK_VERSION=21.09.0
 FULLADLE_VERSION=0.17.3