Skip to content

Commit

Permalink
Merge pull request #210 from PhilipsHue/upgrade-android-dependencies
Browse files Browse the repository at this point in the history
upgrade android dependencies to comply to newer gradle distributions
remonh87 authored Feb 2, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents dcbf292 + 00d5b7a commit 35cf990
Showing 8 changed files with 15 additions and 11 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
8 changes: 4 additions & 4 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -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"
}
}

2 changes: 1 addition & 1 deletion example/android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -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'
4 changes: 2 additions & 2 deletions example/android/build.gradle
Original file line number Diff line number Diff line change
@@ -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"
}
}
2 changes: 1 addition & 1 deletion example/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion example/pubspec.lock
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion example/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -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:

0 comments on commit 35cf990

Please sign in to comment.