github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "Use AndroidX in new projects by default (#40925)" (#40995)" (#41001)

Browse Source 
This reverts commit 8e23179627.
This commit is contained in:
Emmanuel Garcia 2019-09-24 16:55:09 -07:00 committed by GitHub
parent 964dc1fc30
commit 48ce60824a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/integration_tests/android_host_app/app/build.gradle
View File

@ -14,11 +14,11 @@ android {
targetSdkVersion 28
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
}
dependencies {
implementation project(':flutter')
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'androidx.appcompat:appcompat:1.1.0'
}

2
dev/integration_tests/android_host_app/app/src/main/java/io/flutter/add2app/MainActivity.java
View File

@ -1,7 +1,7 @@
package io.flutter.add2app;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;
import io.flutter.facade.Flutter;
public class MainActivity extends AppCompatActivity {

3
dev/integration_tests/android_host_app/gradle.properties
View File

@ -1 +1,4 @@
org.gradle.jvmargs=-Xmx1536m
android.useAndroidX=true
android.enableJetifier=true

2
dev/integration_tests/module_host_with_custom_build/app/build.gradle
View File

@ -39,5 +39,5 @@ android {
dependencies {
implementation project(':flutter')
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'androidx.appcompat:appcompat:1.1.0'
}

2
dev/integration_tests/module_host_with_custom_build/app/src/main/java/io/flutter/addtoapp/MainActivity.java
View File

@ -1,7 +1,7 @@
package io.flutter.addtoapp;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;
import io.flutter.facade.Flutter;
public class MainActivity extends AppCompatActivity {

3
dev/integration_tests/module_host_with_custom_build/gradle.properties
View File

@ -1 +1,4 @@
org.gradle.jvmargs=-Xmx1536m
android.useAndroidX=true
android.enableJetifier=true

4
packages/flutter_tools/lib/src/commands/create.dart
View File

@ -141,7 +141,7 @@ class CreateCommand extends FlutterCommand {
argParser.addFlag(
'androidx',
negatable: true,
defaultsTo: false,
defaultsTo: true,
help: 'Generate a project using the AndroidX support libraries',
);
// Deprecated
@ -398,7 +398,7 @@ class CreateCommand extends FlutterCommand {
final String relativeDirPath = fs.path.relative(projectDirPath);
if (!projectDir.existsSync() || projectDir.listSync().isEmpty) {
printStatus('Creating project $relativeDirPath...');
printStatus('Creating project $relativeDirPath... androidx: ${argResults['androidx']}');
} else {
if (sampleCode != null && !argResults['overwrite']) {
throwToolExit('Will not overwrite existing project in $relativeDirPath: '

14
packages/flutter_tools/test/general.shard/commands/create_test.dart
View File

@ -417,7 +417,7 @@ void main() {
}, timeout: allowForRemotePubInvocation);
testUsingContext('androidx app project', () async {
testUsingContext('androidx is used by default in an app project', () async {
Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
@ -425,7 +425,7 @@ void main() {
final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command);
await runner.run(<String>['create', '--no-pub', '--androidx', projectDir.path]);
await runner.run(<String>['create', '--no-pub', projectDir.path]);
void expectExists(String relPath) {
expect(fs.isFileSync('${projectDir.path}/$relPath'), true);
@ -459,7 +459,7 @@ void main() {
expect(actualContents.contains('useAndroidX'), false);
}, timeout: allowForCreateFlutterProject);
testUsingContext('androidx app module', () async {
testUsingContext('androidx is used by default in a module project', () async {
Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
@ -467,7 +467,7 @@ void main() {
final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command);
await runner.run(<String>['create', '--template=module', '--no-pub', '--androidx', projectDir.path]);
await runner.run(<String>['create', '--template=module', '--no-pub', projectDir.path]);
final FlutterProject project = FlutterProject.fromDirectory(projectDir);
expect(
@ -476,7 +476,7 @@ void main() {
);
}, timeout: allowForCreateFlutterProject);
testUsingContext('non androidx app module', () async {
testUsingContext('non androidx module', () async {
Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
@ -493,7 +493,7 @@ void main() {
);
}, timeout: allowForCreateFlutterProject);
testUsingContext('androidx plugin project', () async {
testUsingContext('androidx is used by default in a plugin project', () async {
Cache.flutterRoot = '../..';
when(mockFlutterVersion.frameworkRevision).thenReturn(frameworkRevision);
when(mockFlutterVersion.channel).thenReturn(frameworkChannel);
@ -501,7 +501,7 @@ void main() {
final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command);
await runner.run(<String>['create', '--no-pub', '--template=plugin', '--androidx', projectDir.path]);
await runner.run(<String>['create', '--no-pub', '--template=plugin', projectDir.path]);
void expectExists(String relPath) {
expect(fs.isFileSync('${projectDir.path}/$relPath'), true);