From cc658cdff8e1880ae2978d7a1afc5281f0c86f35 Mon Sep 17 00:00:00 2001 From: Maurizio Pinotti Date: Tue, 14 Oct 2025 08:49:59 +0200 Subject: [PATCH] fix(#442): upgrade Android compileSdk and Kotlin version --- packages/desktop_drop/android/build.gradle | 10 +++++----- .../android/gradle/wrapper/gradle-wrapper.properties | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/desktop_drop/android/build.gradle b/packages/desktop_drop/android/build.gradle index 370a2088..a5605126 100644 --- a/packages/desktop_drop/android/build.gradle +++ b/packages/desktop_drop/android/build.gradle @@ -2,7 +2,7 @@ group 'com.example.desktop_drop' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '1.9.25' repositories { google() mavenCentral() @@ -14,6 +14,9 @@ buildscript { } } +apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' + rootProject.allprojects { repositories { google() @@ -21,16 +24,13 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' - android { // Conditional for compatibility with AGP <4.2. if (project.android.hasProperty("namespace")) { namespace 'one.mixin.desktop.drop' } - compileSdk 33 + compileSdk 36 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/desktop_drop/android/gradle/wrapper/gradle-wrapper.properties b/packages/desktop_drop/android/gradle/wrapper/gradle-wrapper.properties index 3c472b99..1af9e093 100644 --- a/packages/desktop_drop/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/desktop_drop/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip