Skip to content

Commit ecdeb0e

Browse files
committed
chore(android): remove V10 compat layer
Remove the mapbox-v11-compat/v10 directory and associated build.gradle conditionals. V10 support was already dropped in 10.3.0; this cleanup removes the remaining V10 compatibility code to simplify the codebase for V11-only support going forward.
1 parent adbed7d commit ecdeb0e

File tree

23 files changed

+1
-1578
lines changed

23 files changed

+1
-1578
lines changed

android/build.gradle

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,7 @@ android {
7979
sourceSets {
8080
main {
8181
java.srcDirs = ['src/main/java']
82-
def mapboxVersion = safeExtGet("RNMapboxMapsVersion", defaultMapboxMapsVersion)
83-
def majorMapboxVersion = mapboxVersion.split("\\.")[0] as Integer
84-
if (majorMapboxVersion >= 11) {
85-
java.srcDirs += 'src/main/mapbox-v11-compat/v11'
86-
} else {
87-
def msg = """
88-
❌ ERROR: Mapbox v10 is no longer supported as of @rnmapbox/maps 10.3.0
89-
Please upgrade to Mapbox v11.x or use @rnmapbox/maps 10.2.x
90-
"""
91-
logger.error(msg)
92-
throw new GradleException(msg)
93-
}
82+
java.srcDirs += 'src/main/mapbox-v11-compat/v11'
9483
java.srcDirs += 'src/main/rn-compat/rn75'
9584

9685
// Adapted from react-native-screens for consistency
@@ -219,9 +208,6 @@ Please upgrade to Mapbox v11.x or use @rnmapbox/maps 10.2.x
219208
}
220209
}
221210

222-
if (safeExtGet("RNMapboxMapsUseV11", false)) {
223-
logger.warn("RNMapboxMapsUseV11 is deprecated, just set RNMapboxMapsVersion to 11.*")
224-
}
225211
}
226212
}
227213

android/src/main/mapbox-v11-compat/v10/com/mapbox/maps/extension/style/layers/generated/RasterParticleLayer.kt

Lines changed: 0 additions & 58 deletions
This file was deleted.

android/src/main/mapbox-v11-compat/v10/com/mapbox/maps/extension/style/sources/generated/RasterArraySource.kt

Lines changed: 0 additions & 20 deletions
This file was deleted.

android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/components/styles/layers/RNMBXRasterParticleLayer.kt

Lines changed: 0 additions & 22 deletions
This file was deleted.

android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/components/styles/layers/RNMBXRasterParticleLayerManager.kt

Lines changed: 0 additions & 59 deletions
This file was deleted.

android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterArraySource.kt

Lines changed: 0 additions & 16 deletions
This file was deleted.

android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterArraySourceManager.kt

Lines changed: 0 additions & 59 deletions
This file was deleted.

android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Annotation.kt

Lines changed: 0 additions & 40 deletions
This file was deleted.

android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Cancelable.kt

Lines changed: 0 additions & 15 deletions
This file was deleted.

android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Event.kt

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)