From b0ec47ede6126a54d223649b7301b7254ec71183 Mon Sep 17 00:00:00 2001 From: Xuan Han Tan <43411204+XuanHanTan@users.noreply.github.com> Date: Mon, 11 Dec 2023 23:40:52 +0800 Subject: [PATCH 1/4] Added Java 17 requirement for both Java and Kotlin compilation --- android/build.gradle | 9 +++++++++ example/ios/Flutter/AppFrameworkInfo.plist | 2 +- example/ios/Runner.xcodeproj/project.pbxproj | 8 ++++---- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- example/ios/Runner/Info.plist | 2 ++ pubspec.yaml | 2 +- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 0d88a27..f5f0a5f 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -32,6 +32,15 @@ android { test.java.srcDirs += 'src/test/kotlin' } + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_17 + } + defaultConfig { minSdkVersion 16 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist index 9367d48..9625e10 100644 --- a/example/ios/Flutter/AppFrameworkInfo.plist +++ b/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 8.0 + 11.0 diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index 57e27b3..a64c37d 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -154,7 +154,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -321,7 +321,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -400,7 +400,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -449,7 +449,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index a28140c..3db53b6 100644 --- a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ UIViewControllerBasedStatusBarAppearance + CADisableMinimumFrameDurationOnPhone + diff --git a/pubspec.yaml b/pubspec.yaml index 952aa31..57b3046 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ homepage: https://docs.microsoft.com/en-us/dual-screen/ repository: https://github.com/microsoft/flutter-dualscreen environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=2.12.0 <4.0.0" flutter: ">=2.10.0" dependencies: From 51e2951f8bc1c4f88d3fa40ac2dad9cb7a66e7a2 Mon Sep 17 00:00:00 2001 From: BugsOverBugs Date: Thu, 11 Apr 2024 16:08:35 +0200 Subject: [PATCH 2/4] added namespace in build.gradle --- android/build.gradle | 5 +++++ android/src/main/AndroidManifest.xml | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index f5f0a5f..2685386 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -27,6 +27,11 @@ apply plugin: 'kotlin-android' android { compileSdkVersion 30 + // Conditional for compatibility with AGP <4.2. + if (project.android.hasProperty("namespace")) { + namespace 'com.example.dual_screen' + } + sourceSets { main.java.srcDirs += 'src/main/kotlin' test.java.srcDirs += 'src/test/kotlin' diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index edda7df..a2f47b6 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,3 +1,2 @@ - + From 1d697eb049c5f249333dd9ed0b6a547c7e184544 Mon Sep 17 00:00:00 2001 From: Tom <77296962+BugsOverBugs@users.noreply.github.com> Date: Sat, 24 Aug 2024 16:29:46 +0200 Subject: [PATCH 3/4] Update build.gradle to compile sdk 34 --- android/build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 2685386..01e67e1 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -23,9 +23,12 @@ rootProject.allprojects { apply plugin: 'com.android.library' apply plugin: 'kotlin-android' +def safeExtGet(prop, fallback) { + rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback +} android { - compileSdkVersion 30 + compileSdkVersion safeExtGet('compileSdkVersion', 30) // Conditional for compatibility with AGP <4.2. if (project.android.hasProperty("namespace")) { From 2a8a0c1ac22acd5e926e30735a0b58c47f594550 Mon Sep 17 00:00:00 2001 From: Tom <77296962+BugsOverBugs@users.noreply.github.com> Date: Sat, 24 Aug 2024 20:03:25 +0200 Subject: [PATCH 4/4] Hopefully fix upgrade to 34 --- android/build.gradle | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 01e67e1..29ef836 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -23,12 +23,9 @@ rootProject.allprojects { apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -def safeExtGet(prop, fallback) { - rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback -} android { - compileSdkVersion safeExtGet('compileSdkVersion', 30) + compileSdkVersion 34 // Conditional for compatibility with AGP <4.2. if (project.android.hasProperty("namespace")) {