Merge remote-tracking branch 'origin/ultra'

# Conflicts:
#	app/src/main/java/org/astral/findmaimaiultra/ui/music/MusicFragment.java
#	app/src/main/java/org/astral/findmaimaiultra/ui/slideshow/SlideshowFragment.java
This commit is contained in:
2025-03-27 15:19:29 +08:00
2 changed files with 2 additions and 2 deletions

View File

@@ -1,4 +1,4 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins { plugins {
id 'com.android.application' version '8.0.0' apply false id 'com.android.application' version '8.0.0' apply false
} }

View File

@@ -1,4 +1,4 @@
#Mon Mar 24 18:05:49 CST 2025 #Tue Mar 25 23:00:18 HKT 2025
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip