Skip to content

Commit 662bd87

Browse files
deandreamatiasdeandreamatias
committed
build: update project configurations and dependencies for Flutter compatibility
1 parent ca149aa commit 662bd87

File tree

12 files changed

+39
-31
lines changed

12 files changed

+39
-31
lines changed

‎example/.metadata‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: "35c388afb57ef061d06a39b537336c87e0e3d1b1"
7+
revision: "bd7a4a6b5576630823ca344e3e684c53aa1a0f46"
88
channel: "stable"
99

1010
project_type: app
@@ -13,11 +13,11 @@ project_type: app
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1
17-
base_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1
16+
create_revision: bd7a4a6b5576630823ca344e3e684c53aa1a0f46
17+
base_revision: bd7a4a6b5576630823ca344e3e684c53aa1a0f46
1818
- platform: macos
19-
create_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1
20-
base_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1
19+
create_revision: bd7a4a6b5576630823ca344e3e684c53aa1a0f46
20+
base_revision: bd7a4a6b5576630823ca344e3e684c53aa1a0f46
2121

2222
# User provided section
2323

‎example/android/app/build.gradle.kts‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,33 @@ plugins {
77

88
android {
99
namespace = "com.flutterformbuilderecosystem.example"
10-
compileSdk = 35
10+
compileSdk = flutter.compileSdkVersion
1111
ndkVersion = flutter.ndkVersion
1212

1313
compileOptions {
14-
sourceCompatibility = JavaVersion.VERSION_11
15-
targetCompatibility = JavaVersion.VERSION_11
14+
sourceCompatibility = JavaVersion.VERSION_17
15+
targetCompatibility = JavaVersion.VERSION_17
1616
}
1717

1818
kotlinOptions {
19-
jvmTarget = JavaVersion.VERSION_11.toString()
19+
jvmTarget = JavaVersion.VERSION_17.toString()
2020
}
2121

2222
defaultConfig {
23+
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
2324
applicationId = "com.flutterformbuilderecosystem.example"
2425
// You can update the following values to match your application needs.
2526
// For more information, see: https://flutter.dev/to/review-gradle-config.
2627
minSdk = flutter.minSdkVersion
27-
targetSdk = 35
28+
targetSdk = flutter.targetSdkVersion
2829
versionCode = flutter.versionCode
2930
versionName = flutter.versionName
3031
}
3132

3233
buildTypes {
3334
release {
35+
// TODO: Add your own signing config for the release build.
36+
// Signing with the debug keys for now, so `flutter run --release` works.
3437
signingConfig = signingConfigs.getByName("debug")
3538
}
3639
}

‎example/android/build.gradle.kts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ allprojects {
55
}
66
}
77

8-
val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get()
8+
val newBuildDir: Directory =
9+
rootProject.layout.buildDirectory
10+
.dir("../../build")
11+
.get()
912
rootProject.layout.buildDirectory.value(newBuildDir)
1013

1114
subprojects {

‎example/android/gradle.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
22
android.useAndroidX=true
3-
android.enableJetifier=true

‎example/android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip

‎example/android/settings.gradle.kts‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
pluginManagement {
2-
val flutterSdkPath = run {
3-
val properties = java.util.Properties()
4-
file("local.properties").inputStream().use { properties.load(it) }
5-
val flutterSdkPath = properties.getProperty("flutter.sdk")
6-
require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
7-
flutterSdkPath
8-
}
2+
val flutterSdkPath =
3+
run {
4+
val properties = java.util.Properties()
5+
file("local.properties").inputStream().use { properties.load(it) }
6+
val flutterSdkPath = properties.getProperty("flutter.sdk")
7+
require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
8+
flutterSdkPath
9+
}
910

1011
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
1112

@@ -18,8 +19,8 @@ pluginManagement {
1819

1920
plugins {
2021
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
21-
id("com.android.application") version "8.7.0" apply false
22-
id("org.jetbrains.kotlin.android") version "1.8.22" apply false
22+
id("com.android.application") version "8.11.1" apply false
23+
id("org.jetbrains.kotlin.android") version "2.2.20" apply false
2324
}
2425

2526
include(":app")

‎example/ios/Flutter/AppFrameworkInfo.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>12.0</string>
24+
<string>13.0</string>
2525
</dict>
2626
</plist>

‎example/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@
346346
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
347347
GCC_WARN_UNUSED_FUNCTION = YES;
348348
GCC_WARN_UNUSED_VARIABLE = YES;
349-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
349+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
350350
MTL_ENABLE_DEBUG_INFO = NO;
351351
SDKROOT = iphoneos;
352352
SUPPORTED_PLATFORMS = iphoneos;
@@ -472,7 +472,7 @@
472472
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
473473
GCC_WARN_UNUSED_FUNCTION = YES;
474474
GCC_WARN_UNUSED_VARIABLE = YES;
475-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
475+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
476476
MTL_ENABLE_DEBUG_INFO = YES;
477477
ONLY_ACTIVE_ARCH = YES;
478478
SDKROOT = iphoneos;
@@ -523,7 +523,7 @@
523523
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
524524
GCC_WARN_UNUSED_FUNCTION = YES;
525525
GCC_WARN_UNUSED_VARIABLE = YES;
526-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
526+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
527527
MTL_ENABLE_DEBUG_INFO = NO;
528528
SDKROOT = iphoneos;
529529
SUPPORTED_PLATFORMS = iphoneos;

‎example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<MacroExpansion>
3132
<BuildableReference
@@ -54,6 +55,7 @@
5455
buildConfiguration = "Debug"
5556
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5657
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
58+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
5759
launchStyle = "0"
5860
useCustomWorkingDirectory = "NO"
5961
ignoresPersistentStateOnLaunch = "NO"

‎example/macos/Runner.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@
461461
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
462462
GCC_WARN_UNUSED_FUNCTION = YES;
463463
GCC_WARN_UNUSED_VARIABLE = YES;
464-
MACOSX_DEPLOYMENT_TARGET = 10.14;
464+
MACOSX_DEPLOYMENT_TARGET = 10.15;
465465
MTL_ENABLE_DEBUG_INFO = NO;
466466
SDKROOT = macosx;
467467
SWIFT_COMPILATION_MODE = wholemodule;
@@ -543,7 +543,7 @@
543543
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
544544
GCC_WARN_UNUSED_FUNCTION = YES;
545545
GCC_WARN_UNUSED_VARIABLE = YES;
546-
MACOSX_DEPLOYMENT_TARGET = 10.14;
546+
MACOSX_DEPLOYMENT_TARGET = 10.15;
547547
MTL_ENABLE_DEBUG_INFO = YES;
548548
ONLY_ACTIVE_ARCH = YES;
549549
SDKROOT = macosx;
@@ -593,7 +593,7 @@
593593
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
594594
GCC_WARN_UNUSED_FUNCTION = YES;
595595
GCC_WARN_UNUSED_VARIABLE = YES;
596-
MACOSX_DEPLOYMENT_TARGET = 10.14;
596+
MACOSX_DEPLOYMENT_TARGET = 10.15;
597597
MTL_ENABLE_DEBUG_INFO = NO;
598598
SDKROOT = macosx;
599599
SWIFT_COMPILATION_MODE = wholemodule;

0 commit comments

Comments
 (0)