Adjusts the gradle DSL language to the latest deprecations

This commit is contained in:
Vitor Pamplona
2025-07-24 09:53:00 -04:00
parent e76bffd048
commit 25e92666e0
6 changed files with 42 additions and 42 deletions
+15 -15
View File
@@ -9,20 +9,20 @@ plugins {
} }
android { android {
namespace 'com.vitorpamplona.amethyst' namespace = 'com.vitorpamplona.amethyst'
compileSdk libs.versions.android.compileSdk.get().toInteger() compileSdk = libs.versions.android.compileSdk.get().toInteger()
defaultConfig { defaultConfig {
applicationId "com.vitorpamplona.amethyst" applicationId = "com.vitorpamplona.amethyst"
minSdk libs.versions.android.minSdk.get().toInteger() minSdk = libs.versions.android.minSdk.get().toInteger()
targetSdk libs.versions.android.targetSdk.get().toInteger() targetSdk = libs.versions.android.targetSdk.get().toInteger()
versionCode 418 versionCode = 418
versionName "0.94.3" versionName = "0.94.3"
buildConfigField "String", "RELEASE_NOTES_ID", "\"fd42b23b9ef792059b1c1a89555443abbb11578f4b3c8430b452559eec7325f3\"" buildConfigField "String", "RELEASE_NOTES_ID", "\"fd42b23b9ef792059b1c1a89555443abbb11578f4b3c8430b452559eec7325f3\""
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables { vectorDrawables {
useSupportLibrary true useSupportLibrary = true
} }
resourceConfigurations += [ resourceConfigurations += [
'ar', 'ar',
@@ -107,7 +107,7 @@ android {
buildTypes { buildTypes {
release { release {
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), 'proguard-rules.pro' proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), 'proguard-rules.pro'
minifyEnabled true minifyEnabled = true
} }
debug { debug {
applicationIdSuffix '.debug' applicationIdSuffix '.debug'
@@ -119,8 +119,8 @@ android {
applicationIdSuffix '.benchmark' applicationIdSuffix '.benchmark'
versionNameSuffix '-BENCHMARK' versionNameSuffix '-BENCHMARK'
resValue "string", "app_name", "@string/app_name_benchmark" resValue "string", "app_name", "@string/app_name_benchmark"
profileable true profileable = true
signingConfig signingConfigs.debug signingConfig = signingConfigs.debug
} }
} }
@@ -139,10 +139,10 @@ android {
splits { splits {
abi { abi {
enable true enable = true
reset() reset()
include "x86", "x86_64", "arm64-v8a", "armeabi-v7a" include "x86", "x86_64", "arm64-v8a", "armeabi-v7a"
universalApk true universalApk = true
} }
} }
@@ -152,8 +152,8 @@ android {
} }
buildFeatures { buildFeatures {
compose true compose = true
buildConfig true buildConfig = true
} }
packagingOptions { packagingOptions {
+6 -6
View File
@@ -6,12 +6,12 @@ plugins {
} }
android { android {
namespace 'com.vitorpamplona.ammolite' namespace = 'com.vitorpamplona.ammolite'
compileSdk libs.versions.android.compileSdk.get().toInteger() compileSdk = libs.versions.android.compileSdk.get().toInteger()
defaultConfig { defaultConfig {
minSdk libs.versions.android.minSdk.get().toInteger() minSdk = libs.versions.android.minSdk.get().toInteger()
targetSdk libs.versions.android.targetSdk.get().toInteger() targetSdk = libs.versions.android.targetSdk.get().toInteger()
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro" consumerProguardFiles "consumer-rules.pro"
@@ -23,12 +23,12 @@ android {
buildTypes { buildTypes {
release { release {
minifyEnabled true minifyEnabled = true
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} }
create("benchmark") { create("benchmark") {
initWith(getByName("release")) initWith(getByName("release"))
signingConfig signingConfigs.debug signingConfig = signingConfigs.debug
} }
} }
compileOptions { compileOptions {
+6 -6
View File
@@ -7,12 +7,12 @@ plugins {
} }
android { android {
namespace 'com.vitorpamplona.amethyst.benchmark' namespace = 'com.vitorpamplona.amethyst.benchmark'
compileSdk libs.versions.android.compileSdk.get().toInteger() compileSdk = libs.versions.android.compileSdk.get().toInteger()
defaultConfig { defaultConfig {
minSdk libs.versions.android.minSdk.get().toInteger() minSdk = libs.versions.android.minSdk.get().toInteger()
targetSdk libs.versions.android.targetSdk.get().toInteger() targetSdk = libs.versions.android.targetSdk.get().toInteger()
// Enable measuring on an emulator, or devices with low battery // Enable measuring on an emulator, or devices with low battery
testInstrumentationRunner 'androidx.benchmark.junit4.AndroidBenchmarkRunner' testInstrumentationRunner 'androidx.benchmark.junit4.AndroidBenchmarkRunner'
@@ -36,12 +36,12 @@ android {
} }
release { release {
isDefault = false isDefault = false
minifyEnabled true minifyEnabled = true
} }
create("benchmark") { create("benchmark") {
isDefault = true isDefault = true
initWith(getByName("release")) initWith(getByName("release"))
signingConfig signingConfigs.debug signingConfig = signingConfigs.debug
} }
} }
} }
+6 -6
View File
@@ -7,12 +7,12 @@ plugins {
} }
android { android {
namespace 'com.vitorpamplona.amethyst.commons' namespace = 'com.vitorpamplona.amethyst.commons'
compileSdk libs.versions.android.compileSdk.get().toInteger() compileSdk = libs.versions.android.compileSdk.get().toInteger()
defaultConfig { defaultConfig {
minSdk libs.versions.android.minSdk.get().toInteger() minSdk = libs.versions.android.minSdk.get().toInteger()
targetSdk libs.versions.android.targetSdk.get().toInteger() targetSdk = libs.versions.android.targetSdk.get().toInteger()
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro" consumerProguardFiles "consumer-rules.pro"
@@ -25,7 +25,7 @@ android {
} }
create("benchmark") { create("benchmark") {
initWith(getByName("release")) initWith(getByName("release"))
signingConfig signingConfigs.debug signingConfig = signingConfigs.debug
} }
} }
compileOptions { compileOptions {
@@ -34,7 +34,7 @@ android {
} }
buildFeatures { buildFeatures {
compose true compose = true
} }
} }
+6 -6
View File
@@ -6,12 +6,12 @@ plugins {
} }
android { android {
namespace 'com.vitorpamplona.quartz' namespace = 'com.vitorpamplona.quartz'
compileSdk libs.versions.android.compileSdk.get().toInteger() compileSdk = libs.versions.android.compileSdk.get().toInteger()
defaultConfig { defaultConfig {
minSdk libs.versions.android.minSdk.get().toInteger() minSdk = libs.versions.android.minSdk.get().toInteger()
targetSdk libs.versions.android.targetSdk.get().toInteger() targetSdk = libs.versions.android.targetSdk.get().toInteger()
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro" consumerProguardFiles "consumer-rules.pro"
@@ -19,12 +19,12 @@ android {
buildTypes { buildTypes {
release { release {
minifyEnabled true minifyEnabled = true
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} }
create("benchmark") { create("benchmark") {
initWith(getByName("release")) initWith(getByName("release"))
signingConfig signingConfigs.debug signingConfig = signingConfigs.debug
} }
} }
compileOptions { compileOptions {
+3 -3
View File
@@ -10,7 +10,7 @@ pluginManagement {
mavenCentral() mavenCentral()
gradlePluginPortal() gradlePluginPortal()
maven { maven {
url "https://jitpack.io" url = "https://jitpack.io"
content { content {
includeModule 'com.github.UnifiedPush', 'android-connector' includeModule 'com.github.UnifiedPush', 'android-connector'
} }
@@ -23,8 +23,8 @@ dependencyResolutionManagement {
repositories { repositories {
google() google()
mavenCentral() mavenCentral()
maven { url "https://jitpack.io" } maven { url = "https://jitpack.io" }
maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" } maven { url = "https://raw.githubusercontent.com/guardianproject/gpmaven/master" }
} }
} }