From 06ab2382dafa7a296ecb9c30b94327cfcab6651c Mon Sep 17 00:00:00 2001 From: mcarare <48995920+mcarare@users.noreply.github.com> Date: Thu, 21 Sep 2023 12:19:22 +0300 Subject: [PATCH] Bug 1849833 - Replace deprecated compileSdkVersion. This is replaced by defaultConfig compileSdk. --- .../android-components/components/feature/fxsuggest/build.gradle | 3 +-- mobile/android/android-components/samples/browser/build.gradle | 3 +-- mobile/android/android-components/samples/compose-browser/build.gradle | 3 +-- mobile/android/android-components/samples/crash/build.gradle | 3 +-- mobile/android/android-components/samples/dataprotect/build.gradle | 3 +-- .../android/android-components/samples/firefox-accounts/build.gradle | 3 +-- mobile/android/android-components/samples/glean/build.gradle | 3 +-- .../samples/glean/samples-glean-library/build.gradle | 3 +-- mobile/android/android-components/samples/sync-logins/build.gradle | 3 +-- mobile/android/android-components/samples/sync/build.gradle | 3 +-- mobile/android/android-components/samples/toolbar/build.gradle | 3 +-- 11 files changed, 11 insertions(+), 22 deletions(-) diff --git a/mobile/android/android-components/components/feature/fxsuggest/build.gradle b/mobile/android/android-components/components/feature/fxsuggest/build.gradle index 3e3d5206f10c..edd88c6df1dd 100644 --- a/mobile/android/android-components/components/feature/fxsuggest/build.gradle +++ b/mobile/android/android-components/components/feature/fxsuggest/build.gradle @@ -6,10 +6,9 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion config.compileSdkVersion - defaultConfig { minSdkVersion config.minSdkVersion + compileSdk config.compileSdkVersion targetSdkVersion config.targetSdkVersion testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } diff --git a/mobile/android/android-components/samples/browser/build.gradle b/mobile/android/android-components/samples/browser/build.gradle index 49d11011a283..c5b3e3a75873 100644 --- a/mobile/android/android-components/samples/browser/build.gradle +++ b/mobile/android/android-components/samples/browser/build.gradle @@ -6,11 +6,10 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdkVersion config.compileSdkVersion - defaultConfig { applicationId "org.mozilla.samples.browser" minSdkVersion config.minSdkVersion + compileSdk config.compileSdkVersion targetSdkVersion config.targetSdkVersion versionCode 1 versionName "1.0" diff --git a/mobile/android/android-components/samples/compose-browser/build.gradle b/mobile/android/android-components/samples/compose-browser/build.gradle index 3106a1e80605..74d7e416ce42 100644 --- a/mobile/android/android-components/samples/compose-browser/build.gradle +++ b/mobile/android/android-components/samples/compose-browser/build.gradle @@ -7,11 +7,10 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-parcelize' android { - compileSdkVersion config.compileSdkVersion - defaultConfig { applicationId "org.mozilla.samples.compose.browser" minSdkVersion config.minSdkVersion + compileSdk config.compileSdkVersion targetSdkVersion config.targetSdkVersion versionCode 1 versionName "1.0" diff --git a/mobile/android/android-components/samples/crash/build.gradle b/mobile/android/android-components/samples/crash/build.gradle index 00dd7508f934..9ea07c4d9f4f 100644 --- a/mobile/android/android-components/samples/crash/build.gradle +++ b/mobile/android/android-components/samples/crash/build.gradle @@ -6,11 +6,10 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdkVersion config.compileSdkVersion - defaultConfig { applicationId "org.mozilla.samples.crash" minSdkVersion config.minSdkVersion + compileSdk config.compileSdkVersion targetSdkVersion config.targetSdkVersion versionCode 1 versionName "1.0" diff --git a/mobile/android/android-components/samples/dataprotect/build.gradle b/mobile/android/android-components/samples/dataprotect/build.gradle index 932011710262..f9b70a736857 100644 --- a/mobile/android/android-components/samples/dataprotect/build.gradle +++ b/mobile/android/android-components/samples/dataprotect/build.gradle @@ -2,12 +2,11 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdkVersion config.compileSdkVersion - defaultConfig { applicationId "org.mozilla.samples.dataprotect" minSdkVersion config.minSdkVersion + compileSdk config.compileSdkVersion targetSdkVersion config.targetSdkVersion versionCode 1 versionName "1.0" diff --git a/mobile/android/android-components/samples/firefox-accounts/build.gradle b/mobile/android/android-components/samples/firefox-accounts/build.gradle index d14917fb4389..c6a7d616e947 100644 --- a/mobile/android/android-components/samples/firefox-accounts/build.gradle +++ b/mobile/android/android-components/samples/firefox-accounts/build.gradle @@ -6,11 +6,10 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdkVersion config.compileSdkVersion - defaultConfig { applicationId "org.mozilla.samples.fxa" minSdkVersion config.minSdkVersion + compileSdk config.compileSdkVersion targetSdkVersion config.targetSdkVersion versionCode 1 versionName "1.0" diff --git a/mobile/android/android-components/samples/glean/build.gradle b/mobile/android/android-components/samples/glean/build.gradle index d0cb0f54d5c9..8c33692130d7 100644 --- a/mobile/android/android-components/samples/glean/build.gradle +++ b/mobile/android/android-components/samples/glean/build.gradle @@ -22,11 +22,10 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdkVersion config.compileSdkVersion - defaultConfig { applicationId "org.mozilla.samples.glean" minSdkVersion config.minSdkVersion + compileSdk config.compileSdkVersion targetSdkVersion config.targetSdkVersion versionCode 1 versionName "1.0" diff --git a/mobile/android/android-components/samples/glean/samples-glean-library/build.gradle b/mobile/android/android-components/samples/glean/samples-glean-library/build.gradle index 870c8fd2c093..f6707328d3d2 100644 --- a/mobile/android/android-components/samples/glean/samples-glean-library/build.gradle +++ b/mobile/android/android-components/samples/glean/samples-glean-library/build.gradle @@ -22,10 +22,9 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion config.compileSdkVersion - defaultConfig { minSdkVersion config.minSdkVersion + compileSdk config.compileSdkVersion targetSdkVersion config.targetSdkVersion } diff --git a/mobile/android/android-components/samples/sync-logins/build.gradle b/mobile/android/android-components/samples/sync-logins/build.gradle index 8ecde06ada63..fb654517f07f 100644 --- a/mobile/android/android-components/samples/sync-logins/build.gradle +++ b/mobile/android/android-components/samples/sync-logins/build.gradle @@ -6,11 +6,10 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdkVersion config.compileSdkVersion - defaultConfig { applicationId "org.mozilla.samples.sync.logins" minSdkVersion config.minSdkVersion + compileSdk config.compileSdkVersion targetSdkVersion config.targetSdkVersion versionCode 1 versionName "1.0" diff --git a/mobile/android/android-components/samples/sync/build.gradle b/mobile/android/android-components/samples/sync/build.gradle index 57ac054d4257..e0da7e233b35 100644 --- a/mobile/android/android-components/samples/sync/build.gradle +++ b/mobile/android/android-components/samples/sync/build.gradle @@ -6,11 +6,10 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdkVersion config.compileSdkVersion - defaultConfig { applicationId "org.mozilla.samples.sync" minSdkVersion config.minSdkVersion + compileSdk config.compileSdkVersion targetSdkVersion config.targetSdkVersion versionCode 1 versionName "1.0" diff --git a/mobile/android/android-components/samples/toolbar/build.gradle b/mobile/android/android-components/samples/toolbar/build.gradle index 3c0958ec4888..896f3c77f1f5 100644 --- a/mobile/android/android-components/samples/toolbar/build.gradle +++ b/mobile/android/android-components/samples/toolbar/build.gradle @@ -6,11 +6,10 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdkVersion config.compileSdkVersion - defaultConfig { applicationId "org.mozilla.samples.toolbar" minSdkVersion config.minSdkVersion + compileSdk config.compileSdkVersion targetSdkVersion config.targetSdkVersion versionCode 1 versionName "1.0" -- 2.11.4.GIT