From ecd0251ea6612ce069ec0b708c402bb12630e61b Mon Sep 17 00:00:00 2001 From: jacques Date: Wed, 17 Apr 2024 20:01:13 +0200 Subject: [PATCH] Change some options in order to make compilation/run in avd work --- app/build.gradle | 17 +++++------ .../foucry/pilldroid/DrugListActivity.java | 2 +- build.gradle | 2 +- gradle.properties | 28 ++++++++----------- gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 23 insertions(+), 28 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b069fa1..c2ae63e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -98,23 +98,24 @@ sourceSets { } } } + dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation "androidx.room:room-common:2.5.2" - annotationProcessor "androidx.room:room-compiler:2.5.2" - implementation "androidx.room:room-testing:2.5.2" - implementation "androidx.room:room-rxjava3:2.5.2" - implementation "androidx.room:room-runtime:2.5.2" + implementation "androidx.room:room-common:2.6.1" + annotationProcessor "androidx.room:room-compiler:2.6.1" + implementation "androidx.room:room-testing:2.6.1" + implementation "androidx.room:room-rxjava3:2.6.1" + implementation "androidx.room:room-runtime:2.6.1" implementation fileTree(include: ['*.jar'], dir: 'libs') testImplementation 'junit:junit:4.13.2' implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'androidx.recyclerview:recyclerview:1.3.1' - implementation 'com.google.android.material:material:1.9.0' + implementation 'androidx.recyclerview:recyclerview:1.3.2' + implementation 'com.google.android.material:material:1.11.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'com.journeyapps:zxing-android-embedded:4.3.0' - implementation 'androidx.core:core:1.9.0' + implementation 'androidx.core:core:1.12.0' //coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.0' } diff --git a/app/src/main/java/net/foucry/pilldroid/DrugListActivity.java b/app/src/main/java/net/foucry/pilldroid/DrugListActivity.java index 974826e..43be99d 100644 --- a/app/src/main/java/net/foucry/pilldroid/DrugListActivity.java +++ b/app/src/main/java/net/foucry/pilldroid/DrugListActivity.java @@ -373,7 +373,7 @@ public class DrugListActivity extends AppCompatActivity { //alert.getButton(alert.BUTTON_POSITIVE).setEnabled(s.length() == 8); if (s.length() == 8) { ok.setEnabled(true); - ok.setBackground(ContextCompat.getDrawable(editText.getContext(), R.drawable.rounded_btn)); + ok.setBackground(ContextCompat.getDrawable(editText.getContext(), R.drawable.shadow_bg)); } } }); diff --git a/build.gradle b/build.gradle index 4c96c2e..e12786b 100644 --- a/build.gradle +++ b/build.gradle @@ -36,4 +36,4 @@ tasks.register('clean', Delete) { delete rootProject.buildDir } -dependencies {} +dependencies {} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 65cd2ad..2146027 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,25 +1,19 @@ -# Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. - -# For more details on how to configure your build environment visit +## For more details on how to configure your build environment visit # http://www.gradle.org/docs/current/userguide/build_environment.html - +# # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx10248m -XX:MaxPermSize=256m +# Default value: -Xmx1024m -XX:MaxPermSize=256m # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 - +# # When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# This option should only be used with decoupled projects. For more details, visit +# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects # org.gradle.parallel=true +#Wed Apr 17 19:53:26 CEST 2024 android.enableJetifier=false -android.useAndroidX=true -org.gradle.unsafe.configuration-cache=true -org.gradle.warning.mode=none -org.gradle.unsafe.configuration-cache-problems=warn +android.nonFinalResIds=true android.nonTransitiveRClass=false -android.nonFinalResIds=false +android.useAndroidX=true +org.gradle.jvmargs=-Xmx2048M +org.gradle.warning.mode=none diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 26d39ec..fd3cb44 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Sep 22 18:17:05 CEST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists