Skip to content

Commit 2ccdc68

Browse files
pauldemarcopauldemarco
authored
Update project files (pauldemarco#401)
* Update project files for Android and iOS * Remove dependency on protoc in iOS podspec file
1 parent 8bb4f84 commit 2ccdc68

35 files changed

+330
-181
lines changed

‎.metadata

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# This file tracks properties of this Flutter project.
2+
# Used by Flutter tool to assess capabilities and perform upgrades etc.
3+
#
4+
# This file should be version controlled and should not be manually edited.
5+
6+
version:
7+
revision: f53b32eb2317ba09137969999d130c24a6314997
8+
channel: master
9+
10+
project_type: plugin

‎android/build.gradle

+2-9
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,17 @@ gradle.buildFinished { buildResult ->
1111
}
1212
}
1313

14-
group 'com.pauldemarco.flutterblue'
14+
group 'com.pauldemarco.flutter_blue'
1515
version '1.0-SNAPSHOT'
1616

1717
buildscript {
1818
repositories {
1919
google()
2020
jcenter()
21-
mavenLocal()
2221
}
2322

2423
dependencies {
25-
classpath 'com.android.tools.build:gradle:3.3.0'
24+
classpath 'com.android.tools.build:gradle:3.5.0'
2625
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10'
2726
}
2827
}
@@ -31,7 +30,6 @@ rootProject.allprojects {
3130
repositories {
3231
google()
3332
jcenter()
34-
mavenLocal()
3533
}
3634
}
3735

