Skip to content

Commit f805e51

Browse files
kediarovpengdev
authored andcommitted
Remove targetSdk version from all libraries (#9434)
[Jira ticket](https://mapbox.atlassian.net/browse/MAPSSDK-849) Target SDK version is being removed for Android libraries: https://developer.android.com/reference/tools/gradle-api/7.4/com/android/build/api/dsl/LibraryBaseFlavor#targetSdk() Discussion: - I have added `lint.targetSdk` and `testOptions.targetSdk`. It does not seems to be required for every module but it takes a lot of effort to verify where it does, so it is safe to just add those, plus they are not forgotten in case of a need - Should it be added to changelog? Now I just add skip_changelog label cc @mapbox/nav-core-sdk cc @mapbox/3d-live-navigation cc @mapbox/search-sdk-android cc @mapbox/maps-android cc @mapbox/gl-native cc @mapbox/core-sdk cc @mapbox/search-sdk-native cc @mapbox/navnative --------- Co-authored-by: Peng Liu <peng.liu@mapbox.com> GitOrigin-RevId: 52c7abc36caaf2c91e23d6a1f833764096978319
1 parent 08e3278 commit f805e51

File tree

18 files changed

+90
-22
lines changed

18 files changed

+90
-22
lines changed

extension-androidauto/build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,17 @@ android {
77
namespace = "com.mapbox.maps.extension.androidauto"
88
defaultConfig {
99
minSdk = libs.versions.autoMinSdkVersion.get().toInt()
10-
targetSdk = libs.versions.autoTargetSdkVersion.get().toInt()
1110
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1211
}
13-
1412
testOptions {
13+
targetSdk = libs.versions.autoTargetSdkVersion.get().toInt()
1514
unitTests.apply {
1615
isIncludeAndroidResources = true
1716
}
1817
}
18+
lint {
19+
targetSdk = libs.versions.autoTargetSdkVersion.get().toInt()
20+
}
1921
}
2022

2123
mapboxLibrary {

extension-compose/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ android {
88
namespace = "com.mapbox.maps.extension.compose"
99
defaultConfig {
1010
minSdk = libs.versions.androidMinSdkVersion.get().toInt()
11-
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
1211
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1312
}
1413

1514
testOptions {
15+
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
1616
unitTests.apply {
1717
isIncludeAndroidResources = true
1818
}
@@ -31,6 +31,7 @@ android {
3131
}
3232

3333
lint {
34+
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
3435
warningsAsErrors = true
3536
}
3637

extension-localization/build.gradle.kts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,14 @@ plugins {
55
android {
66
compileSdk = libs.versions.androidCompileSdkVersion.get().toInt()
77
namespace = "com.mapbox.maps.extension.localization"
8+
lint {
9+
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
10+
}
11+
testOptions {
12+
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
13+
}
814
defaultConfig {
915
minSdk = libs.versions.androidMinSdkVersion.get().toInt()
10-
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
1116
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1217
}
1318
}

extension-style/build.gradle.kts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,15 @@ android {
66
compileSdk = libs.versions.androidCompileSdkVersion.get().toInt()
77
defaultConfig {
88
minSdk = libs.versions.androidMinSdkVersion.get().toInt()
9-
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
109
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1110
}
1211
namespace = "com.mapbox.maps.extension.style"
12+
lint {
13+
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
14+
}
15+
testOptions {
16+
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
17+
}
1318
}
1419

1520
mapboxLibrary {

maps-sdk/build.gradle.kts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@ mapboxLibrary {
3434
android {
3535
compileSdk = libs.versions.androidCompileSdkVersion.get().toInt()
3636
namespace = "com.mapbox.maps"
37+
lint {
38+
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
39+
}
3740
defaultConfig {
3841
minSdk = libs.versions.androidMinSdkVersion.get().toInt()
39-
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
4042
consumerProguardFiles("proguard-rules.pro")
4143
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
4244
testInstrumentationRunnerArguments["clearPackageData"] = "true"
@@ -61,6 +63,7 @@ android {
6163
}
6264

6365
testOptions {
66+
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
6467
unitTests.apply {
6568
isIncludeAndroidResources = true
6669
}

module-telemetry/build.gradle.kts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,14 @@ plugins {
66
android {
77
compileSdk = libs.versions.androidCompileSdkVersion.get().toInt()
88
namespace = "com.mapbox.maps.module.telemetry"
9+
lint {
10+
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
11+
}
12+
testOptions {
13+
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
14+
}
915
defaultConfig {
1016
minSdk = libs.versions.androidMinSdkVersion.get().toInt()
11-
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
1217
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1318
ndk {
1419
val abi: String =

plugin-animation/build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ android {
88
namespace = "com.mapbox.maps.plugin.camera.animation"
99
defaultConfig {
1010
minSdk = libs.versions.androidMinSdkVersion.get().toInt()
11-
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
1211
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1312
}
14-
1513
testOptions {
14+
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
1615
unitTests.apply {
1716
isIncludeAndroidResources = true
1817
}
1918
}
19+
lint {
20+
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
21+
}
2022
}
2123

2224
mapboxLibrary {

plugin-annotation/build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,17 @@ android {
77
namespace = "com.mapbox.maps.plugin.annotation"
88
defaultConfig {
99
minSdk = libs.versions.androidMinSdkVersion.get().toInt()
10-
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
1110
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1211
}
13-
1412
testOptions {
13+
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
1514
unitTests.apply {
1615
isIncludeAndroidResources = true
1716
}
1817
}
18+
lint {
19+
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
20+
}
1921
}
2022

2123
mapboxLibrary {

plugin-attribution/build.gradle.kts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,18 @@ android {
77
namespace = "com.mapbox.maps.plugin.attribution"
88
defaultConfig {
99
minSdk = libs.versions.androidMinSdkVersion.get().toInt()
10-
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
1110
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1211
}
1312

1413
testOptions {
14+
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
1515
unitTests.apply {
1616
isIncludeAndroidResources = true
1717
}
1818
}
19+
lint {
20+
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
21+
}
1922
}
2023

2124
mapboxLibrary {

plugin-compass/build.gradle.kts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,14 @@ plugins {
55
android {
66
compileSdk = libs.versions.androidCompileSdkVersion.get().toInt()
77
namespace = "com.mapbox.maps.plugin.compass"
8+
lint {
9+
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
10+
}
11+
testOptions {
12+
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
13+
}
814
defaultConfig {
915
minSdk = libs.versions.androidMinSdkVersion.get().toInt()
10-
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
1116
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1217
}
1318
}

0 commit comments

Comments
 (0)