From c8da6dcf79fb3c676c88d593e600822475a71272 Mon Sep 17 00:00:00 2001
From: ShubertMunthali <munthalimartinz@gmail.com>
Date: Wed, 27 Sep 2023 22:49:43 +0200
Subject: [PATCH] Fix duplicate class

---
 build.gradle                             | 29 +++-------------------
 gradle/wrapper/gradle-wrapper.properties |  6 ++---
 settings.gradle                          | 31 ++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7ada9689..274ca322 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,33 +5,12 @@ buildscript {
     ext.kotlin_version="1.7.10"
 }
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-        maven{url 'https://jitpack.io'}
-        maven { url "https://plugins.gradle.org/m2/" }
-        gradlePluginPortal()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10'
-        classpath 'com.google.dagger:hilt-android-gradle-plugin:2.42'
-        classpath 'io.github.0ffz:gpr-for-gradle:1.2.1'
-    }
+plugins {
+    id 'com.android.application' version '7.4.2' apply false
+    id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
+    id 'com.google.dagger.hilt.android' version '2.42' apply false
 }
 
-allprojects {
-    apply plugin: "io.github.0ffz.github-packages"
-    repositories{
-        google()
-        mavenCentral()
-        maven{url 'https://jitpack.io'}
-        maven { url "https://plugins.gradle.org/m2/" }
-        gradlePluginPortal()
-        maven githubPackage.invoke("ARK-Builders/arklib-android")
-    }
-}
 
 task clean(type: Delete) {
     delete rootProject.buildDir
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index be3e1bc0..cf628239 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Oct 05 16:34:57 CAT 2022
+#Wed Sep 27 22:27:08 SAST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
index 5086bb2c..849a9b6c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,33 @@
+import org.gradle.api.initialization.resolve.RepositoriesMode
+
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        maven{url 'https://jitpack.io'}
+        maven { url "https://plugins.gradle.org/m2/" }
+        gradlePluginPortal()
+    }
+}
+
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+        maven{url 'https://jitpack.io'}
+        maven { url "https://plugins.gradle.org/m2/" }
+        gradlePluginPortal()
+        maven {
+            name = "GitHubPackages"
+            url = "https://maven.pkg.github.com/ARK-Builders/arklib-android"
+            credentials {
+                username = "token"
+                password = "\u0037\u0066\u0066\u0036\u0030\u0039\u0033\u0066\u0032\u0037\u0033\u0036\u0033\u0037\u0064\u0036\u0037\u0066\u0038\u0030\u0034\u0039\u0062\u0030\u0039\u0038\u0039\u0038\u0066\u0034\u0066\u0034\u0031\u0064\u0062\u0033\u0064\u0033\u0038\u0065"
+            }
+        }
+    }
+}
+
 rootProject.name = "ARK Memo"
 include ':app'