@@ -48,11 +46,6 @@ android {
4846
lintOptions {
4947
disable 'InvalidPackage'
5048
}
51-
dependencies {
52-
// Required for local unit tests (JUnit 4 framework)
53-
testImplementation 'junit:junit:4.12'
54-
implementation 'androidx.core:core:1.0.2'
55-
}
5649
sourceSets {
5750
main {
5851
proto {

‎android/gradle.properties

+3
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
org.gradle.jvmargs=-Xmx1536M
2+
android.enableR8=true
3+
android.useAndroidX=true
4+
android.enableJetifier=true

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

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
zipStoreBase=GRADLE_USER_HOME
4+
zipStorePath=wrapper/dists
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

‎android/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.pauldemarco.flutterblue">
2+
package="com.pauldemarco.flutter_blue">
33
<uses-sdk android:minSdkVersion="18" />
44
<uses-permission android:name="android.permission.BLUETOOTH" />
55
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

‎android/src/main/java/com/pauldemarco/flutterblue/AdvertisementParser.java ‎android/src/main/java/com/pauldemarco/flutter_blue/AdvertisementParser.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2626
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2727

28-
package com.pauldemarco.flutterblue;
28+
package com.pauldemarco.flutter_blue;
2929

3030
import com.google.protobuf.ByteString;
31-
import com.pauldemarco.flutterblue.Protos.AdvertisementData;
31+
import com.pauldemarco.flutter_blue.Protos.AdvertisementData;
3232

3333
import java.io.UnsupportedEncodingException;
3434
import java.nio.ByteBuffer;

‎android/src/main/java/com/pauldemarco/flutterblue/FlutterBluePlugin.java ‎android/src/main/java/com/pauldemarco/flutter_blue/FlutterBluePlugin.java

+3-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
package com.pauldemarco.flutterblue;
5+
package com.pauldemarco.flutter_blue;
66

77
import android.app.Activity;
88
import android.Manifest;
@@ -53,9 +53,7 @@
5353
import io.flutter.plugin.common.PluginRegistry.RequestPermissionsResultListener;
5454

5555

56-
/**
57-
* FlutterBluePlugin
58-
*/
56+
/** FlutterBluePlugin */
5957
public class FlutterBluePlugin implements MethodCallHandler, RequestPermissionsResultListener {
6058
private static final String TAG = "FlutterBluePlugin";
6159
private static final String NAMESPACE = "plugins.pauldemarco.com/flutter_blue";
@@ -74,9 +72,7 @@ public class FlutterBluePlugin implements MethodCallHandler, RequestPermissionsR
7472
private MethodCall pendingCall;
7573
private Result pendingResult;
7674

77-
/**
78-
* Plugin registration.
79-
*/
75+
/** Plugin registration. */
8076
public static void registerWith(Registrar registrar) {
8177
final FlutterBluePlugin instance = new FlutterBluePlugin(registrar);
8278
registrar.addRequestPermissionsResultListener(instance);

‎android/src/main/java/com/pauldemarco/flutterblue/ProtoMaker.java ‎android/src/main/java/com/pauldemarco/flutter_blue/ProtoMaker.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
package com.pauldemarco.flutterblue;
5+
package com.pauldemarco.flutter_blue;
66

77
import android.annotation.TargetApi;
88
import android.bluetooth.BluetoothDevice;

‎example/.gitignore

+7-42
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Miscellaneous
22
*.class
3-
*.lock
43
*.log
54
*.pyc
65
*.swp
@@ -16,8 +15,10 @@
1615
*.iws
1716
.idea/
1817

19-
# Visual Studio Code related
20-
.vscode/
18+
# The .vscode folder contains launch configuration and tasks you configure in
19+
# VS Code which you may wish to be included in version control, so this line
20+
# is commented out by default.
21+
#.vscode/
2122

2223
# Flutter/Dart/Pub related
2324
**/doc/api/
@@ -26,46 +27,10 @@
2627
.packages
2728
.pub-cache/
2829
.pub/
29-
build/
30+
/build/
3031

31-
# Android related
32-
**/android/**/gradle-wrapper.jar
33-
**/android/.gradle
34-
**/android/captures/
35-
**/android/gradlew
36-
**/android/gradlew.bat
37-
**/android/local.properties
38-
**/android/**/GeneratedPluginRegistrant.java
39-
40-
# iOS/XCode related
41-
**/ios/**/*.mode1v3
42-
**/ios/**/*.mode2v3
43-
**/ios/**/*.moved-aside
44-
**/ios/**/*.pbxuser
45-
**/ios/**/*.perspectivev3
46-
**/ios/**/*sync/
47-
**/ios/**/.sconsign.dblite
48-
**/ios/**/.tags*
49-
**/ios/**/.vagrant/
50-
**/ios/**/DerivedData/
51-
**/ios/**/Icon?
52-
**/ios/**/Pods/
53-
**/ios/**/.symlinks/
54-
**/ios/**/profile
55-
**/ios/**/xcuserdata
56-
**/ios/.generated/
57-
**/ios/Flutter/App.framework
58-
**/ios/Flutter/Flutter.framework
59-
**/ios/Flutter/Generated.xcconfig
60-
**/ios/Flutter/app.flx
61-
**/ios/Flutter/app.zip
62-
**/ios/Flutter/flutter_assets/
63-
**/ios/ServiceDefinitions.json
64-
**/ios/Runner/GeneratedPluginRegistrant.*
32+
# Web related
33+
lib/generated_plugin_registrant.dart
6534

6635
# Exceptions to above rules.
67-
!**/ios/**/default.mode1v3
68-
!**/ios/**/default.mode2v3
69-
!**/ios/**/default.pbxuser
70-
!**/ios/**/default.perspectivev3
7136
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages

‎example/.metadata

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# This file tracks properties of this Flutter project.
2+
# Used by Flutter tool to assess capabilities and perform upgrades etc.
3+
#
4+
# This file should be version controlled and should not be manually edited.
5+
6+
version:
7+
revision: f53b32eb2317ba09137969999d130c24a6314997
8+
channel: master
9+
10+
project_type: app

‎example/README.md

+10-2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,13 @@ Demonstrates how to use the flutter_blue plugin.
44

55
## Getting Started
66

7-
For help getting started with Flutter, view our online
8-
[documentation](http://flutter.io/).
7+
This project is a starting point for a Flutter application.
8+
9+
A few resources to get you started if this is your first Flutter project:
10+
11+
- [Lab: Write your first Flutter app](https://flutter.dev/docs/get-started/codelab)
12+
- [Cookbook: Useful Flutter samples](https://flutter.dev/docs/cookbook)
13+
14+
For help getting started with Flutter, view our
15+
[online documentation](https://flutter.dev/docs), which offers tutorials,
16+
samples, guidance on mobile development, and a full API reference.

‎example/android.iml

-12
This file was deleted.

‎example/android/.gitignore

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
gradle-wrapper.jar
2+
/.gradle
3+
/captures/
4+
/gradlew
5+
/gradlew.bat
6+
/local.properties
7+
GeneratedPluginRegistrant.java

‎example/android/app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ android {
3232
}
3333

3434
defaultConfig {
35-
applicationId "com.pauldemarco.flutterblueexample"
35+
applicationId "com.pauldemarco.flutter_blue_example"
3636
minSdkVersion 19
3737
targetSdkVersion 28
3838
versionCode flutterVersionCode.toInteger()

‎example/android/app/src/debug/AndroidManifest.xml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2+
package="com.pauldemarco.flutter_blue_example">
3+
<!-- Flutter needs it to communicate with the running application
4+
to allow setting breakpoints, to provide hot reload, etc.
5+
-->
6+
<uses-permission android:name="android.permission.INTERNET"/>
7+
</manifest>

‎example/android/app/src/main/AndroidManifest.xml

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.pauldemarco.flutterblueexample">
3-
4-
<!-- The INTERNET permission is required for development. Specifically,
5-
flutter needs it to communicate with the running application
6-
to allow setting breakpoints, to provide hot reload, etc.
7-
-->
8-
<uses-permission android:name="android.permission.INTERNET"/>
9-
2+
package="com.pauldemarco.flutter_blue_example">
103
<!-- io.flutter.app.FlutterApplication is an android.app.Application that
114
calls FlutterMain.startInitialization(this); in its onCreate method.
125
In most cases you can leave this as-is, but you if you want to provide
@@ -20,7 +13,7 @@
2013
android:name=".MainActivity"
2114
android:launchMode="singleTop"
2215
android:theme="@style/LaunchTheme"
23-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density"
16+
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
2417
android:hardwareAccelerated="true"
2518
android:windowSoftInputMode="adjustResize">
2619
<!-- This keeps the window background of the activity showing

‎example/android/app/src/main/java/com/pauldemarco/flutterblueexample/MainActivity.java ‎example/android/app/src/main/java/com/pauldemarco/flutter_blue_example/MainActivity.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
package com.pauldemarco.flutterblueexample;
1+
package com.pauldemarco.flutter_blue_example;
22

33
import android.os.Bundle;
4-
54
import io.flutter.app.FlutterActivity;
65
import io.flutter.plugins.GeneratedPluginRegistrant;
76

‎example/android/app/src/profile/AndroidManifest.xml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2+
package="com.pauldemarco.flutter_blue_example">
3+
<!-- Flutter needs it to communicate with the running application
4+
to allow setting breakpoints, to provide hot reload, etc.
5+
-->
6+
<uses-permission android:name="android.permission.INTERNET"/>
7+
</manifest>

‎example/android/build.gradle

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

‎example/android/gradle.properties

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
android.enableJetifier=true
2-
android.useAndroidX=true
31
org.gradle.jvmargs=-Xmx1536M
2+
android.enableR8=true
3+
android.useAndroidX=true
4+
android.enableJetifier=true

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

+1-1
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/ios/.gitignore

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
*.mode1v3
2+
*.mode2v3
3+
*.moved-aside
4+
*.pbxuser
5+
*.perspectivev3
6+
**/*sync/
7+
.sconsign.dblite
8+
.tags*
9+
**/.vagrant/
10+
**/DerivedData/
11+
Icon?
12+
**/Pods/
13+
**/.symlinks/
14+
profile
15+
xcuserdata
16+
**/.generated/
17+
Flutter/App.framework
18+
Flutter/Flutter.framework
19+
Flutter/Flutter.podspec
20+
Flutter/Generated.xcconfig
21+
Flutter/app.flx
22+
Flutter/app.zip
23+
Flutter/flutter_assets/
24+
Flutter/flutter_export_environment.sh
25+
ServiceDefinitions.json
26+
Runner/GeneratedPluginRegistrant.*
27+
28+
# Exceptions to above rules.
29+
!default.mode1v3
30+
!default.mode2v3
31+
!default.pbxuser
32+
!default.perspectivev3

‎example/ios/Flutter/AppFrameworkInfo.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<plist version="1.0">
44
<dict>
55
<key>CFBundleDevelopmentRegion</key>
6-
<string>en</string>
6+
<string>$(DEVELOPMENT_LANGUAGE)</string>
77
<key>CFBundleExecutable</key>
88
<string>App</string>
99
<key>CFBundleIdentifier</key>

0 commit comments

Comments
 (0)