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:
@@ -1,4 +1,4 @@
|
||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||
plugins {
|
||||
id 'com.android.application' version '8.0.0' apply false
|
||||
}
|
||||
}
|
||||
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,4 +1,4 @@
|
||||
#Mon Mar 24 18:05:49 CST 2025
|
||||
#Tue Mar 25 23:00:18 HKT 2025
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
|
||||
|
||||
Reference in New Issue
Block a user