diff --git a/android_app/app/build.gradle b/android_app/app/build.gradle index 7849cc7a..e25c2ba2 100644 --- a/android_app/app/build.gradle +++ b/android_app/app/build.gradle @@ -2,12 +2,12 @@ apply plugin: 'com.android.application' apply plugin: "androidx.navigation.safeargs" android { - compileSdkVersion 31 + compileSdkVersion 32 defaultConfig { applicationId "com.health.openscale" testApplicationId "com.health.openscale.test" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 32 versionCode 61 versionName "2.4.6" @@ -139,42 +139,42 @@ android { dependencies { 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.appcompat:appcompat:1.4.1' + implementation 'androidx.appcompat:appcompat:1.5.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.navigation:navigation-fragment:2.4.2' - implementation 'androidx.navigation:navigation-ui:2.4.2' + implementation 'androidx.navigation:navigation-fragment:2.5.3' + implementation 'androidx.navigation:navigation-ui:2.5.3' 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 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' // Simple CSV implementation 'com.j256.simplecsv:simplecsv:2.6' // Blessed Android - implementation 'com.github.weliem:blessed-android:2.2.0' + implementation 'com.github.weliem:blessed-android:2.4.0' // CustomActivityOnCrash implementation 'cat.ereza:customactivityoncrash:2.3.0' // AppIntro 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 - implementation 'androidx.room:room-runtime:2.3.0' - annotationProcessor 'androidx.room:room-compiler:2.3.0' - androidTestImplementation 'androidx.room:room-testing:2.3.0' + implementation 'androidx.room:room-runtime:2.4.3' + annotationProcessor 'androidx.room:room-compiler:2.4.3' + androidTestImplementation 'androidx.room:room-testing:2.4.3' // Timber implementation 'com.jakewharton.timber:timber:5.0.1' // Local unit tests - testImplementation 'junit:junit:4.13.1' + testImplementation 'junit:junit:4.13.2' // Instrumented unit tests - androidTestImplementation 'androidx.annotation:annotation:1.3.0' - androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation 'androidx.test:rules:1.4.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' - androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.4.0' + implementation 'androidx.annotation:annotation:1.5.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test:rules:1.5.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.5.0' } tasks.withType(Test) { diff --git a/android_app/app/src/main/java/com/health/openscale/gui/utils/PermissionHelper.java b/android_app/app/src/main/java/com/health/openscale/gui/utils/PermissionHelper.java index e694fb15..8f73c617 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/utils/PermissionHelper.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/utils/PermissionHelper.java @@ -86,6 +86,7 @@ public class PermissionHelper { if (requestLocationServicePermission(fragment)) { if (fragment.getContext().checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) { AlertDialog.Builder builder = new AlertDialog.Builder(fragment.getActivity()); + Timber.d("No access fine location permission granted"); builder.setMessage(R.string.permission_bluetooth_info) .setTitle(R.string.permission_bluetooth_info_title) diff --git a/android_app/build.gradle b/android_app/build.gradle index be754f6e..a99e1680 100644 --- a/android_app/build.gradle +++ b/android_app/build.gradle @@ -5,8 +5,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' - classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5" + classpath 'com.android.tools.build:gradle:7.2.2' + classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3" } } diff --git a/android_app/gradle/wrapper/gradle-wrapper.properties b/android_app/gradle/wrapper/gradle-wrapper.properties index 441ce471..d935a3ee 100644 --- a/android_app/gradle/wrapper/gradle-wrapper.properties +++ b/android_app/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.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip