Merge pull request #133 from PhilipsHue/revert-protobuf-upgrade

Revert protobuf upgrade
PhilipsHue · Oct 26, 2020 · ff81239 · ff81239
2 parents 6914f02 + 636a3e7
commit ff81239
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.6.1+1
+
+* Revert protobuf upgrade on Android.
+
 ## 2.6.1
 
 * Prevent incrorrect propagation of error in case observing BLE status fails.

diff --git a/android/build.gradle b/android/build.gradle
@@ -64,14 +64,17 @@ detekt {
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.13.0'
+        artifact = 'com.google.protobuf:protoc:3.6.1'
+    }
+    plugins {
+        javalite {
+            artifact = 'com.google.protobuf:protoc-gen-javalite:3.0.0'
+        }
     }
     generateProtoTasks {
         all().each { task ->
-            task.builtins {
-                java {
-                    option "lite"
-                }
+            task.plugins {
+                javalite { }
             }
         }
     }
@@ -80,7 +83,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-javalite:3.13.0'
+    implementation 'com.google.protobuf:protobuf-lite:3.0.1'
     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.6.1"
+    version: "2.6.1+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.6.1
+version: 2.6.1+1
 publish_to: 'none'
 
 environment:

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.6.1
+version: 2.6.1+1
 homepage: https://github.com/PhilipsHue/flutter_reactive_ble
 
 environment: