Bug 1838312 - Remove hardcoded compileSdkVersion, minSdkVersion and targetSdkVersion in Fenix and Focus

This removes the hardcoded compileSdkVersion, minSdkVersion and targetSdkVersion in Fenix and Focus
in favor of reading these SDK versions via our config from AC.
fenix/116.0
Gabriel Luong 1 year ago committed by mergify[bot]
parent dbdeed5082
commit 91d83cbc6b

@ -23,7 +23,7 @@ import static org.gradle.api.tasks.testing.TestResult.ResultType
apply from: 'benchmark.gradle' apply from: 'benchmark.gradle'
android { android {
compileSdkVersion Config.compileSdkVersion compileSdkVersion config.compileSdkVersion
project.maybeConfigForJetpackBenchmark(it) project.maybeConfigForJetpackBenchmark(it)
if (project.hasProperty("testBuildType")) { if (project.hasProperty("testBuildType")) {
@ -34,8 +34,8 @@ android {
defaultConfig { defaultConfig {
applicationId "org.mozilla" applicationId "org.mozilla"
minSdkVersion Config.minSdkVersion minSdkVersion config.minSdkVersion
targetSdkVersion Config.targetSdkVersion targetSdkVersion config.targetSdkVersion
versionCode 1 versionCode 1
versionName Config.generateDebugVersionName() versionName Config.generateDebugVersionName()
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true

@ -9,7 +9,7 @@ plugins {
android { android {
namespace 'org.mozilla.fenix.benchmark' namespace 'org.mozilla.fenix.benchmark'
compileSdk Config.compileSdkVersion compileSdk config.compileSdkVersion
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_17 sourceCompatibility = JavaVersion.VERSION_17
@ -22,7 +22,7 @@ android {
defaultConfig { defaultConfig {
minSdk 23 minSdk 23
targetSdk Config.targetSdkVersion targetSdk config.targetSdkVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }

@ -11,10 +11,6 @@ import java.util.Date
import java.util.Locale import java.util.Locale
object Config { object Config {
// Synchronized build configuration for all modules
const val compileSdkVersion = 33
const val minSdkVersion = 21
const val targetSdkVersion = 33
@JvmStatic @JvmStatic
private fun generateDebugVersionName(): String { private fun generateDebugVersionName(): String {

Loading…
Cancel
Save