From d17e2b6de493acd708de6f2d4ea8b292ce2c9301 Mon Sep 17 00:00:00 2001 From: "DESKTOP-RHUN1EM\\olive" Date: Fri, 22 Jan 2021 17:52:24 +0000 Subject: [PATCH] Pegged blessed release to 1.30 for BLESSED Compatability Break Quickfix --- .idea/compiler.xml | 6 +++++ .idea/gradle.xml | 1 + .idea/jarRepositories.xml | 30 ++++++++++++++++++++++++ .idea/misc.xml | 2 +- app/build.gradle | 1 + build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 7 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 .idea/compiler.xml create mode 100644 .idea/jarRepositories.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..61a9130 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 5cd135a..9bba60d 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -14,6 +14,7 @@ diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..eb2873e --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 37a7509..d5d35ec 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/app/build.gradle b/app/build.gradle index bbc0833..baae645 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,6 +32,7 @@ dependencies { testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + implementation 'com.github.weliem:blessed-android:1.30' implementation 'com.github.neosensory:n2yo-android-lib:v1.0.0' implementation 'com.github.neosensory:tle-prediction-engine:v1.0.1' implementation 'com.github.neosensory:neosensory-sdk-for-android-java:1.1.0' diff --git a/build.gradle b/build.gradle index 4f17540..ffc7a08 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.6.3' + classpath 'com.android.tools.build:gradle:4.1.1' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 853c208..dc6c40b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu May 14 22:39:34 CDT 2020 +#Thu Jan 21 23:38:18 GMT 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip