Skip to content

Commit 46a2833

Browse files
Merge branch 'main' into refactor_2024_11
2 parents 7f0c09b + b4cd402 commit 46a2833

File tree

157 files changed

+11515
-10294
lines changed

Some content is hidden

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

157 files changed

+11515
-10294
lines changed

.github/workflows/base-beta.yaml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Base (beta)
2+
3+
on:
4+
schedule:
5+
- cron: '0 0 */15 * *' # Runs every 15 days for verifying changes on Flutter beta channel
6+
push:
7+
branches: [beta]
8+
tags:
9+
- '[0-9]+.[0-9]+.[0-9]+-*'
10+
11+
pull_request:
12+
branches: [beta]
13+
14+
workflow_dispatch:
15+
16+
# This ensures that previous jobs for the PR are canceled when PR is updated
17+
concurrency:
18+
group: ${{ github.workflow }}-${{ github.ref }}
19+
cancel-in-progress: true
20+
21+
jobs:
22+
build:
23+
uses: flutter-form-builder-ecosystem/.github/.github/workflows/minimal-quality.yaml@main
24+
with:
25+
codecov-name: form_builder_validators
26+
fvm-flavor: beta
27+
enable-generate-l10n: true
28+
example:
29+
uses: flutter-form-builder-ecosystem/.github/.github/workflows/build-examples.yaml@main
30+
with:
31+
fvm-flavor: beta
32+
enable-generate-l10n: true
33+
34+
35+
deployment:
36+
permissions:
37+
id-token: write
38+
uses: flutter-form-builder-ecosystem/.github/.github/workflows/deployment.yaml@main
39+
with:
40+
enable-generate-l10n: true
41+
if: ${{ github.ref_type == 'tag' }}
42+
needs: [build, example]

.github/workflows/base.yaml

Lines changed: 18 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
name: CI & CD
1+
name: Base
22

33
on:
4-
workflow_dispatch:
5-
64
push:
75
branches: [main]
86
tags:
9-
- "[0-9]+.[0-9]+.[0-9]+*"
7+
- '[0-9]+.[0-9]+.[0-9]+'
108

119
pull_request:
10+
branches: [main]
11+
12+
workflow_dispatch:
1213

1314
# This ensures that previous jobs for the PR are canceled when PR is updated
1415
concurrency:
@@ -17,90 +18,21 @@ concurrency:
1718

1819
jobs:
1920
build:
20-
name: Build package & run tests
21-
runs-on: ubuntu-latest
22-
steps:
23-
- name: Checkout repository
24-
uses: actions/checkout@v4
25-
with:
26-
fetch-depth: 1 # Use shallow clone for faster checkout
27-
- name: Check broken links
28-
uses: JustinBeckwith/linkinator-action@v1
29-
with:
30-
paths: "**/*.md"
31-
- name: Setup Flutter
32-
uses: kuhnroyal/flutter-fvm-config-action/setup@v3
33-
with:
34-
path: '.fvmrc'
35-
flavor: 'stable'
36-
- name: Install dependencies
37-
run: dart pub get
38-
- name: Run l10n
39-
run: flutter gen-l10n
40-
- name: Run l10n on example
41-
run: flutter gen-l10n
42-
working-directory: example
43-
- name: Format code
44-
run: dart format --set-exit-if-changed $(find . -name "*.dart" ! \( -wholename "./lib/localization/intl/*" -or -wholename "./example/lib/localization/intl/*" \))
45-
- name: Analyze static code
46-
run: dart analyze
47-
- name: Run tests
48-
run: flutter test --no-pub --coverage
49-
- name: Check publish warnings
50-
run: dart pub publish --dry-run
51-
- name: Upload coverage to Codecov
52-
uses: codecov/codecov-action@v5
53-
with:
54-
files: coverage/lcov.info
55-
flags: unittests
56-
name: form_builder_validators
57-
21+
uses: flutter-form-builder-ecosystem/.github/.github/workflows/minimal-quality.yaml@main
22+
with:
23+
codecov-name: form_builder_validators
24+
enable-generate-l10n: true
5825
example:
59-
name: Build example app
60-
runs-on: ubuntu-latest
61-
steps:
62-
- name: Checkout repository
63-
uses: actions/checkout@v4
64-
with:
65-
fetch-depth: 1 # Use shallow clone for faster checkout
66-
- name: Setup Flutter
67-
uses: kuhnroyal/flutter-fvm-config-action/setup@v3
68-
with:
69-
path: '.fvmrc'
70-
flavor: 'stable'
71-
- name: Install dependencies
72-
run: dart pub get
73-
- name: Run l10n
74-
run: flutter gen-l10n
75-
- name: Run l10n on example
76-
run: flutter gen-l10n
77-
working-directory: example
78-
- name: Build example
79-
run: flutter build appbundle --debug
80-
working-directory: example
26+
uses: flutter-form-builder-ecosystem/.github/.github/workflows/build-examples.yaml@main
27+
with:
28+
enable-generate-l10n: true
29+
8130

