Skip to content

Commit b9a7bef

Browse files
mitchrossmitchross
committed
Make Android Build Again
1 parent c2279b6 commit b9a7bef

File tree

8 files changed

+317
-8
lines changed

8 files changed

+317
-8
lines changed

‎.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,7 @@
6767
!**/ios/**/default.mode2v3
6868
!**/ios/**/default.pbxuser
6969
!**/ios/**/default.perspectivev3
70-
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
70+
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
71+
.flutter-plugins-dependencies
72+
73+
ios/Flutter/flutter_export_environment.sh

‎android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import io.flutter.plugin.common.PluginRegistry;
44
import com.cloudwebrtc.webrtc.FlutterWebRTCPlugin;
5+
import io.flutter.plugins.pathprovider.PathProviderPlugin;
56
import io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin;
67

78
/**
@@ -13,6 +14,7 @@ public static void registerWith(PluginRegistry registry) {
1314
return;
1415
}
1516
FlutterWebRTCPlugin.registerWith(registry.registrarFor("com.cloudwebrtc.webrtc.FlutterWebRTCPlugin"));
17+
PathProviderPlugin.registerWith(registry.registrarFor("io.flutter.plugins.pathprovider.PathProviderPlugin"));
1618
SharedPreferencesPlugin.registerWith(registry.registrarFor("io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin"));
1719
}
1820

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

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#Sun Jul 05 17:31:51 EDT 2020
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

‎ios/Runner/GeneratedPluginRegistrant.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@
77

88
#import <Flutter/Flutter.h>
99

10+
NS_ASSUME_NONNULL_BEGIN
11+
1012
@interface GeneratedPluginRegistrant : NSObject
1113
+ (void)registerWithRegistry:(NSObject<FlutterPluginRegistry>*)registry;
1214
@end
1315

16+
NS_ASSUME_NONNULL_END
1417
#endif /* GeneratedPluginRegistrant_h */

‎ios/Runner/GeneratedPluginRegistrant.m

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,30 @@
33
//
44

55
#import "GeneratedPluginRegistrant.h"
6+
7+
#if __has_include(<flutter_webrtc/FlutterWebRTCPlugin.h>)
68
#import <flutter_webrtc/FlutterWebRTCPlugin.h>
7-
#import <shared_preferences/SharedPreferencesPlugin.h>
9+
#else
10+
@import flutter_webrtc;
11+
#endif
12+
13+
#if __has_include(<path_provider/FLTPathProviderPlugin.h>)
14+
#import <path_provider/FLTPathProviderPlugin.h>
15+
#else
16+
@import path_provider;
17+
#endif
18+
19+
#if __has_include(<shared_preferences/FLTSharedPreferencesPlugin.h>)
20+
#import <shared_preferences/FLTSharedPreferencesPlugin.h>
21+
#else
22+
@import shared_preferences;
23+
#endif
824

925
@implementation GeneratedPluginRegistrant
1026

1127
+ (void)registerWithRegistry:(NSObject<FlutterPluginRegistry>*)registry {
1228
[FlutterWebRTCPlugin registerWithRegistrar:[registry registrarForPlugin:@"FlutterWebRTCPlugin"]];
29+
[FLTPathProviderPlugin registerWithRegistrar:[registry registrarForPlugin:@"FLTPathProviderPlugin"]];
1330
[FLTSharedPreferencesPlugin registerWithRegistrar:[registry registrarForPlugin:@"FLTSharedPreferencesPlugin"]];
1431
}
1532

‎pubspec.lock

