Skip to content

Commit 556cea1

Browse files
build: update project configurations and dependencies for improved compatibility
1 parent 7b938f6 commit 556cea1

File tree

20 files changed

+39
-290
lines changed

20 files changed

+39
-290
lines changed

example/.metadata

Lines changed: 9 additions & 18 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: "c23637390482d4cf9598c3ce3f2be31aa7332daf"
7+
revision: "bd7a4a6b5576630823ca344e3e684c53aa1a0f46"
88
channel: "stable"
99

1010
project_type: app
@@ -13,26 +13,17 @@ project_type: app
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
17-
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
16+
create_revision: bd7a4a6b5576630823ca344e3e684c53aa1a0f46
17+
base_revision: bd7a4a6b5576630823ca344e3e684c53aa1a0f46
1818
- platform: android
19-
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
20-
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
19+
create_revision: bd7a4a6b5576630823ca344e3e684c53aa1a0f46
20+
base_revision: bd7a4a6b5576630823ca344e3e684c53aa1a0f46
2121
- platform: ios
22-
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
23-
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
24-
- platform: linux
25-
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
26-
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
22+
create_revision: bd7a4a6b5576630823ca344e3e684c53aa1a0f46
23+
base_revision: bd7a4a6b5576630823ca344e3e684c53aa1a0f46
2724
- platform: macos
28-
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
29-
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
30-
- platform: web
31-
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
32-
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
33-
- platform: windows
34-
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
35-
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
25+
create_revision: bd7a4a6b5576630823ca344e3e684c53aa1a0f46
26+
base_revision: bd7a4a6b5576630823ca344e3e684c53aa1a0f46
3627

3728
# User provided section
3829

example/android/app/build.gradle.kts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@ android {
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.
@@ -31,6 +32,7 @@ android {
3132

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

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
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/Flutter/Debug.xcconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
21
#include "Generated.xcconfig"
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
21
#include "Generated.xcconfig"

example/ios/Podfile

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)