From 7c86c7d97ae977378b4231d8453f41f49b0758c7 Mon Sep 17 00:00:00 2001 From: The Full-Stack Jonin Date: Sat, 7 Sep 2024 22:16:33 +0100 Subject: [PATCH 1/4] refactor: AGP 8.0 Support --- android/build.gradle | 25 ++++++++++++++++++------- android/src/main/AndroidManifest.xml | 3 +-- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 0d88a27..ad6636c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,37 +1,48 @@ -group 'com.example.dual_screen' +group 'com.microsoft.flutterdualscreen' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.7.21' + ext.kotlin_version = '1.7.10' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:7.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } -rootProject.allprojects { +allprojects { repositories { google() jcenter() } } -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +apply plugin: "com.android.library" +apply plugin: "kotlin-android" android { - compileSdkVersion 30 + namespace 'com.microsoft.flutterdualscreen' + + compileSdkVersion 34 sourceSets { main.java.srcDirs += 'src/main/kotlin' test.java.srcDirs += 'src/test/kotlin' } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8 + } + defaultConfig { minSdkVersion 16 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index edda7df..c4fc950 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,3 +1,2 @@ - + From 8870a78454e5f0a7599d48501b97ddd1870b4f48 Mon Sep 17 00:00:00 2001 From: The Full-Stack Jonin Date: Sat, 7 Sep 2024 22:44:43 +0100 Subject: [PATCH 2/4] refactor: Remove Java Version setting --- android/build.gradle | 9 --------- 1 file changed, 9 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index ad6636c..1d1ab83 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -34,15 +34,6 @@ android { test.java.srcDirs += 'src/test/kotlin' } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8 - } - defaultConfig { minSdkVersion 16 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" From e6ff0d91d86aadea715b3b3949ee288737b7f400 Mon Sep 17 00:00:00 2001 From: The Full-Stack Jonin Date: Sun, 4 May 2025 23:35:13 +0100 Subject: [PATCH 3/4] Update build.gradle --- android/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/android/build.gradle b/android/build.gradle index 1d1ab83..d6960a1 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -27,6 +27,10 @@ apply plugin: "kotlin-android" android { namespace 'com.microsoft.flutterdualscreen' + kotlinOptions { + jvmTarget = "17" + } + compileSdkVersion 34 sourceSets { From caa62696436dc7d25c992c677a9c9f38e45d38ba Mon Sep 17 00:00:00 2001 From: The Full-Stack Jonin Date: Mon, 5 May 2025 06:48:49 +0100 Subject: [PATCH 4/4] Update build.gradle --- android/build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index d6960a1..4aed115 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -27,8 +27,9 @@ apply plugin: "kotlin-android" android { namespace 'com.microsoft.flutterdualscreen' - kotlinOptions { - jvmTarget = "17" + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } compileSdkVersion 34