Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[most on Android] Bump compile SDK version to 34 #5783

Merged
merged 15 commits into from
Jan 22, 2024
Merged

[most on Android] Bump compile SDK version to 34 #5783

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
84dd6aa
Bump + rename
camsim99 Jan 2, 2024
a6481fc
Merge remote-tracking branch 'upstream/main' into compileSdk_bump_34
camsim99 Jan 9, 2024
e5647d5
Bump all packages
camsim99 Jan 9, 2024
e11dd0a
Try bump to 33
camsim99 Jan 9, 2024
cbc265e
Legacy proj updates
camsim99 Jan 9, 2024
cf74f8f
Add changelog entries
camsim99 Jan 9, 2024
681f8ed
Update tool tests
camsim99 Jan 9, 2024
7261d03
test vid player
camsim99 Jan 9, 2024
9a3c4ae
Try 5 millis
camsim99 Jan 10, 2024
6d06d86
Merge remote-tracking branch 'upstream/main' into compileSdk_bump_34
camsim99 Jan 10, 2024
d852709
See if flake
camsim99 Jan 10, 2024
9c44a99
Merge remote-tracking branch 'upstream/main' into compileSdk_bump_34
camsim99 Jan 11, 2024
fcb6615
Empty-Commit
camsim99 Jan 12, 2024
14b6122
Merge remote-tracking branch 'upstream/main' into compileSdk_bump_34
camsim99 Jan 22, 2024
ed102e2
Merge branch 'main' into compileSdk_bump_34
camsim99 Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .ci/legacy_project/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,5 @@ and then deleting everything but `android/` from it:
- Added license boilerplate.
- Replaced `jcenter` in build.gradle with `mavenCentral`, due to the
jcenter.bintray.com shutdown.
- Update `compileSdkVersion` from 30 to 33 to maintain compatibility
with plugins that use API 34.
2 changes: 1 addition & 1 deletion .ci/legacy_project/all_packages/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 30
compileSdkVersion 33

