Merge pull request #143 from PhilipsHue/fix-protobuf-issues

Fix protobuf issues
PhilipsHue · Nov 16, 2020 · ec2fba4 · ec2fba4
2 parents 44a6fd7 + 79c664c
commit ec2fba4
Show file tree

Hide file tree

Showing 10 changed files with 816 additions and 250 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.7.1
+
+* Fix #115 by updating to new protobuf lite on Android.
+* Regenerate Dart and Swift protobuf code.
+
 ## 2.7.0
 
 * Fix #137 by making sure event channels are initialized early.

diff --git a/android/build.gradle b/android/build.gradle
@@ -64,17 +64,15 @@ detekt {
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.6.1'
-    }
-    plugins {
-        javalite {
-            artifact = 'com.google.protobuf:protoc-gen-javalite:3.0.0'
-        }
+        artifact = 'com.google.protobuf:protoc:3.13.0'
     }
+
     generateProtoTasks {
         all().each { task ->
-            task.plugins {
-                javalite { }
+            task.builtins {
+                java {
+                    option "lite"
+                }
             }
         }
     }
@@ -83,7 +81,7 @@ protobuf {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.polidea.rxandroidble2:rxandroidble:1.11.1'
-    implementation 'com.google.protobuf:protobuf-lite:3.0.1'
+    implementation 'com.google.protobuf:protobuf-javalite:3.11.0'
     implementation 'io.reactivex.rxjava2:rxkotlin:2.3.0'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
 

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -82,7 +82,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "2.7.0"
+    version: "2.7.1"
   flutter_test:
     dependency: "direct dev"
     description: flutter

diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_reactive_ble_example
 description: Demonstrates how to use the flutter_reactive_ble plugin.
-version: 2.7.0
+version: 2.7.1
 publish_to: 'none'
 
 environment:

diff --git a/ios/Classes/BleData/bledata.pb.swift b/ios/Classes/BleData/bledata.pb.swift
diff --git a/lib/src/generated/bledata.pb.dart b/lib/src/generated/bledata.pb.dart
diff --git a/lib/src/generated/bledata.pbenum.dart b/lib/src/generated/bledata.pbenum.dart
@@ -3,4 +3,4 @@
 //  source: bledata.proto
 //
 // @dart = 2.3
-// ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type
+// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields
diff --git a/lib/src/generated/bledata.pbjson.dart b/lib/src/generated/bledata.pbjson.dart
@@ -3,7 +3,7 @@
 //  source: bledata.proto
 //
 // @dart = 2.3
-// ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type
+// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields
 
 const ScanForDevicesRequest$json = const {
   '1': 'ScanForDevicesRequest',

diff --git a/lib/src/generated/bledata.pbserver.dart b/lib/src/generated/bledata.pbserver.dart
@@ -3,6 +3,6 @@
 //  source: bledata.proto
 //
 // @dart = 2.3
-// ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type
+// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields
 
 export 'bledata.pb.dart';
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_reactive_ble
 description: Reactive Bluetooth Low Energy (BLE) plugin that can communicate with multiple devices
-version: 2.7.0
+version: 2.7.1
 homepage: https://github.com/PhilipsHue/flutter_reactive_ble
 
 environment: