From 6c28e5e0b7150c21ef16f2a2bb5bf4a277efedb5 Mon Sep 17 00:00:00 2001 From: THIS IS MY NAME Date: Wed, 27 Sep 2023 14:25:09 +0100 Subject: [PATCH] Clean up and Gradle 8.3 --- app/build.gradle | 8 ++------ app/src/main/res/values/strings.xml | 11 +++++------ build.gradle | 13 ------------- gradle/wrapper/gradle-wrapper.properties | 6 +++--- settings.gradle | 7 +++---- 5 files changed, 13 insertions(+), 32 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7b21f36..b6b1ac7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -51,17 +51,13 @@ dependencies { implementation 'com.google.android.material:material:1.9.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'com.android.volley:volley:1.2.1' - implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.preference:preference-ktx:1.2.1' implementation 'androidx.work:work-runtime-ktx:2.8.1' + //testImplementation 'junit:junit:' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' - //implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs') - // https://jitpack.io/com/github/AnyChart/AnyChart-Android/1.1.4/ - //implementation files('libs/AnyChart-Android-1.1.4.aar') - implementation files('libs/MPAndroidChart-v3.1.0.aar') - //implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' + implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' implementation 'me.xdrop:fuzzywuzzy:1.4.0' } \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 24d5c12..d1e6b07 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,9 +1,8 @@ - ornaassistant - laukas service + Orna Assistant + Orna Assistant Orna reader - - Hello blank fragment + Messages Sync @@ -20,6 +19,6 @@ Only download attachments when manually requested Settings Settings - \"ornaassistant\" - ornaassistant notification channel + \"Orna Assistant\" + Orna Assistant notification channel \ No newline at end of file diff --git a/build.gradle b/build.gradle index 85338eb..a9df75c 100644 --- a/build.gradle +++ b/build.gradle @@ -12,17 +12,4 @@ buildscript { // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } -} - -allprojects { - repositories { - jcenter() - flatDir { - dirs 'libs' - } - } -} - -task clean(type: Delete) { - delete rootProject.buildDir } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d999c98..44c7a95 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Sep 17 10:50:21 EEST 2021 +#Wed Sep 27 14:17:48 BST 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index 48dc841..01807db 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,13 +1,12 @@ import org.gradle.api.initialization.resolve.RepositoriesMode dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS) + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { google() mavenCentral() - - jcenter() // Warning: this repository is going to shut down soon + maven { url "https://jitpack.io" } } } rootProject.name = "ornaassistant" -include ':app' +include ':app' \ No newline at end of file