From c692126b1a9430ed5386606c6a628a162f1bb264 Mon Sep 17 00:00:00 2001
From: sspanak <doftor.livain@gmail.com>
Date: Fri, 4 Aug 2023 10:10:32 +0300
Subject: [PATCH] upgraded: androidx.room 2.5.1 -> 2.5.2; androidx.preference
 1.2.0 -> 1.2.1

---
 build.gradle | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 28cd7737..13c45968 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
 apply plugin: 'com.android.application'
 apply plugin: 'at.zierler.yamlvalidator'
 
-configurations.all {
+configurations.configureEach {
 	// fixes 'duplicate class error', when using these combine: androidx.core:1.10.1, androidx.preference:1.2.0 and androidx.room:2.5.1
 	// see: https://stackoverflow.com/questions/75274720/a-failure-occurred-while-executing-appcheckdebugduplicateclasses/75315276#75315276
 	exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
@@ -26,9 +26,9 @@ configurations.all {
 
 dependencies {
 	implementation 'androidx.core:core:1.10.1'
-	implementation 'androidx.preference:preference:1.2.0'
-	implementation 'androidx.room:room-runtime:2.5.1'
-	annotationProcessor 'androidx.room:room-compiler:2.5.1'
+	implementation 'androidx.preference:preference:1.2.1'
+	implementation 'androidx.room:room-runtime:2.5.2'
+	annotationProcessor 'androidx.room:room-compiler:2.5.2'
 }
 
 repositories {
@@ -305,8 +305,9 @@ task validateLanguages {
 }
 
 android {
-	buildToolsVersion "33.0.0"
-	compileSdkVersion 33
+	defaultConfig {
+		compileSdk 33
+	}
 	namespace "io.github.sspanak.tt9"
 
 	sourceSets {
@@ -358,7 +359,7 @@ android {
 	}
 
 
-	applicationVariants.all { variant ->
+	applicationVariants.configureEach { variant ->
 		tasks["merge${variant.name.capitalize()}Assets"]
 			.dependsOn(validateYaml)
 			.dependsOn(validateLanguages)