From ba2c534aaaefcf40dac699dbc7cf44df557e9133 Mon Sep 17 00:00:00 2001 From: Daniel Hauck Date: Fri, 3 Jan 2025 19:45:52 +0100 Subject: [PATCH 1/2] Update gradle plugins --- xbuild/src/gradle/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xbuild/src/gradle/build.gradle b/xbuild/src/gradle/build.gradle index c75b5ce2..4384acff 100644 --- a/xbuild/src/gradle/build.gradle +++ b/xbuild/src/gradle/build.gradle @@ -1,8 +1,8 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.0' apply false - id 'com.android.library' version '7.3.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.20' apply false + id 'com.android.application' version '8.7.0' apply false + id 'com.android.library' version '8.7.0' apply false + id 'org.jetbrains.kotlin.android' version '2.1.0' apply false } task clean(type: Delete) { From 9124b384a17a5539034bc8a2463672e8df8c18a8 Mon Sep 17 00:00:00 2001 From: Daniel Hauck Date: Fri, 3 Jan 2025 19:47:56 +0100 Subject: [PATCH 2/2] Fix outdated Groovy syntax --- xbuild/src/gradle/mod.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xbuild/src/gradle/mod.rs b/xbuild/src/gradle/mod.rs index 013bbdca..e5984c90 100644 --- a/xbuild/src/gradle/mod.rs +++ b/xbuild/src/gradle/mod.rs @@ -74,14 +74,14 @@ pub fn build(env: &BuildEnv, out: &Path) -> Result<()> { id 'org.jetbrains.kotlin.android' }} android {{ - namespace '{package}' - compileSdk {target_sdk} + namespace = '{package}' + compileSdk = {target_sdk} defaultConfig {{ - applicationId '{package}' - minSdk {min_sdk} - targetSdk {target_sdk} - versionCode {version_code} - versionName '{version_name}' + applicationId = '{package}' + minSdk = {min_sdk} + targetSdk = {target_sdk} + versionCode = {version_code} + versionName = '{version_name}' }} }} dependencies {{