From 72ca1b8d190090b55d3153a48c9e04a1df0ff508 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 02 六月 2023 14:23:32 +0800
Subject: [PATCH] Merge branch 'wjc'
---
settings.gradle | 14 -------
build.gradle | 44 ++++++++++++++++++++-
gradle/wrapper/gradle-wrapper.properties | 4 +-
3 files changed, 43 insertions(+), 19 deletions(-)
diff --git a/build.gradle b/build.gradle
index 905d3bd..a255faa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,45 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
-plugins {
- id 'com.android.application' version '7.1.3' apply false
- id 'com.android.library' version '7.1.3' apply false
+
+
+buildscript {
+ repositories {
+ google()
+ mavenCentral()
+ maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' }
+ maven { url = uri("https://plugins.gradle.org/m2/") }
+ maven {
+ url "https://jitpack.io"
+ }
+ }
+ dependencies {
+ classpath "com.android.tools.build:gradle:4.1.2"
+ classpath 'io.github.didi.dokit:dokitx-plugin:3.5.0.1'
+ // NOTE: Do not place your application dependencies here; they belong
+ // in the individual module build.gradle files
+ }
+}
+
+allprojects {
+ repositories {
+ google()
+ mavenCentral()
+ maven { url 'https://maven.aliyun.com/repository/google' }
+ maven { url 'https://maven.aliyun.com/repository/jcenter' }
+ maven { url 'https://maven.aliyun.com/repository/public' }
+ maven { url "https://jitpack.io" }
+ maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' }
+ maven { url = uri("https://plugins.gradle.org/m2/") }
+ maven {
+ url 'https://maven.aliyun.com/repository/public'
+ }
+ maven {
+ credentials {
+ username '5f067ef57cd41782836ff14b'
+ password 'RyTWP(4APhV8'
+ }
+ url 'https://packages.aliyun.com/maven/repository/2012126-release-Mc0DNo/'
+ }
+ }
}
task clean(type: Delete) {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 16e585a..70b7708 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri May 26 09:40:23 CST 2023
+#Fri Jun 02 13:57:41 CST 2023
distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle b/settings.gradle
index ff1df1f..d2a636d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,16 +1,2 @@
-pluginManagement {
- repositories {
- gradlePluginPortal()
- google()
- mavenCentral()
- }
-}
-dependencyResolutionManagement {
- repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
- repositories {
- google()
- mavenCentral()
- }
-}
rootProject.name = "PhotovoltaicDebug"
include ':app'
--
Gitblit v1.8.0