From 0f129109ba25cace9a0e09cc4ed7d26668daa5ab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 Jul 2023 19:00:17 +0000
Subject: [PATCH] Bump com.android.tools.build:gradle from 8.0.2 to 8.1.0
 (#2266)

---
 app/build.gradle                         | 26 ++++++++++++------------
 build.gradle                             |  6 +++---
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d43b667c..74ef02bc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,6 @@
+import com.github.triplet.gradle.androidpublisher.ReleaseStatus
+import ru.cian.huawei.publish.ReleaseNote
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlinx-serialization'
@@ -17,7 +20,7 @@ apply from: 'hooks.gradle'
 
 android {
     namespace 'io.github.wulkanowy'
-    compileSdkVersion 33
+    compileSdk 33
 
     defaultConfig {
         applicationId "io.github.wulkanowy"
@@ -78,7 +81,7 @@ android {
         }
     }
 
-    flavorDimensions "platform"
+    flavorDimensions += "platform"
 
     productFlavors {
         hms {
@@ -117,20 +120,20 @@ android {
         }
     }
 
-    testOptions.unitTests {
-        includeAndroidResources = true
+    testOptions {
+        unitTests.includeAndroidResources = true
         // workaround HMS test errors https://github.com/robolectric/robolectric/issues/2750
-        all { jvmArgs '-noverify' }
+        unitTests.all { jvmArgs '-noverify' }
     }
 
     compileOptions {
         coreLibraryDesugaringEnabled true
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
         freeCompilerArgs += ["-opt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"]
     }
 
@@ -152,14 +155,11 @@ kapt {
 ksp {
     arg("room.schemaLocation", "$projectDir/schemas".toString())
 }
-kotlin {
-    jvmToolchain(11)
-}
 
 play {
     defaultToAppBundles = false
     track = 'production'
-    releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
+    releaseStatus = ReleaseStatus.IN_PROGRESS
     userFraction = 0.25d
     updatePriority = 1
     enabled.set(false)
@@ -172,7 +172,7 @@ huaweiPublish {
             buildFormat = "aab"
             deployType = "publish"
             releaseNotes = [
-                new ru.cian.huawei.publish.ReleaseNote(
+                new ReleaseNote(
                     "pl-PL",
                     "$projectDir/src/main/play/release-notes/pl-PL/default.txt"
                 )
diff --git a/build.gradle b/build.gradle
index 9584caac..c5a6f598 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,12 +14,12 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
         classpath "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:$kotlin_version-1.0.11"
-        classpath 'com.android.tools.build:gradle:8.0.2'
+        classpath 'com.android.tools.build:gradle:8.1.0'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.huawei.agconnect:agcp:1.9.1.300'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.7'
-        classpath "com.github.triplet.gradle:play-publisher:3.6.0"
+        classpath "com.github.triplet.gradle:play-publisher:3.8.4"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.4.0"
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.3.0.3225"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
@@ -37,6 +37,6 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8707e8b5..9b0a13f0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists