Skip to content

Commit 875a403

Browse files
authored
Update annotation and espresso dependencies (flutter#3271)
* Update annotation and espresso dependencies * Migrate camera_android to use flutter.compileSdkVersion * Migrate camera_android_camerax to use flutter.compileSdkVersion * Migrate camera_camera to use flutter.compileSdkVersion * Migrate espresso to use flutter.compileSdkVersion Fix example app to launch with multidex partial work on flutter/flutter/issues/121423 * Mass replace for flutter.compileSdkVersion on all "apps" * Mass update non app build.gradle files to compileSdkVersion 33 * Update changelog next * Fix misspelling and combine annotation update with compileSdkVersion update * Remove web changelog, update messages to apply to only the changes for that plugin * Remove all changelog changes from packages that did not have a build.gradle update * formatting update * Add copyright to multidex application because it fails repro checks * Remove more unneeded changelog files unrelated to android * Remove CHANGELOG entries for packages where only the example app was updated * Fix bad merge in changelog files and change update to updates in remainding changelog files * Fix more update -> updates
1 parent 0954499 commit 875a403

File tree

67 files changed

+143
-58
lines changed

Some content is hidden

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

67 files changed

+143
-58
lines changed

packages/animations/example/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
2626
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2727

2828
android {
29-
compileSdkVersion 31
29+
compileSdkVersion flutter.compileSdkVersion
3030

3131
sourceSets {
3232
main.java.srcDirs += 'src/main/kotlin'

packages/camera/camera/example/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
2525
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2626

2727
android {
28-
compileSdkVersion 31
28+
compileSdkVersion flutter.compileSdkVersion
2929

3030
lintOptions {
3131
disable 'InvalidPackage'

packages/camera/camera_android/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## NEXT
2+
3+
* Updates compileSdkVersion to 33.
4+
15
## 0.10.4+1
26

37
* Updates links for the merge of flutter/plugins into flutter/packages.

packages/camera/camera_android/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ project.getTasks().withType(JavaCompile){
2727
apply plugin: 'com.android.library'
2828

2929
android {
30-
compileSdkVersion 31
30+
compileSdkVersion 33
3131

3232
defaultConfig {
3333
targetSdkVersion 31

packages/camera/camera_android/example/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
2525
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2626

2727
android {
28-
compileSdkVersion 31
28+
compileSdkVersion flutter.compileSdkVersion
2929

3030
lintOptions {
3131
disable 'InvalidPackage'

packages/camera/camera_android_camerax/example/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
2626
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2727

2828
android {
29-
compileSdkVersion 33
29+
compileSdkVersion flutter.compileSdkVersion
3030
ndkVersion flutter.ndkVersion
3131

3232
compileOptions {

packages/espresso/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 0.2.0+10
2+
3+
* Updates espresso dependencies.
4+
* Fixes example app to compile with multidex.
5+
* Updates compileSdkVersion to 33.
6+
17
## 0.2.0+9
28

39
* Updates links for the merge of flutter/plugins into flutter/packages.

packages/espresso/android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ rootProject.allprojects {
2222
apply plugin: 'com.android.library'
2323

2424
android {
25-
compileSdkVersion 31
25+
compileSdkVersion 33
2626

2727
defaultConfig {
2828
minSdkVersion 16
@@ -56,7 +56,7 @@ dependencies {
5656
testImplementation 'junit:junit:4.13.2'
5757
testImplementation "com.google.truth:truth:1.0"
5858
api 'androidx.test:runner:1.1.1'
59-
api 'androidx.test.espresso:espresso-core:3.1.1'
59+
api 'androidx.test.espresso:espresso-core:3.5.1'
6060

6161
// Core library
6262
api 'androidx.test:core:1.0.0'

packages/espresso/example/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
2525
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2626

2727
android {
28-
compileSdkVersion 31
28+
compileSdkVersion flutter.compileSdkVersion
2929

3030
lintOptions {
3131
disable 'InvalidPackage'

packages/espresso/example/android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
22
package="com.example.espresso_example">
33
<application
4+
android:name="${applicationName}"
45
android:label="espresso_example"
56
android:icon="@mipmap/ic_launcher">
67
<activity

0 commit comments

Comments
 (0)