defaultConfig {
applicationId "com.example.all_packages"
Expand Down
2 changes: 1 addition & 1 deletion packages/animations/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace 'dev.flutter.packages.animations.example'
compileSdkVersion flutter.compileSdkVersion
compileSdk flutter.compileSdkVersion

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
Expand Down
2 changes: 1 addition & 1 deletion packages/camera/camera/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace 'io.flutter.plugins.cameraexample'
compileSdkVersion flutter.compileSdkVersion
compileSdk flutter.compileSdkVersion


defaultConfig {
Expand Down
4 changes: 4 additions & 0 deletions packages/camera/camera_android/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## NEXT

* Updates compileSdk version to 34.

## 0.10.8+16

* Fixes new lint warnings.
Expand Down
2 changes: 1 addition & 1 deletion packages/camera/camera_android/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ buildFeatures {
if (project.android.hasProperty("namespace")) {
namespace 'io.flutter.plugins.camera'
}
compileSdkVersion 33
compileSdk 34

defaultConfig {
minSdkVersion 21
Expand Down
2 changes: 1 addition & 1 deletion packages/camera/camera_android/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace 'io.flutter.plugins.cameraexample'
compileSdkVersion flutter.compileSdkVersion
compileSdk flutter.compileSdkVersion


defaultConfig {
Expand Down
4 changes: 4 additions & 0 deletions packages/camera/camera_android_camerax/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## NEXT

* Updates compileSdk version to 34.

## 0.5.0+26

* Fixes new lint warnings.
Expand Down
2 changes: 1 addition & 1 deletion packages/camera/camera_android_camerax/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ android {
namespace 'io.flutter.plugins.camerax'
}
// CameraX dependencies require compilation against version 33 or later.
compileSdkVersion 33
compileSdk 34

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand Down
2 changes: 1 addition & 1 deletion packages/camera/camera_android_camerax/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace 'io.flutter.plugins.cameraxexample'
compileSdkVersion flutter.compileSdkVersion
compileSdk flutter.compileSdkVersion
ndkVersion flutter.ndkVersion

compileOptions {
Expand Down
2 changes: 1 addition & 1 deletion packages/dynamic_layouts/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace 'dev.flutter.packages.animations.example'
compileSdkVersion flutter.compileSdkVersion
compileSdk flutter.compileSdkVersion
ndkVersion flutter.ndkVersion

compileOptions {
Expand Down
1 change: 1 addition & 0 deletions packages/espresso/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## NEXT

* Updates compileSdk version to 34.
* Updates minimum supported SDK version to Flutter 3.10/Dart 3.0.

## 0.3.0+6
Expand Down
2 changes: 1 addition & 1 deletion packages/espresso/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android {
if (project.android.hasProperty("namespace")) {
namespace 'com.example.espresso'
}
compileSdkVersion 33
compileSdk 34

defaultConfig {
minSdkVersion 16
Expand Down
2 changes: 1 addition & 1 deletion packages/espresso/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion flutter.compileSdkVersion
compileSdk flutter.compileSdkVersion
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
namespace "com.example.espresso_example"

Expand Down
2 changes: 1 addition & 1 deletion packages/extension_google_sign_in_as_googleapis_auth/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ apply plugin: 'com.google.gms.google-services'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion flutter.compileSdkVersion
compileSdk flutter.compileSdkVersion

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand Down
2 changes: 1 addition & 1 deletion packages/file_selector/file_selector/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace "dev.flutter.plugins.file_selector_example"
compileSdkVersion flutter.compileSdkVersion
compileSdk flutter.compileSdkVersion
ndkVersion flutter.ndkVersion

compileOptions {
Expand Down
4 changes: 4 additions & 0 deletions packages/file_selector/file_selector_android/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## NEXT

* Updates compileSdk version to 34.

## 0.5.0+7

* Bumps androidx.annotation:annotation from 1.7.0 to 1.7.1.
Expand Down
2 changes: 1 addition & 1 deletion packages/file_selector/file_selector_android/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android {
if (project.android.hasProperty("namespace")) {
namespace 'dev.flutter.packages.file_selector_android'
}
compileSdkVersion 33
compileSdk 34

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand Down
2 changes: 1 addition & 1 deletion packages/file_selector/file_selector_android/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace "dev.flutter.packages.file_selector_android_example"
compileSdkVersion flutter.compileSdkVersion
compileSdk flutter.compileSdkVersion
ndkVersion flutter.ndkVersion

compileOptions {
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_adaptive_scaffold/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion flutter.compileSdkVersion
compileSdk flutter.compileSdkVersion
ndkVersion flutter.ndkVersion

compileOptions {
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_image/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace "com.example.example"
compileSdkVersion flutter.compileSdkVersion
compileSdk flutter.compileSdkVersion
ndkVersion flutter.ndkVersion

compileOptions {
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_markdown/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion flutter.compileSdkVersion
compileSdk flutter.compileSdkVersion

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
Expand Down
1 change: 1 addition & 0 deletions packages/flutter_plugin_android_lifecycle/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## NEXT

* Updates compileSdk version to 34.
* Updates minimum supported SDK version to Flutter 3.10/Dart 3.0.

## 2.0.17
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_plugin_android_lifecycle/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android {
if (project.android.hasProperty("namespace")) {
namespace 'io.flutter.plugins.flutter_plugin_android_lifecycle'
}
compileSdkVersion 33
compileSdk 34

defaultConfig {
minSdkVersion 16
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_plugin_android_lifecycle/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion flutter.compileSdkVersion
compileSdk flutter.compileSdkVersion


defaultConfig {
Expand Down
2 changes: 1 addition & 1 deletion packages/go_router/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion flutter.compileSdkVersion
compileSdk flutter.compileSdkVersion

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand Down
2 changes: 1 addition & 1 deletion packages/google_maps_flutter/google_maps_flutter/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion flutter.compileSdkVersion
compileSdk flutter.compileSdkVersion


defaultConfig {
Expand Down
4 changes: 4 additions & 0 deletions packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## NEXT

* Updates compileSdk version to 34.

## 2.6.2

* Updates minimum required plugin_platform_interface version to 2.1.7.
Expand Down
2 changes: 1 addition & 1 deletion packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android {
if (project.android.hasProperty("namespace")) {
namespace 'io.flutter.plugins.googlemaps'
}
compileSdkVersion 33
compileSdk 34

defaultConfig {
minSdkVersion 20
Expand Down
2 changes: 1 addition & 1 deletion packages/google_maps_flutter/google_maps_flutter_android/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace 'io.flutter.plugins.googlemapsexample'
compileSdkVersion flutter.compileSdkVersion
compileSdk flutter.compileSdkVersion


defaultConfig {
Expand Down
2 changes: 1 addition & 1 deletion packages/google_sign_in/google_sign_in/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace 'io.flutter.plugins.googlesigninexample'
compileSdkVersion flutter.compileSdkVersion
compileSdk flutter.compileSdkVersion


defaultConfig {
Expand Down
4 changes: 4 additions & 0 deletions packages/google_sign_in/google_sign_in_android/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## NEXT

* Updates compileSdk version to 34.

## 6.1.21

* Updates `clearAuthCache` override to match base class declaration.
Expand Down
2 changes: 1 addition & 1 deletion packages/google_sign_in/google_sign_in_android/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android {
if (project.android.hasProperty("namespace")) {
namespace 'io.flutter.plugins.googlesignin'
}
compileSdkVersion 33
compileSdk 34

defaultConfig {
minSdkVersion 16
Expand Down
2 changes: 1 addition & 1 deletion packages/google_sign_in/google_sign_in_android/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace 'io.flutter.plugins.googlesigninexample'
compileSdkVersion flutter.compileSdkVersion
compileSdk flutter.compileSdkVersion


defaultConfig {
Expand Down
2 changes: 1 addition & 1 deletion packages/image_picker/image_picker/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace 'io.flutter.plugins.imagepickerexample'
compileSdkVersion flutter.compileSdkVersion
compileSdk flutter.compileSdkVersion
testOptions.unitTests.includeAndroidResources = true


Expand Down
4 changes: 4 additions & 0 deletions packages/image_picker/image_picker_android/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## NEXT

* Updates compileSdk version to 34.

## 0.8.9+3

* Bumps androidx.annotation:annotation from 1.7.0 to 1.7.1.
Expand Down
2 changes: 1 addition & 1 deletion packages/image_picker/image_picker_android/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android {
if (project.android.hasProperty("namespace")) {
namespace 'io.flutter.plugins.imagepicker'
}
compileSdkVersion 33
compileSdk 34

defaultConfig {
minSdkVersion 16
Expand Down
2 changes: 1 addition & 1 deletion packages/image_picker/image_picker_android/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace 'io.flutter.plugins.imagepickerexample'
compileSdkVersion flutter.compileSdkVersion
compileSdk flutter.compileSdkVersion
testOptions.unitTests.includeAndroidResources = true


Expand Down
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ android {
}
}

compileSdkVersion flutter.compileSdkVersion
compileSdk flutter.compileSdkVersion


defaultConfig {
Expand Down
4 changes: 4 additions & 0 deletions packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## NEXT

* Updates compileSdk version to 34.

## 0.3.0+17

* Bumps androidx.annotation:annotation from 1.7.0 to 1.7.1.
Expand Down
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_android/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android {
if (project.android.hasProperty("namespace")) {
namespace 'io.flutter.plugins.inapppurchase'
}
compileSdkVersion 33
compileSdk 34

defaultConfig {
minSdkVersion 16
Expand Down
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_android/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace 'io.flutter.plugins.inapppurchaseexample'
compileSdkVersion flutter.compileSdkVersion
compileSdk flutter.compileSdkVersion

signingConfigs {
release {
Expand Down
2 changes: 1 addition & 1 deletion packages/local_auth/local_auth/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace 'io.flutter.plugins.localauthexample'
compileSdkVersion flutter.compileSdkVersion
compileSdk flutter.compileSdkVersion


defaultConfig {
Expand Down
4 changes: 4 additions & 0 deletions packages/local_auth/local_auth_android/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## NEXT

* Updates compileSdk version to 34.

## 1.0.36

* Updates androidx.fragment version to 1.6.2.
Expand Down
2 changes: 1 addition & 1 deletion packages/local_auth/local_auth_android/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android {
if (project.android.hasProperty("namespace")) {
namespace 'io.flutter.plugins.localauth'
}
compileSdkVersion 33
compileSdk 34

defaultConfig {
minSdkVersion 16
Expand Down
2 changes: 1 addition & 1 deletion packages/local_auth/local_auth_android/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace 'io.flutter.plugins.localauthexample'
compileSdkVersion flutter.compileSdkVersion
compileSdk flutter.compileSdkVersion


defaultConfig {
Expand Down
Loading