Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit 50941c8

Browse files
author
Michael Klimushyn
committed
Revert all src AndroidX changes for 1.0.0 plugins
The AndroidX migration didn't increment the major version for plugins >= 1.0.0. This commit reverts the code changes in the affected plugins.
1 parent 98e7634 commit 50941c8

File tree

35 files changed

+93
-182
lines changed

35 files changed

+93
-182
lines changed

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_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'

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

Lines changed: 5 additions & 5 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.firebasedatabaseexample'
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 {
@@ -55,8 +55,8 @@ flutter {
5555

5656
dependencies {
5757
testImplementation 'junit:junit:4.12'
58-
androidTestImplementation 'androidx.test:runner:1.1.1'
59-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
58+
androidTestImplementation 'com.android.support.test:runner:1.0.2'
59+
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
6060
}
6161

6262
apply plugin: 'com.google.gms.google-services'

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

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

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

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

packages/firebase_database/example/android/build.gradle

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

77
dependencies {
8-
classpath 'com.android.tools.build:gradle:3.3.0'
8+
classpath 'com.android.tools.build:gradle:3.2.1'
99
classpath 'com.google.gms:google-services:4.2.0'
1010
}
1111
}

0 commit comments

Comments
 (0)