Skip to content

Commit d0658d3

Browse files
authored
Merge pull request #86 from mitchross/master
Make Android Build Again
2 parents 9232758 + 68620ad commit d0658d3

File tree

8 files changed

+384
-5
lines changed

8 files changed

+384
-5
lines changed

.gitignore

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
# Miscellaneous
2+
*.class
3+
*.log
4+
*.pyc
5+
*.swp
6+
.DS_Store
7+
.atom/
8+
.buildlog/
9+
.history
10+
.svn/
11+
12+
# IntelliJ related
13+
*.iml
14+
*.ipr
15+
*.iws
16+
.idea/
17+
18+
# Visual Studio Code related
19+
.vscode/
20+
21+
# Flutter/Dart/Pub related
22+
**/doc/api/
23+
.dart_tool/
24+
.flutter-plugins
25+
.packages
26+
.pub-cache/
27+
.pub/
28+
/build/
29+
30+
# Android related
31+
**/android/**/gradle-wrapper.jar
32+
**/android/.gradle
33+
**/android/captures/
34+
**/android/gradlew
35+
**/android/gradlew.bat
36+
**/android/local.properties
37+
**/android/**/GeneratedPluginRegistrant.java
38+
39+
# iOS/XCode related
40+
**/ios/**/*.mode1v3
41+
**/ios/**/*.mode2v3
42+
**/ios/**/*.moved-aside
43+
**/ios/**/*.pbxuser
44+
**/ios/**/*.perspectivev3
45+
**/ios/**/*sync/
46+
**/ios/**/.sconsign.dblite
47+
**/ios/**/.tags*
48+
**/ios/**/.vagrant/
49+
**/ios/**/DerivedData/
50+
**/ios/**/Icon?
51+
**/ios/**/Pods/
52+
**/ios/**/.symlinks/
53+
**/ios/**/profile
54+
**/ios/**/xcuserdata
55+
**/ios/.generated/
56+
**/ios/Flutter/App.framework
57+
**/ios/Flutter/Flutter.framework
58+
**/ios/Flutter/Generated.xcconfig
59+
**/ios/Flutter/app.flx
60+
**/ios/Flutter/app.zip
61+
**/ios/Flutter/flutter_assets/
62+
**/ios/ServiceDefinitions.json
63+
**/ios/Runner/GeneratedPluginRegistrant.*
64+
65+
# Exceptions to above rules.
66+
!**/ios/**/default.mode1v3
67+
!**/ios/**/default.mode2v3
68+
!**/ios/**/default.pbxuser
69+
!**/ios/**/default.perspectivev3
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

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

0 commit comments

Comments
 (0)