Skip to content

Commit fa3d9bc

Browse files
authored
Merge pull request #313 from mapbox/mai/MAPSFLT-130_migrate-ios-v11
Standard Style + Evolving Basemap
2 parents ffb7b74 + c715d19 commit fa3d9bc

File tree

145 files changed

+14175
-7650
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+14175
-7650
lines changed

android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ group 'com.mapbox.maps.mapbox_maps'
22
version '1.0-SNAPSHOT'
33

44
buildscript {
5-
ext.kotlin_version = '1.7.10'
5+
ext.kotlin_version = '1.7.20'
66
repositories {
77
google()
88
mavenCentral()
@@ -40,7 +40,7 @@ apply plugin: 'com.android.library'
4040
apply plugin: 'kotlin-android'
4141

4242
android {
43-
compileSdkVersion 31
43+
compileSdk 33
4444

4545
sourceSets {
4646
main.java.srcDirs += 'src/main/kotlin'
@@ -64,7 +64,7 @@ if (file("$rootDir/gradle/ktlint.gradle").exists() && file("$rootDir/gradle/lint
6464

6565
dependencies {
6666
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
67-
implementation ("com.mapbox.maps:android:10.13.0") {
67+
implementation ("com.mapbox.maps:android:11.0.0") {
6868
exclude group: 'com.mapbox.plugin', module: 'maps-lifecycle'
6969
}
7070

android/src/main/java/com/mapbox/maps/pigeons/FLTCircleAnnotationMessager.java

Lines changed: 78 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)