Skip to content

Commit 942f7d2

Browse files
evil159vitorDevop
andauthored
Bump Flutter SDK and compileSdk versions (#1040)
* increased compileSdk to 34 (#1039) * Bump Flutter SDK 3.27, compileSDK to 35 * bump flutter sdk on CI * add changelog entry * increase test timeout to 10 minutes --------- Co-authored-by: Vítor Barroso <[email protected]>
1 parent 9dca0f0 commit 942f7d2

File tree

7 files changed

+18
-13
lines changed

7 files changed

+18
-13
lines changed

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
steps:
103103
- checkout
104104
- flutter/install_sdk_and_pub:
105-
version: 3.24.3
105+
version: 3.27.0
106106
app-dir: example
107107
- run:
108108
name: ktlint
@@ -142,7 +142,7 @@ jobs:
142142
gcloud firebase test android run --type instrumentation \
143143
--app << parameters.workspace-path >>/debug/app-debug.apk \
144144
--test << parameters.workspace-path >>/androidTest/debug/app-debug-androidTest.apk \
145-
--timeout 5m \
145+
--timeout 10m \
146146
--device model=shiba,version=34,locale=en,orientation=portrait \
147147
--results-dir=result_dir \
148148
--use-orchestrator \
@@ -164,7 +164,7 @@ jobs:
164164
- add-mapbox-submodules-key
165165
- macos/install-rosetta
166166
- flutter/install_sdk_and_pub:
167-
version: 3.24.3
167+
version: 3.27.0
168168
app-dir: example
169169
- run:
170170
name: swiftlint
@@ -209,7 +209,7 @@ jobs:
209209
gcloud firebase test ios run \
210210
--test << parameters.workspace-path >>/build_products.zip \
211211
--device model=iphone13pro,version=15.7 \
212-
--timeout 5m \
212+
--timeout 10m \
213213
--num-flaky-test-attempts 3 \
214214
--client-details matrixLabel="${CIRCLE_JOB}-${CIRCLE_SHA1:0:6}" 2>&1 | tee firebase_test_lab_run.log
215215
- run:

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
### main
2+
3+
* Bump Flutter SDK minimum required version to 3.27.0 and `compileSdk` to 35 on Android.
4+
15
### 2.12.0-beta.1
26

37
* Use Maps SDK Android dependency with NDK 27 support and [support for 16 KB page sizes](https://developer.android.com/guide/practices/page-sizes).

android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
}
1010

1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:7.3.0'
12+
classpath 'com.android.tools.build:gradle:8.10.1'
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1414
}
1515
}
@@ -31,7 +31,7 @@ apply plugin: 'com.android.library'
3131
apply plugin: 'kotlin-android'
3232

3333
android {
34-
compileSdk 33
34+
compileSdk 35
3535

3636
namespace 'com.mapbox.maps.mapbox_maps'
3737
sourceSets {

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip

example/android/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
allprojects {
22
repositories {
3+
mavenLocal()
34
google()
45
mavenCentral()
56
}

example/pubspec.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ packages:
127127
dependency: transitive
128128
description:
129129
name: flutter_plugin_android_lifecycle
130-
sha256: "5a1e6fb2c0561958d7e4c33574674bda7b77caaca7a33b758876956f2902eea3"
130+
sha256: b0694b7fb1689b0e6cc193b3f1fcac6423c4f93c74fb20b806c6b6f196db0c31
131131
url: "https://pub.dev"
132132
source: hosted
133-
version: "2.0.27"
133+
version: "2.0.30"
134134
flutter_test:
135135
dependency: "direct dev"
136136
description: flutter
@@ -541,4 +541,4 @@ packages:
541541
version: "1.1.0"
542542
sdks:
543543
dart: ">=3.8.0-0 <4.0.0"
544-
flutter: ">=3.27.0"
544+
flutter: ">=3.29.0"

pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ version: 2.12.0-beta.1
44
homepage: https://github.com/mapbox/mapbox-maps-flutter
55

66
environment:
7-
sdk: ">=3.4.4 <4.0.0"
8-
flutter: ">=3.22.3"
7+
sdk: ">=3.6.0 <4.0.0"
8+
flutter: ">=3.27.0"
99

1010
dependencies:
1111
flutter:
1212
sdk: flutter
13-
flutter_plugin_android_lifecycle: ^2.0.5
13+
flutter_plugin_android_lifecycle: ^2.0.29
1414
turf: ^0.0.8
1515
typed_data: ^1.3.0
1616
meta: ^1.9.1

0 commit comments

Comments
 (0)