diff --git a/app/build.gradle b/app/build.gradle index 81d60db1f..989768403 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,7 +23,7 @@ import static org.gradle.api.tasks.testing.TestResult.ResultType apply from: 'benchmark.gradle' android { - compileSdkVersion Config.compileSdkVersion + compileSdkVersion config.compileSdkVersion project.maybeConfigForJetpackBenchmark(it) if (project.hasProperty("testBuildType")) { @@ -34,8 +34,8 @@ android { defaultConfig { applicationId "org.mozilla" - minSdkVersion Config.minSdkVersion - targetSdkVersion Config.targetSdkVersion + minSdkVersion config.minSdkVersion + targetSdkVersion config.targetSdkVersion versionCode 1 versionName Config.generateDebugVersionName() vectorDrawables.useSupportLibrary = true diff --git a/benchmark/build.gradle b/benchmark/build.gradle index 8feec5f2b..6080f21f6 100644 --- a/benchmark/build.gradle +++ b/benchmark/build.gradle @@ -9,7 +9,7 @@ plugins { android { namespace 'org.mozilla.fenix.benchmark' - compileSdk Config.compileSdkVersion + compileSdk config.compileSdkVersion compileOptions { sourceCompatibility = JavaVersion.VERSION_17 @@ -22,7 +22,7 @@ android { defaultConfig { minSdk 23 - targetSdk Config.targetSdkVersion + targetSdk config.targetSdkVersion testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index 6f0e2ba50..51dc5894a 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -11,10 +11,6 @@ import java.util.Date import java.util.Locale object Config { - // Synchronized build configuration for all modules - const val compileSdkVersion = 33 - const val minSdkVersion = 21 - const val targetSdkVersion = 33 @JvmStatic private fun generateDebugVersionName(): String {