From 34b4fc2196523f36f8806c44e98f1be026cd81fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mon?= Date: Mon, 1 Feb 2021 21:22:16 +0100 Subject: [PATCH 1/2] upgrade android dependencies to comply to newer gradle distributions --- android/build.gradle | 8 ++++---- example/android/app/build.gradle | 2 +- example/android/build.gradle | 4 ++-- example/android/gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 5db7e15a..c184e32a 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -3,7 +3,7 @@ version '1.0-SNAPSHOT' buildscript { ext.detekt_version = '1.14.1' - ext.kotlin_version = '1.4.10' + ext.kotlin_version = '1.4.21' repositories { google() jcenter() @@ -13,11 +13,11 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.0.2' - classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.13' + classpath 'com.android.tools.build:gradle:4.1.2' + classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.14' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detekt_version" - classpath "de.mannodermaus.gradle.plugins:android-junit5:1.3.2.0" + classpath "de.mannodermaus.gradle.plugins:android-junit5:1.7.0.0" } } diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index d0a2f235..423b24ac 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 28 + compileSdkVersion 30 sourceSets { main.java.srcDirs += 'src/main/kotlin' diff --git a/example/android/build.gradle b/example/android/build.gradle index 1fc094fe..578862b4 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.4.10' + ext.kotlin_version = '1.4.21' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.2' + classpath 'com.android.tools.build:gradle:4.1.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index 493072b3..b46535fd 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip From 00d5b7a8d3962bed84e123efbba53105d2e59691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mon?= Date: Mon, 1 Feb 2021 21:26:58 +0100 Subject: [PATCH 2/2] prepare version 2.7.3 --- CHANGELOG.md | 4 ++++ example/pubspec.lock | 2 +- example/pubspec.yaml | 2 +- pubspec.yaml | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb5d4f5d..0e07ef0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.7.3 + +* Upgrade Android dependencies to comply to newer Gradle distributions. + ## 2.7.2 * Fix #188 `subscribeToCharacteristic` fails when characteristic config descriptor is not present. diff --git a/example/pubspec.lock b/example/pubspec.lock index 886b2dcc..90eda3c2 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -82,7 +82,7 @@ packages: path: ".." relative: true source: path - version: "2.7.2" + version: "2.7.3" flutter_test: dependency: "direct dev" description: flutter diff --git a/example/pubspec.yaml b/example/pubspec.yaml index a9281ada..5afd1169 100644 --- 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.2 +version: 2.7.3 publish_to: 'none' environment: diff --git a/pubspec.yaml b/pubspec.yaml index f7fc5398..c973480c 100644 --- 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.2 +version: 2.7.3 homepage: https://github.com/PhilipsHue/flutter_reactive_ble environment: