From 15d68b9deaa861ea4d5cb7b74aea9313f0b8a708 Mon Sep 17 00:00:00 2001
From: "Mira.Fontan" <mira.fontan@gmail.com>
Date: Fri, 10 Nov 2023 20:44:46 +0100
Subject: [PATCH] Modernize some libraries

---
 .idea/kotlinc.xml | 2 +-
 app/build.gradle  | 8 ++++----
 build.gradle      | 8 ++++----
 iap/build.gradle  | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index c8378aa..8fa75fe 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -4,6 +4,6 @@
     <option name="jvmTarget" value="11" />
   </component>
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.0" />
+    <option name="version" value="1.9.20" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index c0cdc64..56794d0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,7 +21,7 @@ keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
     compileSdk 34
-    buildToolsVersion '33.0.2'
+    buildToolsVersion = '34.0.0'
     signingConfigs {
         release {
             storeFile file(keystoreProperties['storeFile'])
@@ -57,7 +57,7 @@ android {
         excludeFilter = file("$rootDir/gradle/config/excludeFilter.xml")
     }
 
-    applicationVariants.all { variant ->
+    applicationVariants.configureEach { variant ->
         variant.resValue "string", "versionName", gitVersionName
     }
 
@@ -196,7 +196,7 @@ android {
 }
 
 dependencies {
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.0'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.20'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
     implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.7.0-alpha03'
@@ -207,7 +207,7 @@ dependencies {
     implementation 'androidx.preference:preference-ktx:1.2.1'
     implementation 'androidx.test.espresso:espresso-idling-resource:3.5.1'
     implementation 'androidx.core:core-splashscreen:1.0.1'
-    implementation 'com.google.android.gms:play-services-ads:22.4.0'
+    implementation 'com.google.android.gms:play-services-ads:22.5.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
diff --git a/build.gradle b/build.gradle
index e16c3d4..e5b75af 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.9.0'
+    ext.kotlin_version = '1.9.20'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.2'
+        classpath 'com.android.tools.build:gradle:8.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.ajoberstar:grgit:1.7.2"
         // NOTE: Do not place your application dependencies here; they belong
@@ -21,11 +21,11 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
 
-tasks.withType(Test) {
+tasks.withType(Test).configureEach {
     testLogging {
         exceptionFormat "full"
         events "started", "skipped", "passed", "failed"
diff --git a/iap/build.gradle b/iap/build.gradle
index b6f7d43..486eb2e 100644
--- a/iap/build.gradle
+++ b/iap/build.gradle
@@ -6,10 +6,9 @@ plugins {
 
 android {
     compileSdk 34
-    buildToolsVersion '33.0.2'
 
     defaultConfig {
-        minSdk 16
+        minSdk 21
         targetSdk 34
     }
 
@@ -34,6 +33,7 @@ android {
     }
     namespace 'com.aemerse.iap'
     ndkVersion '25.2.9519653'
+    buildToolsVersion = '34.0.0'
 }
 
 dependencies {