From 74f70dea8825407b8bb42d3b6de5018681b8ac86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= <dev@ensarsarajcic.com>
Date: Tue, 12 Sep 2023 12:04:21 +0200
Subject: [PATCH] Update commons version and clean up gradle deprecation
 warnings

---
 app/build.gradle.kts             | 6 +++++-
 app/src/main/AndroidManifest.xml | 3 +--
 gradle/libs.versions.toml        | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index eb3f768..60b2110 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
     alias(libs.plugins.android)
     alias(libs.plugins.kotlinAndroid)
     alias(libs.plugins.ksp)
+    base
 }
 
 val keystorePropertiesFile: File = rootProject.file("keystore.properties")
@@ -14,6 +15,10 @@ if (keystorePropertiesFile.exists()) {
     keystoreProperties.load(FileInputStream(keystorePropertiesFile))
 }
 
+base {
+    archivesName.set("clock")
+}
+
 android {
     compileSdk = project.libs.versions.app.build.compileSDKVersion.get().toInt()
 
@@ -23,7 +28,6 @@ android {
         targetSdk = project.libs.versions.app.build.targetSDK.get().toInt()
         versionName = project.libs.versions.app.version.versionName.get()
         versionCode = project.libs.versions.app.version.versionCode.get().toInt()
-        setProperty("archivesBaseName", "clock")
         ksp {
             arg("room.schemaLocation", "$projectDir/schemas")
         }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7b7233c..6ff696c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.simplemobiletools.clock">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="com.android.alarm.permission.SET_ALARM" />
     <uses-permission android:name="android.permission.VIBRATE" />
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c53354f..f696cb8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -17,9 +17,9 @@ kotlinx-coroutines = "1.7.3"
 #NumberPicker
 numberpicker = "2.4.13"
 #Room
-room = "2.6.0-alpha02"
+room = "2.6.0-beta01"
 #Simple tools
-simple-commons = "b80b717ad3"
+simple-commons = "25d031dc00"
 #Stetho
 stetho = "1.6.0"
 #Gradle