From 62f64a126bdf1189b679203e001131f50042f053 Mon Sep 17 00:00:00 2001
From: kunminx <kunminx@gmail.com>
Date: Fri, 22 Jul 2022 11:49:55 +0800
Subject: [PATCH] modify gradle version

---
 app/build.gradle                         | 11 ++++++++---
 architecture/build.gradle                | 13 +++++++++----
 build.gradle                             |  7 ++-----
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 player/build.gradle                      | 12 +++++++++---
 5 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index fe26991..8cb8959 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: "com.android.application"
 
 android {
-    compileSdk appTargetSdk
+    compileSdkVersion appTargetSdk
     defaultConfig {
         applicationId "com.kunminx.puremusic"
-        minSdk appMinSdk
-        targetSdk appTargetSdk
+        minSdkVersion appMinSdk
+        targetSdkVersion appTargetSdk
         versionCode appVersionCode
         versionName appVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -35,6 +35,11 @@ android {
     buildFeatures {
         dataBinding true
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
diff --git a/architecture/build.gradle b/architecture/build.gradle
index d9954a4..85174d3 100644
--- a/architecture/build.gradle
+++ b/architecture/build.gradle
@@ -17,10 +17,10 @@
 apply plugin: "com.android.library"
 
 android {
-    compileSdk appTargetSdk
+    compileSdkVersion appTargetSdk
     defaultConfig {
-        minSdk appMinSdk
-        targetSdk appTargetSdk
+        minSdkVersion appMinSdk
+        targetSdkVersion appTargetSdk
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -28,6 +28,11 @@ android {
     buildFeatures {
         dataBinding true
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 
@@ -39,7 +44,7 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
 
     api "androidx.appcompat:appcompat:1.4.2"
-    api "androidx.navigation:navigation-runtime:$navigationVersion"
+    api "androidx.navigation:navigation-runtime:2.5.0"
 
     api 'com.kunminx.arch:unpeek-livedata:7.6.0'
     api 'com.kunminx.arch:smooth-navigation:4.0.0-beta1'
diff --git a/build.gradle b/build.gradle
index bbad5af..9c80145 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,3 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 apply plugin: 'io.codearte.nexus-staging'
 
 buildscript {
@@ -10,8 +8,6 @@ buildscript {
         appVersionName = "3.7.0"
         lifecycleVersion = "2.4.1"
         navigationVersion = "2.4.2"
-        retrofitVersion = "2.9.0"
-        okHttpVersion = "4.9.3"
     }
 
     repositories {
@@ -20,7 +16,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.30.0'
     }
@@ -37,6 +33,7 @@ allprojects {
     repositories {
         google()
         mavenCentral()
+        maven { url 'https://jitpack.io' }
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 30ac0e1..aa8a49f 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.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
diff --git a/player/build.gradle b/player/build.gradle
index 658f602..c0d1fec 100644
--- a/player/build.gradle
+++ b/player/build.gradle
@@ -15,6 +15,8 @@
  */
 
 apply plugin: 'com.android.library'
+apply plugin: 'com.github.dcendents.android-maven'
+group = 'com.github.KunMinX'
 
 ext {
     PUBLISH_GROUP_ID = 'com.kunminx.player'
@@ -45,10 +47,10 @@ apply from: "${rootProject.projectDir}/publish-mavencentral.gradle"
 
 
 android {
-    compileSdk appTargetSdk
+    compileSdkVersion appTargetSdk
     defaultConfig {
-        minSdk appMinSdk
-        targetSdk appTargetSdk
+        minSdkVersion appMinSdk
+        targetSdkVersion appTargetSdk
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
@@ -66,6 +68,10 @@ android {
         abortOnError false
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {