Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
61c6c292
Unverified
Commit
61c6c292
authored
Sep 25, 2019
by
Emmanuel Garcia
Committed by
GitHub
Sep 25, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate examples and tests to AndroidX (#41251)
parent
cc3ca9a9
Changes
61
Hide whitespace changes
Inline
Side-by-side
Showing
61 changed files
with
160 additions
and
112 deletions
+160
-112
build.gradle
dev/benchmarks/complex_layout/android/app/build.gradle
+3
-3
gradle.properties
dev/benchmarks/complex_layout/android/gradle.properties
+2
-0
build.gradle
dev/benchmarks/macrobenchmarks/android/app/build.gradle
+3
-3
gradle.properties
dev/benchmarks/macrobenchmarks/android/gradle.properties
+2
-0
build.gradle
dev/benchmarks/microbenchmarks/android/app/build.gradle
+3
-3
gradle.properties
dev/benchmarks/microbenchmarks/android/gradle.properties
+2
-0
gradle.properties
dev/integration_tests/android_host_app/gradle.properties
+0
-1
build.gradle
..._tests/android_semantics_testing/android/app/build.gradle
+3
-3
gradle.properties
...tests/android_semantics_testing/android/gradle.properties
+2
-0
build.gradle
...reens/splash_screen_kitchen_sink/android/app/build.gradle
+3
-3
build.gradle
...creens/splash_screen_load_rotate/android/app/build.gradle
+3
-3
build.gradle
...reens/splash_screen_trans_rotate/android/app/build.gradle
+3
-3
build.gradle
dev/integration_tests/android_views/android/app/build.gradle
+3
-3
gradle.properties
...integration_tests/android_views/android/gradle.properties
+2
-0
build.gradle
dev/integration_tests/channels/android/app/build.gradle
+3
-3
gradle.properties
dev/integration_tests/channels/android/gradle.properties
+2
-0
build.gradle
dev/integration_tests/codegen/android/app/build.gradle
+3
-3
gradle.properties
dev/integration_tests/codegen/android/gradle.properties
+2
-0
build.gradle
dev/integration_tests/external_ui/android/app/build.gradle
+3
-3
gradle.properties
dev/integration_tests/external_ui/android/gradle.properties
+2
-0
build.gradle
dev/integration_tests/flavors/android/app/build.gradle
+3
-3
gradle.properties
dev/integration_tests/flavors/android/gradle.properties
+2
-0
build.gradle
...egration_tests/image_loading/android/app/bin/build.gradle
+3
-3
build.gradle
dev/integration_tests/image_loading/android/app/build.gradle
+3
-3
gradle.properties
...integration_tests/image_loading/android/gradle.properties
+2
-0
gradle.properties
...ion_tests/module_host_with_custom_build/gradle.properties
+0
-1
build.gradle
...integration_tests/named_isolates/android/app/build.gradle
+5
-5
MainActivity.java
...roid/app/src/main/java/com/example/view/MainActivity.java
+2
-3
gradle.properties
...ntegration_tests/named_isolates/android/gradle.properties
+2
-0
build.gradle
...ation_tests/platform_interaction/android/app/build.gradle
+3
-3
gradle.properties
...tion_tests/platform_interaction/android/gradle.properties
+2
-0
build.gradle
...gration_tests/release_smoke_test/android/app/build.gradle
+3
-3
gradle.properties
...ration_tests/release_smoke_test/android/gradle.properties
+2
-0
build.gradle
dev/integration_tests/ui/android/app/build.gradle
+3
-3
gradle.properties
dev/integration_tests/ui/android/gradle.properties
+2
-0
build.gradle
dev/manual_tests/android/app/build.gradle
+3
-3
gradle.properties
dev/manual_tests/android/gradle.properties
+3
-0
build.gradle
examples/catalog/android/app/build.gradle
+3
-3
gradle.properties
examples/catalog/android/gradle.properties
+2
-0
build.gradle
examples/flutter_gallery/android/app/build.gradle
+4
-4
gradle.properties
examples/flutter_gallery/android/gradle.properties
+2
-0
build.gradle
examples/flutter_view/android/app/build.gradle
+5
-5
MainActivity.java
...roid/app/src/main/java/com/example/view/MainActivity.java
+3
-3
flutter_view_layout.xml
...w/android/app/src/main/res/layout/flutter_view_layout.xml
+3
-3
gradle.properties
examples/flutter_view/android/gradle.properties
+2
-0
build.gradle
examples/hello_world/android/app/build.gradle
+3
-3
gradle.properties
examples/hello_world/android/gradle.properties
+2
-0
build.gradle
examples/image_list/android/app/build.gradle
+3
-3
gradle.properties
examples/image_list/android/gradle.properties
+2
-0
build.gradle
examples/layers/android/app/build.gradle
+3
-3
gradle.properties
examples/layers/android/gradle.properties
+2
-0
build.gradle
examples/platform_channel/android/app/build.gradle
+3
-3
gradle.properties
examples/platform_channel/android/gradle.properties
+2
-0
build.gradle
examples/platform_channel_swift/android/app/build.gradle
+3
-3
gradle.properties
examples/platform_channel_swift/android/gradle.properties
+3
-1
build.gradle
examples/platform_view/android/app/build.gradle
+4
-4
CountActivity.java
...java/io/flutter/examples/platform_view/CountActivity.java
+3
-3
android_full_screen_layout.xml
...id/app/src/main/res/layout/android_full_screen_layout.xml
+4
-4
gradle.properties
examples/platform_view/android/gradle.properties
+2
-0
build.gradle
examples/stocks/android/app/build.gradle
+3
-3
gradle.properties
examples/stocks/android/gradle.properties
+2
-0
No files found.
dev/benchmarks/complex_layout/android/app/build.gradle
View file @
61c6c292
...
...
@@ -26,7 +26,7 @@ android {
targetSdkVersion
28
versionCode
1
versionName
"0.0.1"
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
@@ -52,6 +52,6 @@ flutter {
dependencies
{
testImplementation
'junit:junit:4.12'
androidTestImplementation
'
com.android.support.test:runner:1.0.2
'
androidTestImplementation
'
com.android.support.test.espresso:espresso-core:3.0.2
'
androidTestImplementation
'
androidx.test:runner:1.1.1
'
androidTestImplementation
'
androidx.test.espresso:espresso-core:3.1.1
'
}
dev/benchmarks/complex_layout/android/gradle.properties
View file @
61c6c292
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableR8
=
true
dev/benchmarks/macrobenchmarks/android/app/build.gradle
View file @
61c6c292
...
...
@@ -37,7 +37,7 @@ android {
targetSdkVersion
28
versionCode
flutterVersionCode
.
toInteger
()
versionName
flutterVersionName
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
@@ -54,6 +54,6 @@ flutter {
dependencies
{
testImplementation
'junit:junit:4.12'
androidTestImplementation
'
com.android.support.test:runner:1.0.2
'
androidTestImplementation
'
com.android.support.test.espresso:espresso-core:3.0.2
'
androidTestImplementation
'
androidx.test:runner:1.1.1
'
androidTestImplementation
'
androidx.test.espresso:espresso-core:3.1.1
'
}
dev/benchmarks/macrobenchmarks/android/gradle.properties
View file @
61c6c292
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableR8
=
true
dev/benchmarks/microbenchmarks/android/app/build.gradle
View file @
61c6c292
...
...
@@ -26,7 +26,7 @@ android {
targetSdkVersion
28
versionCode
1
versionName
"0.0.1"
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
@@ -44,6 +44,6 @@ flutter {
dependencies
{
testImplementation
'junit:junit:4.12'
androidTestImplementation
'
com.android.support.test:runner:1.0.2
'
androidTestImplementation
'
com.android.support.test.espresso:espresso-core:3.0.2
'
androidTestImplementation
'
androidx.test:runner:1.1.1
'
androidTestImplementation
'
androidx.test.espresso:espresso-core:3.1.1
'
}
dev/benchmarks/microbenchmarks/android/gradle.properties
View file @
61c6c292
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableR8
=
true
dev/integration_tests/android_host_app/gradle.properties
View file @
61c6c292
org.gradle.jvmargs
=
-Xmx1536m
android.useAndroidX
=
true
android.enableJetifier
=
true
dev/integration_tests/android_semantics_testing/android/app/build.gradle
View file @
61c6c292
...
...
@@ -26,7 +26,7 @@ android {
targetSdkVersion
28
versionCode
1
versionName
"0.0.1"
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
@@ -52,6 +52,6 @@ flutter {
dependencies
{
testImplementation
'junit:junit:4.12'
androidTestImplementation
'
com.android.support.test:runner:1.0.2
'
androidTestImplementation
'
com.android.support.test.espresso:espresso-core:3.0.2
'
androidTestImplementation
'
androidx.test:runner:1.1.1
'
androidTestImplementation
'
androidx.test.espresso:espresso-core:3.1.1
'
}
dev/integration_tests/android_semantics_testing/android/gradle.properties
View file @
61c6c292
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableR8
=
true
dev/integration_tests/android_splash_screens/splash_screen_kitchen_sink/android/app/build.gradle
View file @
61c6c292
...
...
@@ -38,7 +38,7 @@ android {
targetSdkVersion
28
versionCode
flutterVersionCode
.
toInteger
()
versionName
flutterVersionName
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
@@ -60,6 +60,6 @@ dependencies {
implementation
'androidx.lifecycle:lifecycle-common-java8:2.2.0-alpha01'
testImplementation
'junit:junit:4.12'
androidTestImplementation
'
com.android.support.test:runner:1.0.2
'
androidTestImplementation
'
com.android.support.test.espresso:espresso-core:3.0.2
'
androidTestImplementation
'
androidx.test:runner:1.1.1
'
androidTestImplementation
'
androidx.test.espresso:espresso-core:3.1.1
'
}
dev/integration_tests/android_splash_screens/splash_screen_load_rotate/android/app/build.gradle
View file @
61c6c292
...
...
@@ -38,7 +38,7 @@ android {
targetSdkVersion
28
versionCode
flutterVersionCode
.
toInteger
()
versionName
flutterVersionName
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
@@ -60,6 +60,6 @@ dependencies {
implementation
'androidx.lifecycle:lifecycle-common-java8:2.2.0-alpha01'
testImplementation
'junit:junit:4.12'
androidTestImplementation
'
com.android.support.test:runner:1.0.2
'
androidTestImplementation
'
com.android.support.test.espresso:espresso-core:3.0.2
'
androidTestImplementation
'
androidx.test:runner:1.1.1
'
androidTestImplementation
'
androidx.test.espresso:espresso-core:3.1.1
'
}
dev/integration_tests/android_splash_screens/splash_screen_trans_rotate/android/app/build.gradle
View file @
61c6c292
...
...
@@ -38,7 +38,7 @@ android {
targetSdkVersion
28
versionCode
flutterVersionCode
.
toInteger
()
versionName
flutterVersionName
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
@@ -60,6 +60,6 @@ dependencies {
implementation
'androidx.lifecycle:lifecycle-common-java8:2.2.0-alpha01'
testImplementation
'junit:junit:4.12'
androidTestImplementation
'
com.android.support.test:runner:1.0.2
'
androidTestImplementation
'
com.android.support.test.espresso:espresso-core:3.0.2
'
androidTestImplementation
'
androidx.test:runner:1.1.1
'
androidTestImplementation
'
androidx.test.espresso:espresso-core:3.1.1
'
}
dev/integration_tests/android_views/android/app/build.gradle
View file @
61c6c292
...
...
@@ -38,7 +38,7 @@ android {
targetSdkVersion
28
versionCode
flutterVersionCode
.
toInteger
()
versionName
flutterVersionName
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
@@ -56,6 +56,6 @@ flutter {
dependencies
{
testImplementation
'junit:junit:4.12'
androidTestImplementation
'
com.android.support.test:runner:1.0.2
'
androidTestImplementation
'
com.android.support.test.espresso:espresso-core:3.0.2
'
androidTestImplementation
'
androidx.test:runner:1.1.1
'
androidTestImplementation
'
androidx.test.espresso:espresso-core:3.1.1
'
}
dev/integration_tests/android_views/android/gradle.properties
View file @
61c6c292
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableR8
=
true
dev/integration_tests/channels/android/app/build.gradle
View file @
61c6c292
...
...
@@ -26,7 +26,7 @@ android {
targetSdkVersion
28
versionCode
1
versionName
"0.0.1"
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
@@ -52,6 +52,6 @@ flutter {
dependencies
{
testImplementation
'junit:junit:4.12'
androidTestImplementation
'
com.android.support.test:runner:1.0.2
'
androidTestImplementation
'
com.android.support.test.espresso:espresso-core:3.0.2
'
androidTestImplementation
'
androidx.test:runner:1.1.1
'
androidTestImplementation
'
androidx.test.espresso:espresso-core:3.1.1
'
}
dev/integration_tests/channels/android/gradle.properties
View file @
61c6c292
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableR8
=
true
dev/integration_tests/codegen/android/app/build.gradle
View file @
61c6c292
...
...
@@ -26,7 +26,7 @@ android {
targetSdkVersion
28
versionCode
1
versionName
"0.0.1"
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
@@ -52,6 +52,6 @@ flutter {
dependencies
{
testImplementation
'junit:junit:4.12'
androidTestImplementation
'
com.android.support.test:runner:1.0.2
'
androidTestImplementation
'
com.android.support.test.espresso:espresso-core:3.0.2
'
androidTestImplementation
'
androidx.test:runner:1.1.1
'
androidTestImplementation
'
androidx.test.espresso:espresso-core:3.1.1
'
}
dev/integration_tests/codegen/android/gradle.properties
View file @
61c6c292
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableR8
=
true
dev/integration_tests/external_ui/android/app/build.gradle
View file @
61c6c292
...
...
@@ -27,7 +27,7 @@ android {
targetSdkVersion
28
versionCode
1
versionName
"1.0"
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
@@ -43,6 +43,6 @@ flutter {
dependencies
{
testImplementation
'junit:junit:4.12'
androidTestImplementation
'
com.android.support.test:runner:1.0.2
'
androidTestImplementation
'
com.android.support.test.espresso:espresso-core:3.0.2
'
androidTestImplementation
'
androidx.test:runner:1.1.1
'
androidTestImplementation
'
androidx.test.espresso:espresso-core:3.1.1
'
}
dev/integration_tests/external_ui/android/gradle.properties
View file @
61c6c292
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableR8
=
true
dev/integration_tests/flavors/android/app/build.gradle
View file @
61c6c292
...
...
@@ -27,7 +27,7 @@ android {
targetSdkVersion
28
versionCode
1
versionName
"1.0"
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
@@ -58,6 +58,6 @@ flutter {
dependencies
{
testImplementation
'junit:junit:4.12'
androidTestImplementation
'
com.android.support.test:runner:1.0.2
'
androidTestImplementation
'
com.android.support.test.espresso:espresso-core:3.0.2
'
androidTestImplementation
'
androidx.test:runner:1.1.1
'
androidTestImplementation
'
androidx.test.espresso:espresso-core:3.1.1
'
}
dev/integration_tests/flavors/android/gradle.properties
View file @
61c6c292
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableR8
=
true
dev/integration_tests/image_loading/android/app/bin/build.gradle
View file @
61c6c292
...
...
@@ -26,7 +26,7 @@ android {
targetSdkVersion
28
versionCode
1
versionName
"0.0.1"
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
@@ -52,6 +52,6 @@ flutter {
dependencies
{
testImplementation
'junit:junit:4.12'
androidTestImplementation
'
com.android.support.test:runner:1.0.2
'
androidTestImplementation
'
com.android.support.test.espresso:espresso-core:3.0.2
'
androidTestImplementation
'
androidx.test:runner:1.1.1
'
androidTestImplementation
'
androidx.test.espresso:espresso-core:3.1.1
'
}
dev/integration_tests/image_loading/android/app/build.gradle
View file @
61c6c292
...
...
@@ -26,7 +26,7 @@ android {
targetSdkVersion
28
versionCode
1
versionName
"0.0.1"
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
@@ -52,6 +52,6 @@ flutter {
dependencies
{
testImplementation
'junit:junit:4.12'
androidTestImplementation
'
com.android.support.test:runner:1.0.2
'
androidTestImplementation
'
com.android.support.test.espresso:espresso-core:3.0.2
'
androidTestImplementation
'
androidx.test:runner:1.1.1
'
androidTestImplementation
'
androidx.test.espresso:espresso-core:3.1.1
'
}
dev/integration_tests/image_loading/android/gradle.properties
View file @
61c6c292
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableR8
=
true
dev/integration_tests/module_host_with_custom_build/gradle.properties
View file @
61c6c292
org.gradle.jvmargs
=
-Xmx1536m
android.useAndroidX
=
true
android.enableJetifier
=
true
dev/integration_tests/named_isolates/android/app/build.gradle
View file @
61c6c292
...
...
@@ -27,7 +27,7 @@ android {
targetSdkVersion
28
versionCode
1
versionName
"0.0.1"
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
@@ -44,9 +44,9 @@ flutter {
}
dependencies
{
implementation
'androidx.appcompat:appcompat:1.1.0'
implementation
'com.google.android.material:material:1.0.0'
testImplementation
'junit:junit:4.12'
androidTestImplementation
'com.android.support.test:runner:1.0.2'
androidTestImplementation
'com.android.support.test.espresso:espresso-core:3.0.2'
implementation
'com.android.support:appcompat-v7:27.1.1'
implementation
'com.android.support:design:27.1.1'
androidTestImplementation
'androidx.test:runner:1.1.1'
androidTestImplementation
'androidx.test.espresso:espresso-core:3.1.1'
}
dev/integration_tests/named_isolates/android/app/src/main/java/com/example/view/MainActivity.java
View file @
61c6c292
...
...
@@ -2,11 +2,10 @@ package com.example.view;
import
android.content.Intent
;
import
android.os.Bundle
;
import
android.support.design.widget.FloatingActionButton
;
import
android.support.v7.app.ActionBar
;
import
android.support.v7.app.AppCompatActivity
;
import
android.view.View
;
import
android.widget.TextView
;
import
androidx.appcompat.app.ActionBar
;
import
androidx.appcompat.app.AppCompatActivity
;
import
io.flutter.plugin.common.BasicMessageChannel
;
import
io.flutter.plugin.common.BasicMessageChannel.MessageHandler
;
import
io.flutter.plugin.common.BasicMessageChannel.Reply
;
...
...
dev/integration_tests/named_isolates/android/gradle.properties
View file @
61c6c292
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableR8
=
true
dev/integration_tests/platform_interaction/android/app/build.gradle
View file @
61c6c292
...
...
@@ -26,7 +26,7 @@ android {
targetSdkVersion
28
versionCode
1
versionName
"0.0.1"
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
@@ -52,6 +52,6 @@ flutter {
dependencies
{
testImplementation
'junit:junit:4.12'
androidTestImplementation
'
com.android.support.test:runner:1.0.2
'
androidTestImplementation
'
com.android.support.test.espresso:espresso-core:3.0.2
'
androidTestImplementation
'
androidx.test:runner:1.1.1
'
androidTestImplementation
'
androidx.test.espresso:espresso-core:3.1.1
'
}
dev/integration_tests/platform_interaction/android/gradle.properties
View file @
61c6c292
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableR8
=
true
dev/integration_tests/release_smoke_test/android/app/build.gradle
View file @
61c6c292
...
...
@@ -38,7 +38,7 @@ android {
targetSdkVersion
28
versionCode
flutterVersionCode
.
toInteger
()
versionName
flutterVersionName
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
@@ -56,6 +56,6 @@ flutter {
dependencies
{
testImplementation
'junit:junit:4.12'
androidTestImplementation
'
com.android.support.test:runner:1.0.2
'
androidTestImplementation
'
com.android.support.test.espresso:espresso-core:3.0.2
'
androidTestImplementation
'
androidx.test:runner:1.1.1
'
androidTestImplementation
'
androidx.test.espresso:espresso-core:3.1.1
'
}
dev/integration_tests/release_smoke_test/android/gradle.properties
View file @
61c6c292
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableR8
=
true
dev/integration_tests/ui/android/app/build.gradle
View file @
61c6c292
...
...
@@ -26,7 +26,7 @@ android {
targetSdkVersion
28
versionCode
1
versionName
"1.0"
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
@@ -44,6 +44,6 @@ flutter {
dependencies
{
testImplementation
'junit:junit:4.12'
androidTestImplementation
'
com.android.support.test:runner:1.0.2
'
androidTestImplementation
'
com.android.support.test.espresso:espresso-core:3.0.2
'
androidTestImplementation
'
androidx.test:runner:1.1.1
'
androidTestImplementation
'
androidx.test.espresso:espresso-core:3.1.1
'
}
dev/integration_tests/ui/android/gradle.properties
View file @
61c6c292
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableR8
=
true
dev/manual_tests/android/app/build.gradle
View file @
61c6c292
...
...
@@ -22,7 +22,7 @@ android {
}
defaultConfig
{
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
applicationId
"io.flutter.examples.manual_tests"
minSdkVersion
16
targetSdkVersion
28
...
...
@@ -45,6 +45,6 @@ flutter {
dependencies
{
testImplementation
'junit:junit:4.12'
androidTestImplementation
'
com.android.support.test:runner:1.0.2
'
androidTestImplementation
'
com.android.support.test.espresso:espresso-core:3.0.2
'
androidTestImplementation
'
androidx.test:runner:1.1.1
'
androidTestImplementation
'
androidx.test.espresso:espresso-core:3.1.1
'
}
dev/manual_tests/android/gradle.properties
View file @
61c6c292
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableR8
=
true
examples/catalog/android/app/build.gradle
View file @
61c6c292
...
...
@@ -37,7 +37,7 @@ android {
targetSdkVersion
28
versionCode
flutterVersionCode
.
toInteger
()
versionName
flutterVersionName
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
@@ -55,6 +55,6 @@ flutter {
dependencies
{
testImplementation
'junit:junit:4.12'
androidTestImplementation
'
com.android.support.test:runner:1.0.2
'
androidTestImplementation
'
com.android.support.test.espresso:espresso-core:3.0.2
'
androidTestImplementation
'
androidx.test:runner:1.1.1
'
androidTestImplementation
'
androidx.test.espresso:espresso-core:3.1.1
'
}
examples/catalog/android/gradle.properties
View file @
61c6c292
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableR8
=
true
examples/flutter_gallery/android/app/build.gradle
View file @
61c6c292
...
...
@@ -48,7 +48,7 @@ android {
targetSdkVersion
28
versionCode
flutterVersionCode
.
toInteger
()
versionName
flutterVersionName
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
@@ -74,7 +74,7 @@ flutter {
dependencies
{
testImplementation
'junit:junit:4.12'
androidTestImplementation
'
com.android.support.test:rules:1.0
.1'
androidTestImplementation
'
com.android.support.test:runner:1.0
.1'
androidTestImplementation
'
com.android.support.test.espresso:espresso-core:3.0
.1'
androidTestImplementation
'
androidx.test:rules:1.1
.1'
androidTestImplementation
'
androidx.test:runner:1.1
.1'
androidTestImplementation
'
androidx.test.espresso:espresso-core:3.1
.1'
}
examples/flutter_gallery/android/gradle.properties
View file @
61c6c292
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableR8
=
true
examples/flutter_view/android/app/build.gradle
View file @
61c6c292
...
...
@@ -37,7 +37,7 @@ android {
targetSdkVersion
28
versionCode
flutterVersionCode
.
toInteger
()
versionName
flutterVersionName
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
@@ -54,9 +54,9 @@ flutter {
}
dependencies
{
implementation
'androidx.appcompat:appcompat:1.1.0'
implementation
'com.google.android.material:material:1.0.0'
testImplementation
'junit:junit:4.12'
androidTestImplementation
'com.android.support.test:runner:1.0.2'
androidTestImplementation
'com.android.support.test.espresso:espresso-core:3.0.2'
implementation
'com.android.support:appcompat-v7:27.1.1'
implementation
'com.android.support:design:27.1.1'
androidTestImplementation
'androidx.test:runner:1.1.1'
androidTestImplementation
'androidx.test.espresso:espresso-core:3.1.1'
}
examples/flutter_view/android/app/src/main/java/com/example/view/MainActivity.java
View file @
61c6c292
...
...
@@ -2,11 +2,11 @@ package com.example.view;
import
android.content.Intent
;
import
android.os.Bundle
;
import
android.support.design.widget.FloatingActionButton
;
import
android.support.v7.app.ActionBar
;
import
android.support.v7.app.AppCompatActivity
;
import
android.view.View
;
import
android.widget.TextView
;
import
androidx.appcompat.app.ActionBar
;
import
androidx.appcompat.app.AppCompatActivity
;
import
com.google.android.material.floatingactionbutton.FloatingActionButton
;
import
io.flutter.plugin.common.BasicMessageChannel
;
import
io.flutter.plugin.common.BasicMessageChannel.MessageHandler
;
import
io.flutter.plugin.common.BasicMessageChannel.Reply
;
...
...
examples/flutter_view/android/app/src/main/res/layout/flutter_view_layout.xml
View file @
61c6c292
...
...
@@ -13,7 +13,7 @@
android:layout_weight=
"1"
/>
<android
.support.design
.widget.CoordinatorLayout
<android
x.coordinatorlayout
.widget.CoordinatorLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_weight=
"1"
...
...
@@ -47,7 +47,7 @@
</LinearLayout>
<
android.support.design.widget
.FloatingActionButton
<
com.google.android.material.floatingactionbutton
.FloatingActionButton
android:id=
"@+id/button"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -62,6 +62,6 @@
app:backgroundTint=
"@color/white"
/>
</android
.support.design
.widget.CoordinatorLayout>
</android
x.coordinatorlayout
.widget.CoordinatorLayout>
</LinearLayout>
examples/flutter_view/android/gradle.properties
View file @
61c6c292
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableR8
=
true
examples/hello_world/android/app/build.gradle
View file @
61c6c292
...
...
@@ -37,7 +37,7 @@ android {
targetSdkVersion
28
versionCode
flutterVersionCode
.
toInteger
()
versionName
flutterVersionName
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
@@ -55,6 +55,6 @@ flutter {
dependencies
{
testImplementation
'junit:junit:4.12'
androidTestImplementation
'
com.android.support.test:runner:1.0.2
'
androidTestImplementation
'
com.android.support.test.espresso:espresso-core:3.0.2
'
androidTestImplementation
'
androidx.test:runner:1.1.1
'
androidTestImplementation
'
androidx.test.espresso:espresso-core:3.1.1
'
}
examples/hello_world/android/gradle.properties
View file @
61c6c292
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableR8
=
true
examples/image_list/android/app/build.gradle
View file @
61c6c292
...
...
@@ -38,7 +38,7 @@ android {
targetSdkVersion
28
versionCode
flutterVersionCode
.
toInteger
()
versionName
flutterVersionName
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
@@ -56,6 +56,6 @@ flutter {
dependencies
{
testImplementation
'junit:junit:4.12'
androidTestImplementation
'
com.android.support.test:runner:1.0.2
'
androidTestImplementation
'
com.android.support.test.espresso:espresso-core:3.0.2
'
androidTestImplementation
'
androidx.test:runner:1.1.1
'
androidTestImplementation
'
androidx.test.espresso:espresso-core:3.1.1
'
}
examples/image_list/android/gradle.properties
View file @
61c6c292
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableR8
=
true
examples/layers/android/app/build.gradle
View file @
61c6c292
...
...
@@ -37,7 +37,7 @@ android {
targetSdkVersion
28
versionCode
flutterVersionCode
.
toInteger
()
versionName
flutterVersionName
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
@@ -55,6 +55,6 @@ flutter {
dependencies
{
testImplementation
'junit:junit:4.12'
androidTestImplementation
'
com.android.support.test:runner:1.0.2
'
androidTestImplementation
'
com.android.support.test.espresso:espresso-core:3.0.2
'
androidTestImplementation
'
androidx.test:runner:1.1.1
'
androidTestImplementation
'
androidx.test.espresso:espresso-core:3.1.1
'
}
examples/layers/android/gradle.properties
View file @
61c6c292
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableR8
=
true
examples/platform_channel/android/app/build.gradle
View file @
61c6c292
...
...
@@ -37,7 +37,7 @@ android {
targetSdkVersion
28
versionCode
flutterVersionCode
.
toInteger
()
versionName
flutterVersionName
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
@@ -55,6 +55,6 @@ flutter {
dependencies
{
testImplementation
'junit:junit:4.12'
androidTestImplementation
'
com.android.support.test:runner:1.0.2
'
androidTestImplementation
'
com.android.support.test.espresso:espresso-core:3.0.2
'
androidTestImplementation
'
androidx.test:runner:1.1.1
'
androidTestImplementation
'
androidx.test.espresso:espresso-core:3.1.1
'
}
examples/platform_channel/android/gradle.properties
View file @
61c6c292
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableR8
=
true
examples/platform_channel_swift/android/app/build.gradle
View file @
61c6c292
...
...
@@ -37,7 +37,7 @@ android {
targetSdkVersion
28
versionCode
flutterVersionCode
.
toInteger
()
versionName
flutterVersionName
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
@@ -55,6 +55,6 @@ flutter {
dependencies
{
testImplementation
'junit:junit:4.12'
androidTestImplementation
'
com.android.support.test:runner:1.0.2
'
androidTestImplementation
'
com.android.support.test.espresso:espresso-core:3.0.2
'
androidTestImplementation
'
androidx.test:runner:1.1.1
'
androidTestImplementation
'
androidx.test.espresso:espresso-core:3.1.1
'
}
examples/platform_channel_swift/android/gradle.properties
View file @
61c6c292
org.gradle.jvmargs
=
-Xmx1536M
android.enableR8
=
true
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableR8
=
true
\ No newline at end of file
examples/platform_view/android/app/build.gradle
View file @
61c6c292
...
...
@@ -54,9 +54,9 @@ flutter {
}
dependencies
{
implementation
'androidx.appcompat:appcompat:1.1.0'
implementation
'com.google.android.material:material:1.0.0'
testImplementation
'junit:junit:4.12'
androidTestImplementation
'com.android.support.test:runner:1.0.2'
androidTestImplementation
'com.android.support.test.espresso:espresso-core:3.0.2'
implementation
'com.android.support:appcompat-v7:28.0.0'
implementation
'com.android.support:design:28.0.0'
androidTestImplementation
'androidx.test:runner:1.1.1'
androidTestImplementation
'androidx.test.espresso:espresso-core:3.1.1'
}
examples/platform_view/android/app/src/main/java/io/flutter/examples/platform_view/CountActivity.java
View file @
61c6c292
...
...
@@ -7,12 +7,12 @@ package io.flutter.examples.platform_view;
import
android.app.Activity
;
import
android.content.Intent
;
import
android.os.Bundle
;
import
android.support.design.widget.FloatingActionButton
;
import
android.support.v7.app.AppCompatActivity
;
import
android.support.v7.widget.Toolbar
;
import
android.view.View
;
import
android.widget.Button
;
import
android.widget.TextView
;
import
androidx.appcompat.app.AppCompatActivity
;
import
androidx.appcompat.widget.Toolbar
;
import
com.google.android.material.floatingactionbutton.FloatingActionButton
;
public
class
CountActivity
extends
AppCompatActivity
{
public
static
final
String
EXTRA_COUNTER
=
"counter"
;
...
...
examples/platform_view/android/app/src/main/res/layout/android_full_screen_layout.xml
View file @
61c6c292
...
...
@@ -6,7 +6,7 @@
android:orientation=
"vertical"
android:theme=
"@style/Theme.AppCompat"
>
<android
.support.v7
.widget.Toolbar
<android
x.appcompat
.widget.Toolbar
android:id=
"@+id/my_toolbar"
android:layout_width=
"match_parent"
android:layout_height=
"?attr/actionBarSize"
...
...
@@ -15,7 +15,7 @@
android:theme=
"@style/ThemeOverlay.AppCompat.ActionBar"
app:popupTheme=
"@style/ThemeOverlay.AppCompat.Light"
/>
<android
.support.design
.widget.CoordinatorLayout
<android
x.coordinatorlayout
.widget.CoordinatorLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@color/grey"
>
...
...
@@ -60,7 +60,7 @@
</LinearLayout>
<
android.support.design.widget
.FloatingActionButton
<
com.google.android.material.floatingactionbutton
.FloatingActionButton
android:id=
"@+id/fab"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -74,7 +74,7 @@
app:pressedTranslationZ=
"@dimen/fab_elevation_pressed"
app:rippleColor=
"@color/grey"
/>
</android
.support.design
.widget.CoordinatorLayout>
</android
x.coordinatorlayout
.widget.CoordinatorLayout>
</LinearLayout>
\ No newline at end of file
examples/platform_view/android/gradle.properties
View file @
61c6c292
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableR8
=
true
examples/stocks/android/app/build.gradle
View file @
61c6c292
...
...
@@ -37,7 +37,7 @@ android {
targetSdkVersion
28
versionCode
flutterVersionCode
.
toInteger
()
versionName
flutterVersionName
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
@@ -55,6 +55,6 @@ flutter {
dependencies
{
testImplementation
'junit:junit:4.12'
androidTestImplementation
'
com.android.support.test:runner:1.0.2
'
androidTestImplementation
'
com.android.support.test.espresso:espresso-core:3.0.2
'
androidTestImplementation
'
androidx.test:runner:1.1.1
'
androidTestImplementation
'
androidx.test.espresso:espresso-core:3.1.1
'
}
examples/stocks/android/gradle.properties
View file @
61c6c292
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableR8
=
true
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment