diff --git a/gradle.properties b/gradle.properties index b14520e17..ea723e68d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -46,4 +46,6 @@ android.dependency.useConstraints=true android.generateSyncIssueWhenLibraryConstraintsAreEnabled=false android.r8.strictFullModeForKeepRules=false org.gradle.configuration-cache=true -android.newDsl=false \ No newline at end of file +android.newDsl=false +org.gradle.java.installations.auto-detect=true +org.gradle.java.installations.auto-download=false \ No newline at end of file diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties index 5c34300fa..63e5bbdf4 100644 --- a/gradle/gradle-daemon-jvm.properties +++ b/gradle/gradle-daemon-jvm.properties @@ -1,13 +1,2 @@ #This file is generated by updateDaemonJvm -toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/56a19bc915b9ba2eb62ba7554c61b919/redirect -toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/398ffe3949748bfb1d5636f023d228fd/redirect -toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/56a19bc915b9ba2eb62ba7554c61b919/redirect -toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/398ffe3949748bfb1d5636f023d228fd/redirect -toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e99bae143b75f9a10ead10248f02055e/redirect -toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/04e088f8677de3b384108493cc9481d0/redirect -toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/56a19bc915b9ba2eb62ba7554c61b919/redirect -toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/398ffe3949748bfb1d5636f023d228fd/redirect -toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e55dccbfe27cb97945148c61a39c89c5/redirect -toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/dbd05c4936d573642f94cd149e1356c8/redirect -toolchainVendor=JETBRAINS toolchainVersion=21 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c82ad3ff0..45353aab8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-all.zip -networkTimeout=10000 +networkTimeout=300000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index c94f12283..3b03df478 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,25 +7,15 @@ pluginManagement { includeGroupByRegex("androidx.*") } } - //原仓库 + maven { url 'https://maven.aliyun.com/repository/gradle-plugin' } + maven { url 'https://maven.aliyun.com/repository/public' } gradlePluginPortal() mavenCentral() - //镜像仓库,无法连接源仓库自行启用镜像仓库,不要提交修改 - //maven { url "https://maven-central-asia.storage-download.googleapis.com/maven2/" } - //maven { url 'https://maven.aliyun.com/repository/google' } - //maven { url 'https://maven.aliyun.com/repository/public' } - //maven { url 'https://maven.aliyun.com/repository/gradle-plugin' } - //maven { url 'https://repo.huaweicloud.com/repository/maven/' } } } -plugins { - id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' -} - dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { - //原仓库 google { content { includeGroupByRegex("com\\.android.*") @@ -33,6 +23,8 @@ dependencyResolutionManagement { includeGroupByRegex("androidx.*") } } + maven { url 'https://maven.aliyun.com/repository/google' } + maven { url 'https://maven.aliyun.com/repository/public' } maven { url = uri("https://jitpack.io") content { @@ -40,12 +32,6 @@ dependencyResolutionManagement { } } mavenCentral() - - //镜像仓库,无法连接源仓库自行启用镜像仓库,不要提交修改 - //maven { url "https://maven-central-asia.storage-download.googleapis.com/maven2/" } - //maven { url 'https://maven.aliyun.com/repository/google' } - //maven { url 'https://maven.aliyun.com/repository/public' } - //maven { url 'https://repo.huaweicloud.com/repository/maven/' } } } rootProject.name = 'legado'