Skip to content

Commit 6f8dff8

Browse files
deandreamatiasdeandreamatias
authored
Merge pull request #27 from flutter-form-builder-ecosystem/feature/update-flutter-3.29
Feature/update-flutter-3.29
2 parents 3723d2d + 156d760 commit 6f8dff8

Some content is hidden

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

48 files changed

+966
-824
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
}

‎.github/workflows/base.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
build:
2121
uses: flutter-form-builder-ecosystem/.github/.github/workflows/minimal-quality.yaml@main
2222
with:
23-
codecov-name: 'form_builder_cupertino_fields'
23+
codecov-name: form_builder_cupertino_fields
2424
example:
2525
uses: flutter-form-builder-ecosystem/.github/.github/workflows/build-examples.yaml@main
2626

‎example/.metadata

Lines changed: 15 additions & 15 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: "17025dd88227cd9532c33fa78f5250d548d87e9a"
7+
revision: "c23637390482d4cf9598c3ce3f2be31aa7332daf"
88
channel: "stable"
99

1010
project_type: app
@@ -13,26 +13,26 @@ project_type: app
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
17-
base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
16+
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
17+
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
1818
- platform: android
19-
create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
20-
base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
19+
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
20+
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
2121
- platform: ios
22-
create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
23-
base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
22+
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
23+
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
2424
- platform: linux
25-
create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
26-
base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
25+
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
26+
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
2727
- platform: macos
28-
create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
29-
base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
28+
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
29+
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
3030
- platform: web
31-
create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
32-
base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
31+
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
32+
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
3333
- platform: windows
34-
create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
35-
base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
34+
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
35+
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
3636

3737
# User provided section
3838

‎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.example"
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.example"
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/kotlin/com/example/example/MainActivity.kt

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

‎example/android/app/src/main/kotlin/com/flutterformbuilderecosystem/example/MainActivity.kt

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 & 18 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

‎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.3-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip

‎example/android/settings.gradle

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

‎example/android/settings.gradle.kts

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
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+
}
9+
10+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
11+
12+
repositories {
13+
google()
14+
mavenCentral()
15+
gradlePluginPortal()
16+
}
17+
}
18+
19+
plugins {
20+
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
23+
}
24+
25+
include(":app")

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@
368368
"$(inherited)",
369369
"@executable_path/Frameworks",
370370
);
371-
PRODUCT_BUNDLE_IDENTIFIER = com.example.example;
371+
PRODUCT_BUNDLE_IDENTIFIER = com.flutterformbuilderecosystem.example;
372372
PRODUCT_NAME = "$(TARGET_NAME)";
373373
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
374374
SWIFT_VERSION = 5.0;
@@ -384,7 +384,7 @@
384384
CURRENT_PROJECT_VERSION = 1;
385385
GENERATE_INFOPLIST_FILE = YES;
386386
MARKETING_VERSION = 1.0;
387-
PRODUCT_BUNDLE_IDENTIFIER = com.example.example.RunnerTests;
387+
PRODUCT_BUNDLE_IDENTIFIER = com.flutterformbuilderecosystem.example.RunnerTests;
388388
PRODUCT_NAME = "$(TARGET_NAME)";
389389
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
390390
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -401,7 +401,7 @@
401401
CURRENT_PROJECT_VERSION = 1;
402402
GENERATE_INFOPLIST_FILE = YES;
403403
MARKETING_VERSION = 1.0;
404-
PRODUCT_BUNDLE_IDENTIFIER = com.example.example.RunnerTests;
404+
PRODUCT_BUNDLE_IDENTIFIER = com.flutterformbuilderecosystem.example.RunnerTests;
405405
PRODUCT_NAME = "$(TARGET_NAME)";
406406
SWIFT_VERSION = 5.0;
407407
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
@@ -416,7 +416,7 @@
416416
CURRENT_PROJECT_VERSION = 1;
417417
GENERATE_INFOPLIST_FILE = YES;
418418
MARKETING_VERSION = 1.0;
419-
PRODUCT_BUNDLE_IDENTIFIER = com.example.example.RunnerTests;
419+
PRODUCT_BUNDLE_IDENTIFIER = com.flutterformbuilderecosystem.example.RunnerTests;
420420
PRODUCT_NAME = "$(TARGET_NAME)";
421421
SWIFT_VERSION = 5.0;
422422
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
@@ -547,7 +547,7 @@
547547
"$(inherited)",
548548
"@executable_path/Frameworks",
549549
);
550-
PRODUCT_BUNDLE_IDENTIFIER = com.example.example;
550+
PRODUCT_BUNDLE_IDENTIFIER = com.flutterformbuilderecosystem.example;
551551
PRODUCT_NAME = "$(TARGET_NAME)";
552552
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
553553
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -569,7 +569,7 @@
569569
"$(inherited)",
570570
"@executable_path/Frameworks",
571571
);
572-
PRODUCT_BUNDLE_IDENTIFIER = com.example.example;
572+
PRODUCT_BUNDLE_IDENTIFIER = com.flutterformbuilderecosystem.example;
573573
PRODUCT_NAME = "$(TARGET_NAME)";
574574
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
575575
SWIFT_VERSION = 5.0;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
ignoresPersistentStateOnLaunch = "NO"
6060
debugDocumentVersioning = "YES"
6161
debugServiceExtension = "internal"
62+
enableGPUValidationMode = "1"
6263
allowLocationSimulation = "YES">
6364
<BuildableProductRunnable
6465
runnableDebuggingMode = "0">

‎example/lib/main.dart

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,23 +84,26 @@ class _MyHomePageState extends State<MyHomePage> {
8484
autovalidateMode: AutovalidateMode.onUserInteraction,
8585
min: 1,
8686
max: 100,
87-
validator: (value) => value != null && value < 50 && value > 5
88-
? null
89-
: 'Required value between 5 and 50',
87+
validator:
88+
(value) =>
89+
value != null && value < 50 && value > 5
90+
? null
91+
: 'Required value between 5 and 50',
9092
),
9193
const SizedBox(height: 16),
9294
FormBuilderCupertinoTextField(
9395
name: 'text',
9496
decoration: BoxDecoration(
95-
border: Border.all(
96-
color: CupertinoColors.black,
97-
),
97+
border: Border.all(color: CupertinoColors.black),
9898
borderRadius: BorderRadius.circular(8),
9999
),
100100
autovalidateMode: AutovalidateMode.onUserInteraction,
101-
validator: (value) =>
102-
value != null && value.length > 4 ? null : 'Write a text',
103-
)
101+
validator:
102+
(value) =>
103+
value != null && value.length > 4
104+
? null
105+
: 'Write a text',
106+
),
104107
],
105108
),
106109
),

0 commit comments

Comments
 (0)