From 5a0d94caa66b78fe413346367a7ec494782c8c01 Mon Sep 17 00:00:00 2001 From: Alicia Rivas Date: Mon, 3 Apr 2023 15:49:00 +0200 Subject: [PATCH] ANDSDK-739 Update AGP to 7.4.2 (#187) --- dependencies.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- sample-customisation/build.gradle | 5 ++--- sample-kotlin/build.gradle | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 5a5b6ab..9f609ce 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -4,7 +4,7 @@ ext { targetSdkVersion = 31 compileSdkVersion = 31 - gradlePluginVersion = '7.0.4' + gradlePluginVersion = '7.4.2' kotlinVersion = '1.6.21' // Testing diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8130847..5b9e822 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip diff --git a/sample-customisation/build.gradle b/sample-customisation/build.gradle index b79a4ca..dbb1630 100644 --- a/sample-customisation/build.gradle +++ b/sample-customisation/build.gradle @@ -5,7 +5,7 @@ apply from: '../dependencies.gradle' android { - compileSdkVersion rootProject.ext.compileSdkVersion + compileSdk rootProject.ext.compileSdkVersion defaultConfig { applicationId "net.helpscout.samples.beacon.customisation" @@ -41,8 +41,7 @@ android { targetCompatibility JavaVersion.VERSION_11 } - - lintOptions { + lint { disable 'MissingTranslation' ignoreWarnings true } diff --git a/sample-kotlin/build.gradle b/sample-kotlin/build.gradle index da5e0a6..e4b3bd8 100644 --- a/sample-kotlin/build.gradle +++ b/sample-kotlin/build.gradle @@ -6,7 +6,7 @@ apply from: '../signing/signing.gradle' apply from: '../dependencies.gradle' android { - compileSdkVersion rootProject.ext.compileSdkVersion + compileSdk rootProject.ext.compileSdkVersion defaultConfig { applicationId "net.helpscout.samples.beacon.kotlin" @@ -51,7 +51,7 @@ android { jvmTarget = JavaVersion.VERSION_11.toString() } - lintOptions { + lint { disable 'MissingTranslation' ignoreWarnings true }