Skip to content

Commit 2f0090e

Browse files
Sub6ResourcesSub6Resources
committed
Migrate example to androidx
1 parent d86fc77 commit 2f0090e

File tree

9 files changed

+186
-41
lines changed

9 files changed

+186
-41
lines changed

‎.idea/codeStyles/Project.xml

Lines changed: 109 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎example/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,6 @@
7070
!**/ios/**/default.pbxuser
7171
!**/ios/**/default.perspectivev3
7272
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
73+
74+
**/.flutter-plugins-dependencies
75+
**/ios/Flutter/flutter_export_environment.sh

‎example/android/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ android {
3838
targetSdkVersion 28
3939
versionCode flutterVersionCode.toInteger()
4040
versionName flutterVersionName
41-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
41+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4242
}
4343

4444
buildTypes {
@@ -56,6 +56,6 @@ flutter {
5656

5757
dependencies {
5858
testImplementation 'junit:junit:4.12'
59-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
60-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
59+
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
60+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
6161
}

‎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.2.1'
8+
classpath 'com.android.tools.build:gradle:3.5.3'
99
}
1010
}
1111

‎example/android/gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
org.gradle.jvmargs=-Xmx1536M
22

3+
android.enableR8=true
4+
android.useAndroidX=true
5+
android.enableJetifier=true

‎example/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Jun 23 08:50:38 CEST 2017
1+
#Thu Dec 12 15:22:42 MST 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

‎example/ios/Flutter/flutter_export_environment.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
# This is a generated file; do not edit or check into version control.
33
export "FLUTTER_ROOT=/Users/matthewwhitaker/Projects/FlutterDevelopment/flutter"
44
export "FLUTTER_APPLICATION_PATH=/Users/matthewwhitaker/Projects/Flutter_Projects/flutter_html/example"
5-
export "FLUTTER_TARGET=/Users/matthewwhitaker/Projects/Flutter_Projects/flutter_html/example/lib/main.dart"
5+
export "FLUTTER_TARGET=lib/main.dart"
66
export "FLUTTER_BUILD_DIR=build"
77
export "SYMROOT=${SOURCE_ROOT}/../build/ios"
88
export "FLUTTER_FRAMEWORK_DIR=/Users/matthewwhitaker/Projects/FlutterDevelopment/flutter/bin/cache/artifacts/engine/ios"
99
export "FLUTTER_BUILD_NAME=1.0.0"
1010
export "FLUTTER_BUILD_NUMBER=1"
11-
export "TRACK_WIDGET_CREATION=true"

‎example/pubspec.lock

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,27 @@
11
# Generated by pub
22
# See https://dart.dev/tools/pub/glossary#lockfile
33
packages:
4+
archive:
5+
dependency: transitive
6+
description:
7+
name: archive
8+
url: "https://pub.dartlang.org"
9+
source: hosted
10+
version: "2.0.11"
11+
args:
12+
dependency: transitive
13+
description:
14+
name: args
15+
url: "https://pub.dartlang.org"
16+
source: hosted
17+
version: "1.5.2"
418
async:
519
dependency: transitive
620
description:
721
name: async
822
url: "https://pub.dartlang.org"
923
source: hosted
10-
version: "2.3.0"
24+
version: "2.4.0"
1125
boolean_selector:
1226
dependency: transitive
1327
description:
@@ -50,6 +64,13 @@ packages:
5064
url: "https://pub.dartlang.org"
5165
source: hosted
5266
version: "2.1.1"
67+
crypto:
68+
dependency: transitive
69+
description:
70+
name: crypto
71+
url: "https://pub.dartlang.org"
72+
source: hosted
73+
version: "2.1.3"
5374
css_colors:
5475
dependency: transitive
5576
description:
@@ -102,20 +123,27 @@ packages:
102123
url: "https://pub.dartlang.org"
103124
source: hosted
104125
version: "0.14.0+2"
126+
image:
127+
dependency: transitive
128+
description:
129+
name: image
130+
url: "https://pub.dartlang.org"
131+
source: hosted
132+
version: "2.1.4"
105133
matcher:
106134
dependency: transitive
107135
description:
108136
name: matcher
109137
url: "https://pub.dartlang.org"
110138
source: hosted
111-
version: "0.12.5"
139+
version: "0.12.6"
112140
meta:
113141
dependency: transitive
114142
description:
115143
name: meta
116144
url: "https://pub.dartlang.org"
117145
source: hosted
118-
version: "1.1.7"
146+
version: "1.1.8"
119147
open_iconic_flutter:
120148
dependency: transitive
121149
description:
@@ -218,7 +246,7 @@ packages:
218246
name: test_api
219247
url: "https://pub.dartlang.org"
220248
source: hosted
221-
version: "0.2.5"
249+
version: "0.2.11"
222250
typed_data:
223251
dependency: transitive
224252
description:

‎pubspec.lock

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,27 @@
11
# Generated by pub
22
# See https://dart.dev/tools/pub/glossary#lockfile
33
packages:
4+
archive:
5+
dependency: transitive
6+
description:
7+
name: archive
8+
url: "https://pub.dartlang.org"
9+
source: hosted
10+
version: "2.0.11"
11+
args:
12+
dependency: transitive
13+
description:
14+
name: args
15+
url: "https://pub.dartlang.org"
16+
source: hosted
17+
version: "1.5.2"
418
async:
519
dependency: transitive
620
description:
721
name: async
822
url: "https://pub.dartlang.org"
923
source: hosted
10-
version: "2.3.0"
24+
version: "2.4.0"
1125
boolean_selector:
1226
dependency: transitive
1327
description:
@@ -50,6 +64,13 @@ packages:
5064
url: "https://pub.dartlang.org"
5165
source: hosted
5266
version: "2.1.1"
67+
crypto:
68+
dependency: transitive
69+
description:
70+
name: crypto
71+
url: "https://pub.dartlang.org"
72+
source: hosted
73+
version: "2.1.3"
5374
css_colors:
5475
dependency: "direct main"
5576
description:
@@ -88,20 +109,27 @@ packages:
88109
url: "https://pub.dartlang.org"
89110
source: hosted
90111
version: "0.14.0+2"
112+
image:
113+
dependency: transitive
114+
description:
115+
name: image
116+
url: "https://pub.dartlang.org"
117+
source: hosted
118+
version: "2.1.4"
91119
matcher:
92120
dependency: transitive
93121
description:
94122
name: matcher
95123
url: "https://pub.dartlang.org"
96124
source: hosted
97-
version: "0.12.5"
125+
version: "0.12.6"
98126
meta:
99127
dependency: transitive
100128
description:
101129
name: meta
102130
url: "https://pub.dartlang.org"
103131
source: hosted
104-
version: "1.1.7"
132+
version: "1.1.8"
105133
open_iconic_flutter:
106134
dependency: transitive
107135
description:
@@ -204,7 +232,7 @@ packages:
204232
name: test_api
205233
url: "https://pub.dartlang.org"
206234
source: hosted
207-
version: "0.2.5"
235+
version: "0.2.11"
208236
typed_data:
209237
dependency: transitive
210238
description:

0 commit comments

Comments
 (0)