From 0372c20d4844244a7b08da6bee5c171dd90175b9 Mon Sep 17 00:00:00 2001
From: Michel Roux <xefir@crystalyx.net>
Date: Wed, 26 Oct 2022 14:28:05 +0200
Subject: [PATCH] Update project

---
 .gitignore        |  1 -
 app/build.gradle  |  1 -
 build.gradle      | 29 +++--------------------------
 gradle.properties | 10 +++++++++-
 settings.gradle   | 14 ++++++++++++++
 5 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/.gitignore b/.gitignore
index 593af09..10cfdbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,3 @@
 .externalNativeBuild
 .cxx
 local.properties
-*.jks
diff --git a/app/build.gradle b/app/build.gradle
index c097057..2f990ab 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,7 +4,6 @@ plugins {
 
 android {
     compileSdkVersion 32
-    buildToolsVersion "30.0.3"
     namespace "net.crystalyx.setaswallpaper"
 
     defaultConfig {
diff --git a/build.gradle b/build.gradle
index e2c2b6f..9d4048d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,28 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
+plugins {
+    id 'com.android.application' version '7.3.1' apply false
+    id 'com.android.library' version '7.3.1' apply false
 }
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    tasks.withType(JavaCompile) {
-        options.deprecation = true
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index fbf26e6..a03b354 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,4 +10,12 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
\ No newline at end of file
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=true
diff --git a/settings.gradle b/settings.gradle
index 71ae22e..ba1067c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,16 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
 rootProject.name = "SetAsWallpaper"
 include ':app'