From 6694d6f60bb6e0ea2a36d54ccb49c1079a7fd23c Mon Sep 17 00:00:00 2001
From: birdbird <6892457-tzugen@users.noreply.gitlab.com>
Date: Thu, 20 Apr 2023 11:24:28 +0000
Subject: [PATCH] Update Gradle plugin to v8
---
fastlane/metadata/android/en-US/full_description.txt | 4 ++--
gradle.properties | 11 ++++++++++-
gradle/libs.versions.toml | 2 +-
ultrasonic/build.gradle | 1 +
ultrasonic/src/main/AndroidManifest.xml | 1 -
.../main/kotlin/org/moire/ultrasonic/util/Storage.kt | 3 ++-
6 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
index fcf6a32d..18d5f968 100644
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -3,12 +3,12 @@ Ultrasonic is a Subsonic (and compatible servers) client to Android. You can use
Main features:
* Thin
* Fast
-* Dark and light theme
+* Material theme with dark and light variants
* Multiple server support
* Offline Mode
* Bookmarks
* Playlists on server
-* Ramdom play
+* Random play
* Jukebox mode
* Server chat
* And much more!!!
diff --git a/gradle.properties b/gradle.properties
index a7c0d4f8..7ab3793a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,10 +4,19 @@ org.gradle.configureondemand=true
org.gradle.caching=true
org.gradle.jvmargs=-Xmx2g -XX:+UseParallelGC
-
kotlin.incremental=true
kotlin.caching.enabled=true
kotlin.incremental.usePreciseJavaTracking=true
android.useAndroidX=true
android.enableJetifier=false
+
+# This properties enables transitive Resource classes, which decreases build time,
+# but could lead to problems referencing Resources. Set them to false if needed.
+android.nonTransitiveRClass=true
+android.nonFinalResIds=true
+
+# This config was suggested by Android Studio to reduce build time
+# It can be removed if it makes problems
+org.gradle.unsafe.configuration-cache=true
+
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ca7906c4..0e8244f7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@
gradle = "7.6"
navigation = "2.5.3"
-gradlePlugin = "7.4.2"
+gradlePlugin = "8.0.0"
androidxcore = "1.10.0"
ktlint = "0.43.2"
ktlintGradle = "11.3.1"
diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle
index d3d23252..bf38f5cf 100644
--- a/ultrasonic/build.gradle
+++ b/ultrasonic/build.gradle
@@ -56,6 +56,7 @@ android {
buildFeatures {
viewBinding true
dataBinding true
+ buildConfig true
}
compileOptions {
diff --git a/ultrasonic/src/main/AndroidManifest.xml b/ultrasonic/src/main/AndroidManifest.xml
index 8be19a15..a9b35248 100644
--- a/ultrasonic/src/main/AndroidManifest.xml
+++ b/ultrasonic/src/main/AndroidManifest.xml
@@ -7,7 +7,6 @@
-
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Storage.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Storage.kt
index 73022b81..f6b5b9d2 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Storage.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Storage.kt
@@ -16,7 +16,8 @@ import timber.log.Timber
/**
* Provides filesystem access abstraction which works
- * both on File based paths and Storage Access Framework Uris
+ * both on File based paths (when using the internal directory for storing media files)
+ * and Storage Access Framework Uris (when using a custom directory)
*/
object Storage {