Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit f71889a

Browse files
Merge pull request #15 from Baseflow/feature/sync_gradle_version
Synchonized gradle version with Flutter stable
2 parents 167b946 + a422cf2 commit f71889a

File tree

6 files changed

+74
-22
lines changed

6 files changed

+74
-22
lines changed

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

@@ -34,6 +34,6 @@ android {
3434
}
3535

3636
dependencies {
37-
api 'com.google.android.gms:play-services-location:16.0.0'
38-
implementation 'androidx.annotation:annotation:1.0.1'
37+
api 'com.google.android.gms:play-services-location:17.0.0'
38+
implementation 'androidx.annotation:annotation:1.1.0'
3939
}

‎example/android/app/build.gradle‎

Lines changed: 2 additions & 2 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 29
2929

3030
lintOptions {
3131
disable 'InvalidPackage'
@@ -35,7 +35,7 @@ android {
3535
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
3636
applicationId "com.baseflow.googleapiavailabilityexample"
3737
minSdkVersion 16
38-
targetSdkVersion 28
38+
targetSdkVersion 29
3939
versionCode flutterVersionCode.toInteger()
4040
versionName flutterVersionName
4141
}

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

‎example/android/gradle.properties‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
org.gradle.jvmargs=-Xmx1536M
1+
android.enableJetifier=true
2+
android.useAndroidX=true
3+
android.enableR8=true
4+
org.gradle.jvmargs=-Xmx1536M

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ 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.6.2-all.zip

‎example/pubspec.lock‎

Lines changed: 63 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,34 @@
11
# Generated by pub
2-
# See https://www.dartlang.org/tools/pub/glossary#lockfile
2+
# 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.0.8"
24+
version: "2.4.0"
1125
boolean_selector:
1226
dependency: transitive
1327
description:
1428
name: boolean_selector
1529
url: "https://pub.dartlang.org"
1630
source: hosted
17-
version: "1.0.4"
31+
version: "1.0.5"
1832
charcode:
1933
dependency: transitive
2034
description:
@@ -29,6 +43,20 @@ packages:
2943
url: "https://pub.dartlang.org"
3044
source: hosted
3145
version: "1.14.11"
46+
convert:
47+
dependency: transitive
48+
description:
49+
name: convert
50+
url: "https://pub.dartlang.org"
51+
source: hosted
52+
version: "2.1.1"
53+
crypto:
54+
dependency: transitive
55+
description:
56+
name: crypto
57+
url: "https://pub.dartlang.org"
58+
source: hosted
59+
version: "2.1.3"
3260
cupertino_icons:
3361
dependency: "direct main"
3462
description:
@@ -52,42 +80,56 @@ packages:
5280
path: ".."
5381
relative: true
5482
source: path
55-
version: "2.0.0"
83+
version: "2.0.1"
84+
image:
85+
dependency: transitive
86+
description:
87+
name: image
88+
url: "https://pub.dartlang.org"
89+
source: hosted
90+
version: "2.1.4"
5691
matcher:
5792
dependency: transitive
5893
description:
5994
name: matcher
6095
url: "https://pub.dartlang.org"
6196
source: hosted
62-
version: "0.12.3+1"
97+
version: "0.12.6"
6398
meta:
6499
dependency: transitive
65100
description:
66101
name: meta
67102
url: "https://pub.dartlang.org"
68103
source: hosted
69-
version: "1.1.6"
104+
version: "1.1.8"
70105
path:
71106
dependency: transitive
72107
description:
73108
name: path
74109
url: "https://pub.dartlang.org"
75110
source: hosted
76-
version: "1.6.2"
111+
version: "1.6.4"
77112
pedantic:
78113
dependency: transitive
79114
description:
80115
name: pedantic
81116
url: "https://pub.dartlang.org"
82117
source: hosted
83-
version: "1.4.0"
118+
version: "1.8.0+1"
119+
petitparser:
120+
dependency: transitive
121+
description:
122+
name: petitparser
123+
url: "https://pub.dartlang.org"
124+
source: hosted
125+
version: "2.4.0"
84126
quiver:
85127
dependency: transitive
86128
description:
87129
name: quiver
88130
url: "https://pub.dartlang.org"
89131
source: hosted
90-
version: "2.0.1"
132+
version: "2.0.5"
91133
sky_engine:
92134
dependency: transitive
93135
description: flutter
@@ -99,7 +141,7 @@ packages:
99141
name: source_span
100142
url: "https://pub.dartlang.org"
101143
source: hosted
102-
version: "1.5.4"
144+
version: "1.5.5"
103145
stack_trace:
104146
dependency: transitive
105147
description:
@@ -113,14 +155,14 @@ packages:
113155
name: stream_channel
114156
url: "https://pub.dartlang.org"
115157
source: hosted
116-
version: "1.6.8"
158+
version: "2.0.0"
117159
string_scanner:
118160
dependency: transitive
119161
description:
120162
name: string_scanner
121163
url: "https://pub.dartlang.org"
122164
source: hosted
123-
version: "1.0.4"
165+
version: "1.0.5"
124166
term_glyph:
125167
dependency: transitive
126168
description:
@@ -134,7 +176,7 @@ packages:
134176
name: test_api
135177
url: "https://pub.dartlang.org"
136178
source: hosted
137-
version: "0.2.2"
179+
version: "0.2.11"
138180
typed_data:
139181
dependency: transitive
140182
description:
@@ -149,5 +191,12 @@ packages:
149191
url: "https://pub.dartlang.org"
150192
source: hosted
151193
version: "2.0.8"
194+
xml:
195+
dependency: transitive
196+
description:
197+
name: xml
198+
url: "https://pub.dartlang.org"
199+
source: hosted
200+
version: "3.5.0"
152201
sdks:
153-
dart: ">=2.1.0 <3.0.0"
202+
dart: ">=2.4.0 <3.0.0"

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /