Skip to content

Commit fef73ad

Browse files
Michael Klimushynandreidiaconu
authored andcommitted
Migrate to AndroidX forward roll (flutter#1128)
This PR forward rolls the earlier breaking changes with a proper semantic version upgrade. flutter/flutter#27128 flutter/flutter#23995
1 parent 8ef5806 commit fef73ad

File tree

51 files changed

+256
-107
lines changed

Some content is hidden

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

51 files changed

+256
-107
lines changed

packages/firebase_analytics/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
## 2.0.0
2+
3+
* **Breaking change**. Migrate from the deprecated original Android Support
4+
Library to AndroidX. This shouldn't result in any functional changes, but it
5+
requires any Android apps using this plugin to [also
6+
migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
7+
using the original support library.
8+
9+
This was originally incorrectly pushed in the `1.2.0` update.
10+
111
## 1.2.0+1
212

313
* **Revert the breaking 1.2.0 update**. 1.2.0 was known to be breaking and

packages/firebase_analytics/android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
}
99

1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.2.1'
11+
classpath 'com.android.tools.build:gradle:3.3.0'
1212
}
1313
}
1414

@@ -22,11 +22,11 @@ rootProject.allprojects {
2222
apply plugin: 'com.android.library'
2323

2424
android {
25-
compileSdkVersion 27
25+
compileSdkVersion 28
2626

2727
defaultConfig {
2828
minSdkVersion 16
29-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
29+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3030
}
3131
lintOptions {
3232
disable 'InvalidPackage'

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

Lines changed: 3 additions & 3 deletions
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 27
28+
compileSdkVersion 28
2929

3030
lintOptions {
3131
disable 'InvalidPackage'
@@ -34,10 +34,10 @@ android {
3434
defaultConfig {
3535
applicationId "io.flutter.plugins.firebaseanalyticsexample"
3636
minSdkVersion 16
37-
targetSdkVersion 27
37+
targetSdkVersion 28
3838
versionCode flutterVersionCode.toInteger()
3939
versionName flutterVersionName
40-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
40+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4141
}
4242

4343
buildTypes {
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
android.enableJetifier=true
2+
android.useAndroidX=true
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

packages/firebase_analytics/example/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
}
77

88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.2.1'
9+
classpath 'com.android.tools.build:gradle:3.3.0'
1010
classpath 'com.google.gms:google-services:4.2.0'
1111
}
1212
}

packages/firebase_analytics/example/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies:
66
sdk: flutter
77
firebase_analytics:
88
path: ../
9-
firebase_core: ^0.2.5
9+
firebase_core: ^0.3.0
1010

1111
# For information on the generic Dart part of this file, see the
1212
# following page: https://www.dartlang.org/tools/pub/pubspec

packages/firebase_analytics/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Analytics for Firebase, an app measuremen
33
solution that provides insight on app usage and user engagement on Android and iOS.
44
author: Flutter Team <flutter-dev@googlegroups.com>
55
homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_analytics
6-
version: 1.2.0+1
6+
version: 2.0.0
77

88
flutter:
99
plugin:
@@ -21,7 +21,7 @@ dev_dependencies:
2121
mockito: 3.0.0
2222
flutter_test:
2323
sdk: flutter
24-
firebase_core: ^0.2.5
24+
firebase_core: ^0.3.0
2525

2626
environment:
2727
sdk: ">=2.0.0-dev.28.0 <3.0.0"

packages/firebase_database/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
## 2.0.0
2+
3+
* **Breaking change**. Migrate from the deprecated original Android Support
4+
Library to AndroidX. This shouldn't result in any functional changes, but it
5+
requires any Android apps using this plugin to [also
6+
migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
7+
using the original support library.
8+
9+
This was originally incorrectly pushed in the `1.1.0` update.
10+
111
## 1.1.0+1
212

313
* **Revert the breaking 1.1.0 update**. 1.1.0 was known to be breaking and

packages/firebase_database/android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
}
99

1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.2.1'
11+
classpath 'com.android.tools.build:gradle:3.3.0'
1212
}
1313
}
1414

@@ -22,11 +22,11 @@ rootProject.allprojects {
2222
apply plugin: 'com.android.library'
2323

2424
android {
25-
compileSdkVersion 27
25+
compileSdkVersion 28
2626

2727
defaultConfig {
2828
minSdkVersion 16
29-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
29+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3030
}
3131
lintOptions {
3232
disable 'InvalidPackage'

0 commit comments

Comments
 (0)