8231
deployment:
83-
# Don't use because need generate l10n before publish
84-
# uses: flutter-form-builder-ecosystem/.github/.github/workflows/deployment.yaml@main
85-
if: ${{ github.ref_type == 'tag' }}
86-
needs: [build, example]
87-
name: Deploy package
8832
permissions:
8933
id-token: write
90-
runs-on: ubuntu-latest
91-
steps:
92-
- name: Checkout repository
93-
uses: actions/checkout@v4
94-
with:
95-
fetch-depth: 1 # Use shallow clone for faster checkout
96-
- name: Setup Flutter
97-
uses: kuhnroyal/flutter-fvm-config-action/setup@v3
98-
with:
99-
path: '.fvmrc'
100-
flavor: 'stable'
101-
- name: Install dependencies
102-
run: dart pub get
103-
- name: Run l10n
104-
run: flutter gen-l10n
105-
- name: Publish package
106-
run: dart pub publish -v -f
34+
uses: flutter-form-builder-ecosystem/.github/.github/workflows/deployment.yaml@main
35+
with:
36+
enable-generate-l10n: true
37+
if: ${{ github.ref_type == 'tag' }}
38+
needs: [build, example]

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Changelog
22

3+
## 11.2.0
4+
5+
- Fix password validator when not showing default error message
6+
- Upgrade intl to 0.20.0
7+
- Update constraints to Dart 3.8
8+
- Update constraints to Flutter 3.32
9+
- Add linux setup on example
10+
11+
## 11.1.2
12+
13+
- Update intl constraints to allow versions until 0.21.0
14+
315
## 11.1.1
416

517
- Fix issue when build fails due to missing l10n files

analysis_options.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
include: package:flutter_lints/flutter.yaml
22
analyzer:
3+
language:
4+
strict-raw-types: true
5+
strict-casts: true
36
exclude:
47
- lib/localization/intl/**
58

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: "2663184aa79047d0a33a14a3b607954f8fdd8730"
7+
revision: "6fba2447e95c451518584c35e25f5433f14d888c"
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: 2663184aa79047d0a33a14a3b607954f8fdd8730
17-
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
16+
create_revision: 6fba2447e95c451518584c35e25f5433f14d888c
17+
base_revision: 6fba2447e95c451518584c35e25f5433f14d888c
1818
- platform: android
19-
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
20-
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
19+
create_revision: 6fba2447e95c451518584c35e25f5433f14d888c
20+
base_revision: 6fba2447e95c451518584c35e25f5433f14d888c
2121
- platform: ios
22-
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
23-
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
22+
create_revision: 6fba2447e95c451518584c35e25f5433f14d888c
23+
base_revision: 6fba2447e95c451518584c35e25f5433f14d888c
2424
- platform: linux
25-
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
26-
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
25+
create_revision: 6fba2447e95c451518584c35e25f5433f14d888c
26+
base_revision: 6fba2447e95c451518584c35e25f5433f14d888c
2727
- platform: macos
28-
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
29-
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
28+
create_revision: 6fba2447e95c451518584c35e25f5433f14d888c
29+
base_revision: 6fba2447e95c451518584c35e25f5433f14d888c
3030
- platform: web
31-
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
32-
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
31+
create_revision: 6fba2447e95c451518584c35e25f5433f14d888c
32+
base_revision: 6fba2447e95c451518584c35e25f5433f14d888c
3333
- platform: windows
34-
create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
35-
base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
34+
create_revision: 6fba2447e95c451518584c35e25f5433f14d888c
35+
base_revision: 6fba2447e95c451518584c35e25f5433f14d888c
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
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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 {
@@ -11,12 +11,12 @@ android {
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 {
@@ -34,7 +34,7 @@ android {
3434
release {
3535
// TODO: Add your own signing config for the release build.
3636
// Signing with the debug keys for now, so `flutter run --release` works.
37-
signingConfig = signingConfigs.debug
37+
signingConfig = signingConfigs.getByName("debug")
3838
}
3939
}
4040
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ package com.example.example
22

33
import io.flutter.embedding.android.FlutterActivity
44

5-
class MainActivity: FlutterActivity()
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+
}

0 commit comments

Comments
 (0)