Skip to content

Commit

Permalink
Clean up and Gradle 8.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Lloir committed Sep 27, 2023
1 parent 1bf2d1e commit 6c28e5e
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 32 deletions.
8 changes: 2 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
11 changes: 5 additions & 6 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<resources>
<string name="app_name">ornaassistant</string>
<string name="accessibility_service_label">laukas service</string>
<string name="app_name">Orna Assistant</string>
<string name="accessibility_service_label">Orna Assistant</string>
<string name="accessibility_service_description">Orna reader</string>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>

<!-- Preference Titles -->
<string name="messages_header">Messages</string>
<string name="sync_header">Sync</string>
Expand All @@ -20,6 +19,6 @@
<string name="attachment_summary_off">Only download attachments when manually requested</string>
<string name="action_settings">Settings</string>
<string name="settings">Settings</string>
<string name="channel_name">\"ornaassistant\"</string>
<string name="channel_description">ornaassistant notification channel</string>
<string name="channel_name">\"Orna Assistant\"</string>
<string name="channel_description">Orna Assistant notification channel</string>
</resources>
13 changes: 0 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
7 changes: 3 additions & 4 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -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'

0 comments on commit 6c28e5e

Please sign in to comment.