From 25e92666e0cdf7f1eb7f32a239efa6e1eeed9500 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Thu, 24 Jul 2025 09:53:00 -0400 Subject: [PATCH] Adjusts the gradle DSL language to the latest deprecations --- amethyst/build.gradle | 30 +++++++++++++++--------------- ammolite/build.gradle | 12 ++++++------ benchmark/build.gradle | 12 ++++++------ commons/build.gradle | 12 ++++++------ quartz/build.gradle | 12 ++++++------ settings.gradle | 6 +++--- 6 files changed, 42 insertions(+), 42 deletions(-) diff --git a/amethyst/build.gradle b/amethyst/build.gradle index bb29832c2..0c1e6af16 100644 --- a/amethyst/build.gradle +++ b/amethyst/build.gradle @@ -9,20 +9,20 @@ plugins { } android { - namespace 'com.vitorpamplona.amethyst' - compileSdk libs.versions.android.compileSdk.get().toInteger() + namespace = 'com.vitorpamplona.amethyst' + compileSdk = libs.versions.android.compileSdk.get().toInteger() defaultConfig { - applicationId "com.vitorpamplona.amethyst" - minSdk libs.versions.android.minSdk.get().toInteger() - targetSdk libs.versions.android.targetSdk.get().toInteger() - versionCode 418 - versionName "0.94.3" + applicationId = "com.vitorpamplona.amethyst" + minSdk = libs.versions.android.minSdk.get().toInteger() + targetSdk = libs.versions.android.targetSdk.get().toInteger() + versionCode = 418 + versionName = "0.94.3" buildConfigField "String", "RELEASE_NOTES_ID", "\"fd42b23b9ef792059b1c1a89555443abbb11578f4b3c8430b452559eec7325f3\"" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { - useSupportLibrary true + useSupportLibrary = true } resourceConfigurations += [ 'ar', @@ -107,7 +107,7 @@ android { buildTypes { release { proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), 'proguard-rules.pro' - minifyEnabled true + minifyEnabled = true } debug { applicationIdSuffix '.debug' @@ -119,8 +119,8 @@ android { applicationIdSuffix '.benchmark' versionNameSuffix '-BENCHMARK' resValue "string", "app_name", "@string/app_name_benchmark" - profileable true - signingConfig signingConfigs.debug + profileable = true + signingConfig = signingConfigs.debug } } @@ -139,10 +139,10 @@ android { splits { abi { - enable true + enable = true reset() include "x86", "x86_64", "arm64-v8a", "armeabi-v7a" - universalApk true + universalApk = true } } @@ -152,8 +152,8 @@ android { } buildFeatures { - compose true - buildConfig true + compose = true + buildConfig = true } packagingOptions { diff --git a/ammolite/build.gradle b/ammolite/build.gradle index ecd515719..ec74b8808 100644 --- a/ammolite/build.gradle +++ b/ammolite/build.gradle @@ -6,12 +6,12 @@ plugins { } android { - namespace 'com.vitorpamplona.ammolite' - compileSdk libs.versions.android.compileSdk.get().toInteger() + namespace = 'com.vitorpamplona.ammolite' + compileSdk = libs.versions.android.compileSdk.get().toInteger() defaultConfig { - minSdk libs.versions.android.minSdk.get().toInteger() - targetSdk libs.versions.android.targetSdk.get().toInteger() + minSdk = libs.versions.android.minSdk.get().toInteger() + targetSdk = libs.versions.android.targetSdk.get().toInteger() testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" @@ -23,12 +23,12 @@ android { buildTypes { release { - minifyEnabled true + minifyEnabled = true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } create("benchmark") { initWith(getByName("release")) - signingConfig signingConfigs.debug + signingConfig = signingConfigs.debug } } compileOptions { diff --git a/benchmark/build.gradle b/benchmark/build.gradle index 2f907d171..a45aa4aae 100644 --- a/benchmark/build.gradle +++ b/benchmark/build.gradle @@ -7,12 +7,12 @@ plugins { } android { - namespace 'com.vitorpamplona.amethyst.benchmark' - compileSdk libs.versions.android.compileSdk.get().toInteger() + namespace = 'com.vitorpamplona.amethyst.benchmark' + compileSdk = libs.versions.android.compileSdk.get().toInteger() defaultConfig { - minSdk libs.versions.android.minSdk.get().toInteger() - targetSdk libs.versions.android.targetSdk.get().toInteger() + minSdk = libs.versions.android.minSdk.get().toInteger() + targetSdk = libs.versions.android.targetSdk.get().toInteger() // Enable measuring on an emulator, or devices with low battery testInstrumentationRunner 'androidx.benchmark.junit4.AndroidBenchmarkRunner' @@ -36,12 +36,12 @@ android { } release { isDefault = false - minifyEnabled true + minifyEnabled = true } create("benchmark") { isDefault = true initWith(getByName("release")) - signingConfig signingConfigs.debug + signingConfig = signingConfigs.debug } } } diff --git a/commons/build.gradle b/commons/build.gradle index 37614f930..82c054688 100644 --- a/commons/build.gradle +++ b/commons/build.gradle @@ -7,12 +7,12 @@ plugins { } android { - namespace 'com.vitorpamplona.amethyst.commons' - compileSdk libs.versions.android.compileSdk.get().toInteger() + namespace = 'com.vitorpamplona.amethyst.commons' + compileSdk = libs.versions.android.compileSdk.get().toInteger() defaultConfig { - minSdk libs.versions.android.minSdk.get().toInteger() - targetSdk libs.versions.android.targetSdk.get().toInteger() + minSdk = libs.versions.android.minSdk.get().toInteger() + targetSdk = libs.versions.android.targetSdk.get().toInteger() testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" @@ -25,7 +25,7 @@ android { } create("benchmark") { initWith(getByName("release")) - signingConfig signingConfigs.debug + signingConfig = signingConfigs.debug } } compileOptions { @@ -34,7 +34,7 @@ android { } buildFeatures { - compose true + compose = true } } diff --git a/quartz/build.gradle b/quartz/build.gradle index 2b584d077..d022c5f5b 100644 --- a/quartz/build.gradle +++ b/quartz/build.gradle @@ -6,12 +6,12 @@ plugins { } android { - namespace 'com.vitorpamplona.quartz' - compileSdk libs.versions.android.compileSdk.get().toInteger() + namespace = 'com.vitorpamplona.quartz' + compileSdk = libs.versions.android.compileSdk.get().toInteger() defaultConfig { - minSdk libs.versions.android.minSdk.get().toInteger() - targetSdk libs.versions.android.targetSdk.get().toInteger() + minSdk = libs.versions.android.minSdk.get().toInteger() + targetSdk = libs.versions.android.targetSdk.get().toInteger() testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" @@ -19,12 +19,12 @@ android { buildTypes { release { - minifyEnabled true + minifyEnabled = true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } create("benchmark") { initWith(getByName("release")) - signingConfig signingConfigs.debug + signingConfig = signingConfigs.debug } } compileOptions { diff --git a/settings.gradle b/settings.gradle index 4208f4fde..0a0b52faa 100644 --- a/settings.gradle +++ b/settings.gradle @@ -10,7 +10,7 @@ pluginManagement { mavenCentral() gradlePluginPortal() maven { - url "https://jitpack.io" + url = "https://jitpack.io" content { includeModule 'com.github.UnifiedPush', 'android-connector' } @@ -23,8 +23,8 @@ dependencyResolutionManagement { repositories { google() mavenCentral() - maven { url "https://jitpack.io" } - maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" } + maven { url = "https://jitpack.io" } + maven { url = "https://raw.githubusercontent.com/guardianproject/gpmaven/master" } } }