From 164976f8ae9007d1fef5611298b200e70e94b74c Mon Sep 17 00:00:00 2001
From: Gary Wang <wzc782970009@gmail.com>
Date: Sat, 12 Feb 2022 00:20:02 +0800
Subject: [PATCH] update compose version, new style gradle configuration

---
 app/build.gradle |  2 +-
 build.gradle     | 19 ++++++-------------
 settings.gradle  |  8 +++++++-
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 82004fb..68d70a3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -60,7 +60,7 @@ dependencies {
     implementation "androidx.compose.material:material-icons-extended:$compose_version"
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
 
-    def nav_compose_version = '2.4.0-rc01'
+    def nav_compose_version = '2.4.1'
     implementation "androidx.navigation:navigation-compose:$nav_compose_version"
 
     def lifecycle_version = '2.4.0'
diff --git a/build.gradle b/build.gradle
index 32b7123..8b18604 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,20 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        kotlin_version = '1.6.0'
-        compose_version = '1.1.0-rc01'
-    }
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        compose_version = '1.1.0'
     }
+}// Top-level build file where you can add configuration options common to all sub-projects/modules.
+plugins {
+    id 'com.android.application' version '7.1.1' apply false
+    id 'com.android.library' version '7.1.1' apply false
+    id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
 }
 
 task clean(type: Delete) {
diff --git a/settings.gradle b/settings.gradle
index 97e85de..6a66790 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,9 +1,15 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+    }
+}
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
         google()
         mavenCentral()
-        jcenter() // Warning: this repository is going to shut down soon
     }
 }
 rootProject.name = "Private Cloud Music"