Lines changed: 278 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,278 @@
1+
# Generated by pub
2+
# See https://dart.dev/tools/pub/glossary#lockfile
3+
packages:
4+
async:
5+
dependency: transitive
6+
description:
7+
name: async
8+
url: "https://pub.dartlang.org"
9+
source: hosted
10+
version: "2.4.1"
11+
boolean_selector:
12+
dependency: transitive
13+
description:
14+
name: boolean_selector
15+
url: "https://pub.dartlang.org"
16+
source: hosted
17+
version: "2.0.0"
18+
charcode:
19+
dependency: transitive
20+
description:
21+
name: charcode
22+
url: "https://pub.dartlang.org"
23+
source: hosted
24+
version: "1.1.3"
25+
clock:
26+
dependency: transitive
27+
description:
28+
name: clock
29+
url: "https://pub.dartlang.org"
30+
source: hosted
31+
version: "1.0.1"
32+
collection:
33+
dependency: transitive
34+
description:
35+
name: collection
36+
url: "https://pub.dartlang.org"
37+
source: hosted
38+
version: "1.14.12"
39+
cupertino_icons:
40+
dependency: "direct main"
41+
description:
42+
name: cupertino_icons
43+
url: "https://pub.dartlang.org"
44+
source: hosted
45+
version: "0.1.3"
46+
fake_async:
47+
dependency: transitive
48+
description:
49+
name: fake_async
50+
url: "https://pub.dartlang.org"
51+
source: hosted
52+
version: "1.1.0"
53+
file:
54+
dependency: transitive
55+
description:
56+
name: file
57+
url: "https://pub.dartlang.org"
58+
source: hosted
59+
version: "5.2.1"
60+
flutter:
61+
dependency: "direct main"
62+
description: flutter
63+
source: sdk
64+
version: "0.0.0"
65+
flutter_test:
66+
dependency: "direct dev"
67+
description: flutter
68+
source: sdk
69+
version: "0.0.0"
70+
flutter_web_plugins:
71+
dependency: transitive
72+
description: flutter
73+
source: sdk
74+
version: "0.0.0"
75+
flutter_webrtc:
76+
dependency: "direct main"
77+
description:
78+
name: flutter_webrtc
79+
url: "https://pub.dartlang.org"
80+
source: hosted
81+
version: "0.2.8"
82+
http:
83+
dependency: "direct main"
84+
description:
85+
name: http
86+
url: "https://pub.dartlang.org"
87+
source: hosted
88+
version: "0.12.1"
89+
http_parser:
90+
dependency: transitive
91+
description:
92+
name: http_parser
93+
url: "https://pub.dartlang.org"
94+
source: hosted
95+
version: "3.1.4"
96+
intl:
97+
dependency: transitive
98+
description:
99+
name: intl
100+
url: "https://pub.dartlang.org"
101+
source: hosted
102+
version: "0.16.1"
103+
matcher:
104+
dependency: transitive
105+
description:
106+
name: matcher
107+
url: "https://pub.dartlang.org"
108+
source: hosted
109+
version: "0.12.6"
110+
meta:
111+
dependency: transitive
112+
description:
113+
name: meta
114+
url: "https://pub.dartlang.org"
115+
source: hosted
116+
version: "1.1.8"
117+
path:
118+
dependency: transitive
119+
description:
120+
name: path
121+
url: "https://pub.dartlang.org"
122+
source: hosted
123+
version: "1.7.0"
124+
path_provider:
125+
dependency: "direct main"
126+
description:
127+
name: path_provider
128+
url: "https://pub.dartlang.org"
129+
source: hosted
130+
version: "1.6.11"
131+
path_provider_linux:
132+
dependency: transitive
133+
description:
134+
name: path_provider_linux
135+
url: "https://pub.dartlang.org"
136+
source: hosted
137+
version: "0.0.1+2"
138+
path_provider_macos:
139+
dependency: "direct main"
140+
description:
141+
name: path_provider_macos
142+
url: "https://pub.dartlang.org"
143+
source: hosted
144+
version: "0.0.4+3"
145+
path_provider_platform_interface:
146+
dependency: transitive
147+
description:
148+
name: path_provider_platform_interface
149+
url: "https://pub.dartlang.org"
150+
source: hosted
151+
version: "1.0.2"
152+
pedantic:
153+
dependency: transitive
154+
description:
155+
name: pedantic
156+
url: "https://pub.dartlang.org"
157+
source: hosted
158+
version: "1.9.0"
159+
platform:
160+
dependency: transitive
161+
description:
162+
name: platform
163+
url: "https://pub.dartlang.org"
164+
source: hosted
165+
version: "2.2.1"
166+
plugin_platform_interface:
167+
dependency: transitive
168+
description:
169+
name: plugin_platform_interface
170+
url: "https://pub.dartlang.org"
171+
source: hosted
172+
version: "1.0.2"
173+
process:
174+
dependency: transitive
175+
description:
176+
name: process
177+
url: "https://pub.dartlang.org"
178+
source: hosted
179+
version: "3.0.13"
180+
shared_preferences:
181+
dependency: "direct main"
182+
description:
183+
name: shared_preferences
184+
url: "https://pub.dartlang.org"
185+
source: hosted
186+
version: "0.5.7+3"
187+
shared_preferences_macos:
188+
dependency: "direct main"
189+
description:
190+
name: shared_preferences_macos
191+
url: "https://pub.dartlang.org"
192+
source: hosted
193+
version: "0.0.1+10"
194+
shared_preferences_platform_interface:
195+
dependency: transitive
196+
description:
197+
name: shared_preferences_platform_interface
198+
url: "https://pub.dartlang.org"
199+
source: hosted
200+
version: "1.0.4"
201+
shared_preferences_web:
202+
dependency: "direct main"
203+
description:
204+
name: shared_preferences_web
205+
url: "https://pub.dartlang.org"
206+
source: hosted
207+
version: "0.1.2+7"
208+
sky_engine:
209+
dependency: transitive
210+
description: flutter
211+
source: sdk
212+
version: "0.0.99"
213+
source_span:
214+
dependency: transitive
215+
description:
216+
name: source_span
217+
url: "https://pub.dartlang.org"
218+
source: hosted
219+
version: "1.7.0"
220+
stack_trace:
221+
dependency: transitive
222+
description:
223+
name: stack_trace
224+
url: "https://pub.dartlang.org"
225+
source: hosted
226+
version: "1.9.3"
227+
stream_channel:
228+
dependency: transitive
229+
description:
230+
name: stream_channel
231+
url: "https://pub.dartlang.org"
232+
source: hosted
233+
version: "2.0.0"
234+
string_scanner:
235+
dependency: transitive
236+
description:
237+
name: string_scanner
238+
url: "https://pub.dartlang.org"
239+
source: hosted
240+
version: "1.0.5"
241+
term_glyph:
242+
dependency: transitive
243+
description:
244+
name: term_glyph
245+
url: "https://pub.dartlang.org"
246+
source: hosted
247+
version: "1.1.0"
248+
test_api:
249+
dependency: transitive
250+
description:
251+
name: test_api
252+
url: "https://pub.dartlang.org"
253+
source: hosted
254+
version: "0.2.16"
255+
typed_data:
256+
dependency: transitive
257+
description:
258+
name: typed_data
259+
url: "https://pub.dartlang.org"
260+
source: hosted
261+
version: "1.1.6"
262+
vector_math:
263+
dependency: transitive
264+
description:
265+
name: vector_math
266+
url: "https://pub.dartlang.org"
267+
source: hosted
268+
version: "2.0.8"
269+
xdg_directories:
270+
dependency: transitive
271+
description:
272+
name: xdg_directories
273+
url: "https://pub.dartlang.org"
274+
source: hosted
275+
version: "0.1.0"
276+
sdks:
277+
dart: ">=2.7.0 <3.0.0"
278+
flutter: ">=1.12.13+hotfix.5 <2.0.0"

‎pubspec.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@ description: A new Flutter application.
77
# Both the version and the builder number may be overridden in flutter
88
# build by specifying --build-name and --build-number, respectively.
99
# Read more about versioning at semver.org.
10-
version: 1.0.0+1
10+
version: 1.0.1
1111

1212
environment:
13-
sdk: ">=2.2.0 <3.0.0"
13+
sdk: ">=2.6.0 <3.0.0"
1414

1515
dependencies:
1616
flutter:
1717
sdk: flutter
1818

1919
# The following adds the Cupertino Icons font to your application.
2020
# Use with the CupertinoIcons class for iOS style icons.
21-
cupertino_icons: ^0.1.2
22-
flutter_webrtc: ^0.2.6
21+
cupertino_icons: ^0.1.3
22+
flutter_webrtc: ^0.2.8
2323
shared_preferences:
2424
shared_preferences_macos:
2525
shared_preferences_web:
26-
http: ^0.12.0+4
26+
http: ^0.12.1
2727

2828
# Required for MediaRecorder example
2929
path_provider:

0 commit comments

Comments
 (0)