diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ba534f75..04c7a66b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -29,19 +29,6 @@ plugins { id("androidx.navigation.safeargs") } -// workaround for AS. TODO: Remove when AS 7.1 stable release -val dataBinding = file("${project.buildDir}/generated/data_binding_base_class_source_out/debug/out") -sourceSets { - create("dataBinding") { - java.srcDir(dataBinding) - } -} -idea { - module { - generatedSourceDirs.add(dataBinding) - } -} - val androidTargetSdkVersion: Int by rootProject.extra val androidMinSdkVersion: Int by rootProject.extra val androidBuildToolsVersion: String by rootProject.extra @@ -84,8 +71,8 @@ android { lint { disable += "MissingTranslation" - isAbortOnError = true - isCheckReleaseBuilds = false + abortOnError = true + checkReleaseBuilds = false } packagingOptions { @@ -210,10 +197,10 @@ dependencies { implementation("androidx.browser:browser:1.4.0") implementation("androidx.constraintlayout:constraintlayout:2.1.3") implementation("androidx.core:core:1.7.0") - implementation("androidx.fragment:fragment:1.4.0") + implementation("androidx.fragment:fragment:1.4.1") implementation("androidx.navigation:navigation-fragment:$navVersion") implementation("androidx.navigation:navigation-ui:$navVersion") - implementation("androidx.preference:preference:1.1.1") + implementation("androidx.preference:preference:1.2.0") implementation("androidx.recyclerview:recyclerview:1.2.1") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01") implementation("com.github.bumptech.glide:glide:$glideVersion") @@ -236,8 +223,7 @@ dependencies { implementation("org.lsposed.hiddenapibypass:hiddenapibypass:4.2") implementation(project(":manager-service")) - val appCenter = "4.3.1" - debugImplementation("com.microsoft.appcenter:appcenter-analytics:${appCenter}") + val appCenter = "4.4.2" debugImplementation("com.microsoft.appcenter:appcenter-crashes:${appCenter}") } diff --git a/app/src/debug/java/org/lsposed/manager/util/Telemetry.java b/app/src/debug/java/org/lsposed/manager/util/Telemetry.java index 806fcb1a..bf6057de 100644 --- a/app/src/debug/java/org/lsposed/manager/util/Telemetry.java +++ b/app/src/debug/java/org/lsposed/manager/util/Telemetry.java @@ -17,7 +17,7 @@ public class Telemetry { @Override public void onBeforeSending(ErrorReport report) { var d = report.getDevice(); - d.setAppVersion(String.format(Locale.ROOT, "%s (%d)", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)); + d.setAppVersion(BuildConfig.VERSION_NAME); d.setAppBuild(String.valueOf(BuildConfig.VERSION_CODE)); d.setAppNamespace(BuildConfig.APPLICATION_ID); report.setDevice(d); diff --git a/build.gradle.kts b/build.gradle.kts index 8ea584e3..1cc633ad 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -24,8 +24,8 @@ buildscript { google() mavenCentral() } - val navVersion by extra("2.4.0-rc01") - val agpVersion by extra("7.0.4") + val navVersion by extra("2.5.0-alpha01") + val agpVersion by extra("7.1.0") dependencies { classpath("com.android.tools.build:gradle:$agpVersion") classpath("org.eclipse.jgit:org.eclipse.jgit:6.0.0.202111291000-r") diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 5d798f2a..6c1b3f10 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -92,8 +92,8 @@ android { } lint { - isAbortOnError = true - isCheckReleaseBuilds = false + abortOnError = true + checkReleaseBuilds = false } buildTypes { diff --git a/daemon/build.gradle.kts b/daemon/build.gradle.kts index 7117fe63..9e5b7bd6 100644 --- a/daemon/build.gradle.kts +++ b/daemon/build.gradle.kts @@ -80,8 +80,8 @@ android { } lint { - isAbortOnError = true - isCheckReleaseBuilds = false + abortOnError = true + checkReleaseBuilds = false } buildTypes {