From 54f858bcd56568f7a0a681262a4cf67b303354fa Mon Sep 17 00:00:00 2001
From: gengbeibei <358031923@qq.com>
Date: Tue, 14 Sep 2021 09:50:03 +0800
Subject: [PATCH] 1.3.1

---
 app/build.gradle                         | 16 ++--------------
 build.gradle                             |  8 +++++---
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 xiayuCommon/build.gradle                 |  6 +++---
 4 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 278c167..d54b7e8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,20 +24,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
-        useIR = true
-    }
-    buildFeatures {
-        compose true
-    }
-}
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 
diff --git a/build.gradle b/build.gradle
index a6d368f..664b4c3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,11 +16,13 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.0.1"
+        classpath "com.android.tools.build:gradle:4.1.3"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        
+
         // https://developer.android.google.cn/studio/releases/gradle-plugin#updating-plugin
-        classpath "digital.wup:android-maven-publish:3.6.3"
+        // classpath "digital.wup:android-maven-publish:3.6.3"
+        //1.自动化maven打包插件
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6544103..8ca4afe 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/xiayuCommon/build.gradle b/xiayuCommon/build.gradle
index b10bd05..ec9d5c5 100644
--- a/xiayuCommon/build.gradle
+++ b/xiayuCommon/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'com.android.library'
-    id "digital.wup.android-maven-publish"
+    id 'com.github.dcendents.android-maven'
 }
 
 def siteUrl = 'https://github.com/LoveBabyForeve/xiayucommon'     //项目在github主页地址
@@ -35,8 +35,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 }