From e443af81b76eee2361dc8bdc2b8a5b1a66d9d856 Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 5 Jun 2022 10:47:25 -0400 Subject: [PATCH] Update Gradle and AGP (#12075) --- core/build.gradle.kts | 4 ++-- gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- lib/dataimage/build.gradle.kts | 6 +++--- lib/ratelimit/build.gradle.kts | 6 +++--- multisrc/build.gradle.kts | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index f93f0925c..90524827b 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -3,10 +3,10 @@ plugins { } android { - compileSdkVersion(AndroidConfig.compileSdk) + compileSdk = AndroidConfig.compileSdk defaultConfig { - minSdkVersion(AndroidConfig.minSdk) + minSdk = AndroidConfig.minSdk } sourceSets { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3ef11b451..545b49830 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ coroutines_version = "1.6.0" serialization_version = "1.3.2" [libraries] -gradle-agp = { module = "com.android.tools.build:gradle", version = "7.1.2" } +gradle-agp = { module = "com.android.tools.build:gradle", version = "7.2.1" } gradle-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin_version" } gradle-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin_version" } gradle-kotlinter = { module = "org.jmailen.gradle:kotlinter-gradle", version = "3.6.0" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 41dfb8790..aa991fcea 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/lib/dataimage/build.gradle.kts b/lib/dataimage/build.gradle.kts index ccad53c68..d02fbec56 100644 --- a/lib/dataimage/build.gradle.kts +++ b/lib/dataimage/build.gradle.kts @@ -4,11 +4,11 @@ plugins { } android { - compileSdkVersion(AndroidConfig.compileSdk) + compileSdk = AndroidConfig.compileSdk defaultConfig { - minSdkVersion(AndroidConfig.minSdk) - targetSdkVersion(AndroidConfig.targetSdk) + minSdk = AndroidConfig.minSdk + targetSdk = AndroidConfig.targetSdk } } diff --git a/lib/ratelimit/build.gradle.kts b/lib/ratelimit/build.gradle.kts index 38826a541..e8086827c 100644 --- a/lib/ratelimit/build.gradle.kts +++ b/lib/ratelimit/build.gradle.kts @@ -4,11 +4,11 @@ plugins { } android { - compileSdkVersion(AndroidConfig.compileSdk) + compileSdk = AndroidConfig.compileSdk defaultConfig { - minSdkVersion(AndroidConfig.minSdk) - targetSdkVersion(AndroidConfig.targetSdk) + minSdk = AndroidConfig.minSdk + targetSdk = AndroidConfig.targetSdk } } diff --git a/multisrc/build.gradle.kts b/multisrc/build.gradle.kts index 14644936a..b43002ce3 100644 --- a/multisrc/build.gradle.kts +++ b/multisrc/build.gradle.kts @@ -8,11 +8,11 @@ plugins { } android { - compileSdkVersion(AndroidConfig.compileSdk) + compileSdk = AndroidConfig.compileSdk defaultConfig { - minSdkVersion(29) - targetSdkVersion(AndroidConfig.targetSdk) + minSdk = 29 + targetSdk = AndroidConfig.targetSdk } }