From 2c1ba5dd7e56a9d093a97a07f301b737c70f96ab Mon Sep 17 00:00:00 2001 From: Leo <58687994+1-leo@users.noreply.github.com> Date: Sat, 21 Mar 2026 11:33:24 +0100 Subject: [PATCH 1/3] chore: android build.grade upgrades --- android/build.gradle | 33 +++++++++---------- .../gradle/wrapper/gradle-wrapper.properties | 4 ++- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index a588f9b..f35fb14 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,15 +2,13 @@ group 'com.sebdeveloper6952.amberflutter.amberflutter' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.7.10' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.3.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0-Beta1" + classpath 'com.android.tools.build:gradle:9.0.1' } } @@ -22,23 +20,17 @@ allprojects { } apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' -apply plugin: 'org.jetbrains.kotlin.android' android { if (project.android.hasProperty("namespace")) { namespace 'com.sebdeveloper6952.amberflutter.amberflutter' } - compileSdkVersion 33 + compileSdk 36 compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = '1.8' + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } sourceSets { @@ -47,23 +39,28 @@ android { } defaultConfig { - minSdkVersion 19 + minSdk 21 } dependencies { testImplementation 'org.jetbrains.kotlin:kotlin-test' - testImplementation 'org.mockito:mockito-core:5.0.0' + testImplementation 'org.mockito:mockito-core:5.23.0' } testOptions { unitTests.all { useJUnitPlatform() - testLogging { - events "passed", "skipped", "failed", "standardOut", "standardError" - outputs.upToDateWhen {false} - showStandardStreams = true + events "passed", "skipped", "failed", "standardOut", "standardError" + outputs.upToDateWhen { false } + showStandardStreams = true } } } } + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 41dfb87..8aba48d 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ +#Sat Mar 21 11:13:37 CET 2026 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806 +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From f2793c0dbce5e8562c25ec6c394b9d1db34eb0db Mon Sep 17 00:00:00 2001 From: Leo <58687994+1-leo@users.noreply.github.com> Date: Sat, 21 Mar 2026 15:12:03 +0100 Subject: [PATCH 2/3] chore: remove kolin override --- android/build.gradle | 6 ------ 1 file changed, 6 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index f35fb14..2aa9a61 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -58,9 +58,3 @@ android { } } } - -kotlin { - compilerOptions { - jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 - } -} From c86c373b65d810e89eedf7c59e286914dc61ce79 Mon Sep 17 00:00:00 2001 From: Leo <58687994+1-leo@users.noreply.github.com> Date: Sat, 21 Mar 2026 16:08:57 +0100 Subject: [PATCH 3/3] chore(fix): downgrade to gradle 8 --- android/build.gradle | 22 ++++++++++++------- .../gradle/wrapper/gradle-wrapper.properties | 6 ++--- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 2aa9a61..a01a4ce 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,5 @@ -group 'com.sebdeveloper6952.amberflutter.amberflutter' -version '1.0-SNAPSHOT' +group = 'com.sebdeveloper6952.amberflutter.amberflutter' +version = '1.0-SNAPSHOT' buildscript { repositories { @@ -8,7 +8,8 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:9.0.1' + classpath 'com.android.tools.build:gradle:8.12.3' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0" } } @@ -20,17 +21,22 @@ allprojects { } apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' android { if (project.android.hasProperty("namespace")) { - namespace 'com.sebdeveloper6952.amberflutter.amberflutter' + namespace = 'com.sebdeveloper6952.amberflutter.amberflutter' } - compileSdk 36 + compileSdk = 36 compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = '17' } sourceSets { @@ -39,7 +45,7 @@ android { } defaultConfig { - minSdk 21 + minSdk = 21 } dependencies { diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 8aba48d..0e313ca 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ -#Sat Mar 21 11:13:37 CET 2026 +#Sat Mar 21 15:44:56 CET 2026 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806 -distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip +distributionSha256Sum=f1771298a70f6db5a29daf62378c4e18a17fc33c9ba6b14362e0cdf40610380d +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists