Skip to content

Commit fd5e235

Browse files
author
Michael Klimushyn
authored
Revert AndroidX changes for 1.0.0 plugins (#1127)
The AndroidX migration didn't increment the major version for plugins >= 1.0.0. This commit reverts the code changes in the affected plugins. It's critical that the forward roll PR is published with this so that clients that have previously migrated aren't broken by the revert. I'm not planning on merging this into master until the forward roll (flutter/plugins#1128) is also LGTMed and ready to merge. flutter/flutter#27128 flutter/flutter#23995
1 parent e969d74 commit fd5e235

File tree

37 files changed

+147
-170
lines changed

37 files changed

+147
-170
lines changed

packages/firebase_analytics/CHANGELOG.md

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,22 @@
1+
## 1.2.0+1
2+
3+
* **Revert the breaking 1.2.0 update**. 1.2.0 was known to be breaking and
4+
should have incremented the major version number instead of the minor. This
5+
revert is in and of itself breaking for anyone that has already migrated
6+
however. Anyone who has already migrated their app to AndroidX should
7+
immediately update to `2.0.0` instead. That's the correctly versioned new push
8+
of `1.2.0`.
9+
110
## 1.2.0
2-
* **Breaking change**. Migrate from the deprecated original Android Support
11+
12+
* **BAD**. This was a breaking change that was incorrectly published on a minor
13+
version upgrade, should never have happened. Reverted by 1.2.0+1.
14+
15+
"**Breaking change**. Migrate from the deprecated original Android Support
316
Library to AndroidX. This shouldn't result in any functional changes, but it
417
requires any Android apps using this plugin to [also
518
migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
6-
using the original support library.
19+
using the original support library."
720

821
## 1.1.0
922

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.3.0'
11+
classpath 'com.android.tools.build:gradle:3.2.1'
1212
}
1313
}
1414

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

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

2727
defaultConfig {
2828
minSdkVersion 16
29-
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
29+
testInstrumentationRunner "android.support.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 28
28+
compileSdkVersion 27
2929

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

4343
buildTypes {

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

Lines changed: 0 additions & 2 deletions
This file was deleted.

packages/firebase_analytics/example/android/app/gradle/wrapper/gradle-wrapper.properties

Lines changed: 0 additions & 5 deletions
This file was deleted.

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.3.0'
9+
classpath 'com.android.tools.build:gradle:3.2.1'
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.3.0
9+
firebase_core: ^0.2.5
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
6+
version: 1.2.0+1
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.3.0
24+
firebase_core: ^0.2.5
2525

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

packages/firebase_database/CHANGELOG.md

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,22 @@
1+
## 1.1.0+1
2+
3+
* **Revert the breaking 1.1.0 update**. 1.1.0 was known to be breaking and
4+
should have incremented the major version number instead of the minor. This
5+
revert is in and of itself breaking for anyone that has already migrated
6+
however. Anyone who has already migrated their app to AndroidX should
7+
immediately update to `2.0.0` instead. That's the correctly versioned new push
8+
of `1.1.0`.
9+
110
## 1.1.0
2-
* **Breaking change**. Migrate from the deprecated original Android Support
11+
12+
* **BAD**. This was a breaking change that was incorrectly published on a minor
13+
version upgrade, should never have happened. Reverted by 1.1.0+1.
14+
15+
"**Breaking change**. Migrate from the deprecated original Android Support
316
Library to AndroidX. This shouldn't result in any functional changes, but it
417
requires any Android apps using this plugin to [also
518
migrate](https://developer.android.com/jetpack/androidx/migrate) if they're
6-
using the original support library.
19+
using the original support library."
720

821
## 1.0.5
922

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.3.0'
11+
classpath 'com.android.tools.build:gradle:3.2.1'
1212
}
1313
}
1414

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

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

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

0 commit comments

Comments
 (0)