mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-17 22:11:35 +02:00
Code Issues Releases Wiki Activity

update library dependencies

Browse Source
This commit is contained in:
oliexdev
2022-12-08 16:02:40 +01:00
parent 0c6bd6bdc8
commit 35f516f9cc
4 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
android_app/app/build.gradle
View File

@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
apply plugin: "androidx.navigation.safeargs" apply plugin: "androidx.navigation.safeargs"
android { android {
compileSdkVersion 31 compileSdkVersion 32
defaultConfig { defaultConfig {
applicationId "com.health.openscale" applicationId "com.health.openscale"
testApplicationId "com.health.openscale.test" testApplicationId "com.health.openscale.test"
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 31 targetSdkVersion 32
versionCode 61 versionCode 61
versionName "2.4.6" versionName "2.4.6"
@@ -139,42 +139,42 @@ android {
dependencies { dependencies {
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
implementation 'com.google.android.material:material:1.6.0-beta01' implementation 'com.google.android.material:material:1.8.0-alpha03'
implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.appcompat:appcompat:1.4.1' implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.3' implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.preference:preference:1.2.0' implementation 'androidx.preference:preference:1.2.0'
implementation 'androidx.navigation:navigation-fragment:2.4.2' implementation 'androidx.navigation:navigation-fragment:2.5.3'
implementation 'androidx.navigation:navigation-ui:2.4.2' implementation 'androidx.navigation:navigation-ui:2.5.3'
implementation "android.arch.lifecycle:extensions:1.1.1" implementation "android.arch.lifecycle:extensions:1.1.1"
annotationProcessor "androidx.lifecycle:lifecycle-common-java8:2.4.1" annotationProcessor "androidx.lifecycle:lifecycle-common-java8:2.5.1"
// MPAndroidChart // MPAndroidChart
implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
// Simple CSV // Simple CSV
implementation 'com.j256.simplecsv:simplecsv:2.6' implementation 'com.j256.simplecsv:simplecsv:2.6'
// Blessed Android // Blessed Android
implementation 'com.github.weliem:blessed-android:2.2.0' implementation 'com.github.weliem:blessed-android:2.4.0'
// CustomActivityOnCrash // CustomActivityOnCrash
implementation 'cat.ereza:customactivityoncrash:2.3.0' implementation 'cat.ereza:customactivityoncrash:2.3.0'
// AppIntro // AppIntro
implementation 'com.github.AppIntro:AppIntro:6.0.0' implementation 'com.github.AppIntro:AppIntro:6.0.0'
implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.4.32' implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.4.31'
// Room // Room
implementation 'androidx.room:room-runtime:2.3.0' implementation 'androidx.room:room-runtime:2.4.3'
annotationProcessor 'androidx.room:room-compiler:2.3.0' annotationProcessor 'androidx.room:room-compiler:2.4.3'
androidTestImplementation 'androidx.room:room-testing:2.3.0' androidTestImplementation 'androidx.room:room-testing:2.4.3'
// Timber // Timber
implementation 'com.jakewharton.timber:timber:5.0.1' implementation 'com.jakewharton.timber:timber:5.0.1'
// Local unit tests // Local unit tests
testImplementation 'junit:junit:4.13.1' testImplementation 'junit:junit:4.13.2'
// Instrumented unit tests // Instrumented unit tests
androidTestImplementation 'androidx.annotation:annotation:1.3.0' implementation 'androidx.annotation:annotation:1.5.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.ext:junit:1.1.4'
androidTestImplementation 'androidx.test:rules:1.4.0' androidTestImplementation 'androidx.test:rules:1.5.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.4.0' androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.5.0'
} }
tasks.withType(Test) { tasks.withType(Test) {

1
android_app/app/src/main/java/com/health/openscale/gui/utils/PermissionHelper.java
View File

@@ -86,6 +86,7 @@ public class PermissionHelper {
if (requestLocationServicePermission(fragment)) { if (requestLocationServicePermission(fragment)) {
if (fragment.getContext().checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) { if (fragment.getContext().checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
AlertDialog.Builder builder = new AlertDialog.Builder(fragment.getActivity()); AlertDialog.Builder builder = new AlertDialog.Builder(fragment.getActivity());
Timber.d("No access fine location permission granted");
builder.setMessage(R.string.permission_bluetooth_info) builder.setMessage(R.string.permission_bluetooth_info)
.setTitle(R.string.permission_bluetooth_info_title) .setTitle(R.string.permission_bluetooth_info_title)

4
android_app/build.gradle
View File

@@ -5,8 +5,8 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.3' classpath 'com.android.tools.build:gradle:7.2.2'
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3"
} }
} }

2
android_app/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip