From 16336cc04e6dce8fe6ffa7a2afa971ffa61222c0 Mon Sep 17 00:00:00 2001 From: oliexdev Date: Sat, 22 Jul 2023 08:54:27 +0200 Subject: [PATCH] library versions updated --- android_app/app/build.gradle | 35 ++++++++++--------- android_app/app/src/main/AndroidManifest.xml | 3 +- android_app/build.gradle | 4 +-- android_app/gradle.properties | 3 ++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 25 insertions(+), 22 deletions(-) diff --git a/android_app/app/build.gradle b/android_app/app/build.gradle index 318a92ed..deff5702 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 33 + compileSdkVersion 34 defaultConfig { applicationId "com.health.openscale" testApplicationId "com.health.openscale.test" minSdkVersion 23 - targetSdkVersion 33 + targetSdkVersion 34 versionCode 63 versionName "2.5.1" @@ -134,21 +134,22 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + namespace 'com.health.openscale' } dependencies { - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3' - implementation 'com.google.android.material:material:1.8.0-rc01' + implementation 'com.google.android.material:material:1.11.0-alpha01' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'androidx.appcompat:appcompat:1.6.0' - implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.recyclerview:recyclerview:1.3.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.preference:preference:1.2.0' - implementation 'androidx.navigation:navigation-fragment:2.5.3' - implementation 'androidx.navigation:navigation-ui:2.5.3' + implementation 'androidx.navigation:navigation-fragment:2.6.0' + implementation 'androidx.navigation:navigation-ui:2.6.0' implementation "android.arch.lifecycle:extensions:1.1.1" - annotationProcessor "androidx.lifecycle:lifecycle-common-java8:2.5.1" + annotationProcessor "androidx.lifecycle:lifecycle-common-java8:2.6.1" // MPAndroidChart implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' @@ -160,21 +161,21 @@ dependencies { implementation 'cat.ereza:customactivityoncrash:2.3.0' // AppIntro implementation 'com.github.AppIntro:AppIntro:6.2.0' - implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.4.31' + // implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.8.20' // Room - implementation 'androidx.room:room-runtime:2.4.3' - annotationProcessor 'androidx.room:room-compiler:2.4.3' - androidTestImplementation 'androidx.room:room-testing:2.4.3' + implementation 'androidx.room:room-runtime:2.5.2' + annotationProcessor 'androidx.room:room-compiler:2.5.2' + androidTestImplementation 'androidx.room:room-testing:2.5.2' // Timber implementation 'com.jakewharton.timber:timber:5.0.1' // Local unit tests testImplementation 'junit:junit:4.13.2' // Instrumented unit tests - implementation 'androidx.annotation:annotation:1.5.0' - androidTestImplementation 'androidx.test.ext:junit:1.1.4' + implementation 'androidx.annotation:annotation:1.6.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' 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' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' + androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.5.1' } tasks.withType(Test) { diff --git a/android_app/app/src/main/AndroidManifest.xml b/android_app/app/src/main/AndroidManifest.xml index 5f3952c2..b8316c09 100644 --- a/android_app/app/src/main/AndroidManifest.xml +++ b/android_app/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/android_app/build.gradle b/android_app/build.gradle index a99e1680..634ed22f 100644 --- a/android_app/build.gradle +++ b/android_app/build.gradle @@ -5,8 +5,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.2' - classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3" + classpath 'com.android.tools.build:gradle:8.0.2' + classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.6.0" } } diff --git a/android_app/gradle.properties b/android_app/gradle.properties index dbb7bf70..98241225 100644 --- a/android_app/gradle.properties +++ b/android_app/gradle.properties @@ -1,2 +1,5 @@ +android.defaults.buildfeatures.buildconfig=true android.enableJetifier=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true diff --git a/android_app/gradle/wrapper/gradle-wrapper.properties b/android_app/gradle/wrapper/gradle-wrapper.properties index d935a3ee..957f3fe0 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-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip