Skip to content

Commit fbdff26

Browse files
Merge pull request #79 from flutter-form-builder-ecosystem/feature/update-flutter-3.29
feature/update-flutter-3.29
2 parents 505f191 + 0ec89ab commit fbdff26

File tree

96 files changed

+3144
-540
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+3144
-540
lines changed

.fvmrc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
{
2-
"flutter": "stable"
2+
"flutter": "stable",
3+
"flavors": {
4+
"stable": "stable",
5+
"beta": "beta"
6+
}
37
}

example/.metadata

Lines changed: 20 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: "80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819"
7+
revision: "c23637390482d4cf9598c3ce3f2be31aa7332daf"
88
channel: "stable"
99

1010
project_type: app
@@ -13,11 +13,26 @@ project_type: app
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
17-
base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
16+
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
17+
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
1818
- platform: android
19-
create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
20-
base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
19+
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
20+
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
21+
- platform: ios
22+
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
23+
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
24+
- platform: linux
25+
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
26+
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
27+
- 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
2136

2237
# User provided section
2338

example/android/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ gradle-wrapper.jar
55
/gradlew.bat
66
/local.properties
77
GeneratedPluginRegistrant.java
8+
.cxx/
89

910
# Remember to never publicly share your keystore.
1011
# See https://flutter.dev/to/reference-keystore

example/android/app/build.gradle renamed to example/android/app/build.gradle.kts

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
11
plugins {
2-
id "com.android.application"
3-
id "kotlin-android"
2+
id("com.android.application")
3+
id("kotlin-android")
44
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
5-
id "dev.flutter.flutter-gradle-plugin"
5+
id("dev.flutter.flutter-gradle-plugin")
66
}
77

88
android {
9-
namespace = "com.example.form_builder_image_picker"
9+
namespace = "com.flutterformbuilderecosystem.example"
1010
compileSdk = flutter.compileSdkVersion
1111
ndkVersion = flutter.ndkVersion
1212

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

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

2222
defaultConfig {
23-
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
24-
applicationId = "com.example.form_builder_image_picker"
23+
applicationId = "com.flutterformbuilderecosystem.example"
2524
// You can update the following values to match your application needs.
2625
// For more information, see: https://flutter.dev/to/review-gradle-config.
2726
minSdk = flutter.minSdkVersion
@@ -32,9 +31,8 @@ android {
3231

3332
buildTypes {
3433
release {
35-
// TODO: Add your own signing config for the release build.
3634
// Signing with the debug keys for now, so `flutter run --release` works.
37-
signingConfig = signingConfigs.debug
35+
signingConfig = signingConfigs.getByName("debug")
3836
}
3937
}
4038
}

example/android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
22
<application
3-
android:label="form_builder_image_picker"
3+
android:label="example"
44
android:name="${applicationName}"
55
android:icon="@mipmap/ic_launcher">
66
<activity

example/android/app/src/main/kotlin/com/example/form_builder_image_picker/MainActivity.kt

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package com.flutterformbuilderecosystem.example
2+
3+
import io.flutter.embedding.android.FlutterActivity
4+
5+
class MainActivity : FlutterActivity()

example/android/build.gradle

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

example/android/build.gradle.kts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
allprojects {
2+
repositories {
3+
google()
4+
mavenCentral()
5+
}
6+
}
7+
8+
val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get()
9+
rootProject.layout.buildDirectory.value(newBuildDir)
10+
11+
subprojects {
12+
val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
13+
project.layout.buildDirectory.value(newSubprojectBuildDir)
14+
}
15+
subprojects {
16+
project.evaluationDependsOn(":app")
17+
}
18+
19+
tasks.register<Delete>("clean") {
20+
delete(rootProject.layout.buildDirectory)
21+
}

example/android/gradle.properties

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

0 commit comments

Comments
 (0)