Skip to content

Commit 9656c4c

Browse files
VitaminPSGgithub-actions[bot]
authored andcommitted
Upgrade Android Gradle Plugin to 8.10.1 (#9094)
* Upgrade Android Gradle Plugin to 8.10.1 GitOrigin-RevId: f23a28bfc7608114a0eaf9f12bdadc484530ca1b
1 parent 6eb1415 commit 9656c4c

File tree

30 files changed

+124
-35
lines changed

30 files changed

+124
-35
lines changed

androidauto/src/androidTest/java/com/mapbox/navigation/ui/androidauto/testing/BitmapTestUtil.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import android.hardware.display.VirtualDisplay
1010
import android.os.Build
1111
import android.os.Environment
1212
import android.provider.MediaStore
13-
import androidx.annotation.RequiresApi
1413
import androidx.test.core.app.ApplicationProvider
14+
import androidx.test.filters.SdkSuppress
1515
import org.junit.Assert.fail
1616
import org.junit.rules.TestName
1717
import java.io.File
@@ -234,7 +234,7 @@ class BitmapTestUtil(
234234
}
235235
}
236236

237-
@RequiresApi(Build.VERSION_CODES.Q)
237+
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.Q)
238238
private fun mediaStoreOutputStream(filePath: String, fileName: String): OutputStream {
239239
val contentValues = ContentValues().apply {
240240
put(MediaStore.MediaColumns.DISPLAY_NAME, fileName)

androidauto/src/main/java/com/mapbox/navigation/ui/androidauto/MapboxCarOptions.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import kotlinx.coroutines.flow.asStateFlow
1818
/**
1919
* The options available for customizing Mapbox Android Auto Navigation.
2020
*/
21+
@OptIn(ExperimentalPreviewMapboxNavigationAPI::class)
2122
class MapboxCarOptions {
2223
private val speedLimitOptionsMutable = MutableStateFlow(SpeedLimitOptions.Builder().build())
2324

app-tests-wrapper/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
apply plugin: 'com.android.application'
22

33
android {
4+
namespace 'com.mapbox.navigation.testswrapper'
45
compileSdkVersion androidVersions.compileSdkVersion
56

67
compileOptions {

base/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ android {
1818
targetCompatibility = JavaVersion.VERSION_1_8
1919
}
2020

21+
buildFeatures {
22+
buildConfig = true
23+
}
24+
2125
defaultConfig {
2226
minSdkVersion androidVersions.minSdkVersion
2327
targetSdkVersion androidVersions.targetSdkVersion

copilot/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,18 @@ apply from: file("../gradle/artifact-settings.gradle")
1010
group = project.ext.mapboxArtifactGroupId
1111

1212
android {
13+
namespace 'com.mapbox.navigation.copilot'
1314
compileSdkVersion androidVersions.compileSdkVersion
1415

1516
compileOptions {
1617
sourceCompatibility = JavaVersion.VERSION_1_8
1718
targetCompatibility = JavaVersion.VERSION_1_8
1819
}
1920

21+
buildFeatures {
22+
buildConfig = true
23+
}
24+
2025
defaultConfig {
2126
minSdkVersion androidVersions.minSdkVersion
2227
targetSdkVersion androidVersions.targetSdkVersion

driver-notification/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ android {
2222
targetCompatibility JavaVersion.VERSION_1_8
2323
}
2424

25+
buildFeatures {
26+
buildConfig = true
27+
}
28+
2529
defaultConfig {
2630
minSdkVersion androidVersions.minSdkVersion
2731
targetSdkVersion androidVersions.targetSdkVersion
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest />
2+
<manifest/>

gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ POM_DEVELOPER_NAME=Mapbox
2323
org.gradle.jvmargs=-Xmx2048M
2424
android.useAndroidX=true
2525
android.enableJetifier=false
26+
android.defaults.buildfeatures.buildconfig=true
27+
android.nonTransitiveRClass=false
28+
android.nonFinalResIds=false
2629

2730
# Increases stack size for the Kotlin compiler to prevent StackOverflowError
2831
# when compiling MapboxRouteLineViewTest.kt. Similar issue:

gradle/dependencies.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ ext {
6060
gmsLocation : '17.0.0',
6161
ktlint : '0.47.1',
6262
kotlinStdLib : kotlinVersion,
63-
firebaseCrashlytics : '17.3.1',
63+
firebaseCrashlytics : '18.6.0',
6464
multidex : '2.0.1',
6565
json : '20180813',
6666
coroutinesAndroid : '1.6.4',
@@ -225,7 +225,7 @@ ext {
225225
pluginVersion = [
226226
checkstyle : '8.2',
227227
pmd : '5.8.1',
228-
gradle : '7.4.2',
228+
gradle : '8.10.1',
229229
dependencyGraph : '0.8.0',
230230
dependencyUpdates : '0.29.0',
231231
kotlin : kotlinVersion,
@@ -237,13 +237,13 @@ ext {
237237
kotlinHtmlJvm : '0.7.2',
238238
jacoco : '0.8.12',
239239
kover : '0.9.1',
240-
googleServices : '4.3.3',
240+
googleServices : '4.4.2',
241241
mapboxSdkVersions : '1.1.5',
242242
dokka : '1.9.20',
243243
mapboxSdkRegistry : '0.7.0',
244244
mapboxAccessToken : '0.2.1',
245245
mapboxNativeDownload : '0.2.2',
246-
firebaseCrashlytics : '2.5.1'
246+
firebaseCrashlytics : '3.0.3'
247247
]
248248

249249
pluginDependencies = [

gradle/publish.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
android {
2+
publishing {
3+
singleVariant("debug")
4+
singleVariant("release")
5+
}
6+
}
7+
18
apply plugin: 'maven-publish'
29
apply plugin: 'com.mapbox.sdkRegistry'
310
apply from: file("$rootDir/gradle/artifact-settings.gradle")

0 commit comments

Comments
 (0)