Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(version): Bump version #3019

Merged
merged 6 commits into from
May 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 3 additions & 7 deletions .github/composite_actions/install_dependencies/action.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
name: "Install Non-Platform Dependencies"
description: "Installs non-platform dependencies: Flutter, aft"
inputs:
flutter-channel:
channel:
required: false
description: The Flutter channel to user when running tests. Defaults to "stable".
# TODO: Update to `stable` with Dart 3
default: beta
default: stable
flutter-version:
required: false
description: The specific version of Flutter to run tests against.
Expand All @@ -16,7 +15,7 @@ runs:
- uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d # 2.8.0
with:
cache: true
channel: ${{ inputs.flutter-channel }}
channel: ${{ inputs.channel }}
flutter-version: ${{ inputs.flutter-version }}

# Install aft from path, links packages and runs build runner where needed.
Expand All @@ -25,8 +24,5 @@ runs:
run: |
git submodule update --init
dart pub global activate -spath packages/aft
if [[ "${{ inputs.flutter-channel }}" == "stable" ]]; then
dart pub global run aft --config=aft.legacy.yaml constraints apply
fi
dart pub global run aft link
dart pub global run aft exec --include="amplify_secure_storage_dart,amplify_auth_cognito_dart" -- dart run build_runner build --delete-conflicting-outputs
2 changes: 1 addition & 1 deletion .github/workflows/aft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Setup Dart
uses: dart-lang/setup-dart@196f54580e9eee2797c57e85e289339f85e6779d # main
with:
sdk: beta
sdk: stable

- name: Get Packages
working-directory: packages/aft
Expand Down
23 changes: 20 additions & 3 deletions .github/workflows/amplify_canaries.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,14 @@ jobs:
strategy:
fail-fast: false
matrix:
channel:
- "beta"
- "stable"
flutter-version:
- "any" # latest
- "3.3.0"
include:
- channel: "stable"
flutter-version: "3.10.0"
steps:
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
with:
Expand All @@ -26,6 +31,7 @@ jobs:
- name: Install dependencies
uses: ./.github/composite_actions/install_dependencies
with:
channel: ${{ matrix.channel }}
flutter-version: ${{ matrix.flutter-version }}

# Flutter requires Java 11 to build android apps with Gradle.
Expand All @@ -49,9 +55,14 @@ jobs:
strategy:
fail-fast: false
matrix:
channel:
- "beta"
- "stable"
flutter-version:
- "any" # latest
- "3.3.0"
include:
- channel: "stable"
flutter-version: "3.10.0"
steps:
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
with:
Expand All @@ -61,6 +72,7 @@ jobs:
- name: Install dependencies
uses: ./.github/composite_actions/install_dependencies
with:
channel: ${{ matrix.channel }}
flutter-version: ${{ matrix.flutter-version }}

# Flutter requires Java 11 to build android apps with Gradle.
Expand Down Expand Up @@ -93,9 +105,14 @@ jobs:
strategy:
fail-fast: false
matrix:
channel:
- "beta"
- "stable"
flutter-version:
- "any" # latest
- "3.3.0"
include:
- channel: "stable"
flutter-version: "3.10.0"
ios-version:
- "13.7"
- "16"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/amplify_integration_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ jobs:
# - name: Install dependencies
# uses: ./.github/composite_actions/install_dependencies
# with:
# flutter-channel: stable
# channel: stable
# flutter-version: "3.3.10"

# - name: Fetch Amplify backend configurations
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/dart_dart2js.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ jobs:
matrix:
sdk:
# Minimum supported Dart version
# - '3.0.0'
- "3.0.0"
- stable
- beta
browser:
- chrome
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/dart_ddc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ jobs:
matrix:
sdk:
# Minimum supported Dart version
# - '3.0.0'
- "3.0.0"
- stable
- beta
browser:
- chrome
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/dart_native.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ jobs:
- name: Setup Dart
uses: dart-lang/setup-dart@196f54580e9eee2797c57e85e289339f85e6779d # main
with:
# sdk: stable
sdk: beta
sdk: stable

- name: Setup aft
shell: bash # Run in bash regardless of platform
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/dart_vm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ jobs:
matrix:
sdk:
# Minimum supported Dart version
# - '3.0.0'
- "3.0.0"
- stable
- beta
steps:
- name: Cache Pub dependencies
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/flutter_android.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ jobs:
# Allows other matrix items to run if one fails
fail-fast: false
matrix:
sdk:
channel:
- stable
- beta
steps:
- name: Git Checkout
Expand All @@ -33,7 +34,7 @@ jobs:
uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d # 2.8.0
with:
cache: true
channel: ${{ matrix.sdk }}
channel: ${{ matrix.channel }}

- name: Setup aft
run: flutter pub global activate -spath packages/aft
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/flutter_ios.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ jobs:
# Allows other matrix items to run if one fails
fail-fast: false
matrix:
sdk:
channel:
- stable
- beta
steps:
- name: Git Checkout
Expand All @@ -38,7 +39,7 @@ jobs:
uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d # 2.8.0
with:
cache: true
channel: ${{ matrix.sdk }}
channel: ${{ matrix.channel }}

- name: Setup aft
run: flutter pub global activate -spath packages/aft
Expand Down
15 changes: 11 additions & 4 deletions .github/workflows/flutter_vm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,14 @@ jobs:
# Allows other matrix items to run if one fails
fail-fast: false
matrix:
sdk:
- beta
channel:
- "beta"
- "stable"
flutter-version:
- "any" # latest
include:
- channel: "stable"
flutter-version: "3.10.0"
steps:
- name: Git Checkout
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # 3.1.0
Expand All @@ -29,7 +35,8 @@ jobs:
uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d # 2.8.0
with:
cache: true
channel: ${{ matrix.sdk }}
channel: ${{ matrix.channel }}
flutter-version: ${{ matrix.flutter-version }}

- name: Setup aft
run: flutter pub global activate -spath packages/aft
Expand Down Expand Up @@ -71,6 +78,6 @@ jobs:
working-directory: ${{ inputs.working-directory }}

- name: Run Tests
if: "always() && steps.bootstrap.conclusion == 'success' && steps.testCheck.outputs.hasTests == 'true' && matrix.flutter-version != '3.3.0'"
if: "always() && steps.bootstrap.conclusion == 'success' && steps.testCheck.outputs.hasTests == 'true'"
run: flutter test
working-directory: ${{ inputs.working-directory }}
2 changes: 1 addition & 1 deletion .github/workflows/generate_workflows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup Dart
uses: dart-lang/setup-dart@196f54580e9eee2797c57e85e289339f85e6779d # main
with:
sdk: beta
sdk: stable

- name: Setup aft
shell: bash # Run in bash regardless of platform
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/smoke_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Setup Dart
uses: dart-lang/setup-dart@196f54580e9eee2797c57e85e289339f85e6779d # main
with:
sdk: beta
sdk: stable

- name: Link Packages
run: |
Expand Down
10 changes: 0 additions & 10 deletions aft.legacy.yaml

This file was deleted.

14 changes: 7 additions & 7 deletions aft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ dependencies:
built_value: ">=8.5.0 <8.6.0"
built_value_generator: 8.5.0
code_builder: 4.4.0
dart_style: 2.3.0
drift: ">=2.4.0 <2.7.0"
dart_style: 2.3.1
drift: ">=2.4.0 <2.9.0"
flutter_plugin_android_lifecycle: ^2.0.9
json_annotation: ">=4.8.0 <4.9.0"
json_serializable: 6.6.1
intl: ">=0.17.0 <1.0.0"
json_annotation: ">=4.8.1 <4.9.0"
json_serializable: 6.6.2
intl: ">=0.18.0 <1.0.0"
mime: ^1.0.0
pigeon: ^9.2.4
stack_trace: ^1.10.0
Expand All @@ -27,8 +27,8 @@ dependencies:

# The current constraints for SDKs and OSs.
environment:
sdk: ">=3.0.0-0 <4.0.0"
flutter: ">=3.10.0-0"
sdk: ^3.0.0
flutter: ">=3.10.0"
android:
minSdkVersion: "24"
ios:
Expand Down
10 changes: 6 additions & 4 deletions canaries/lib/models/ModelProvider.dart
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,15 @@ class ModelProvider implements ModelProviderInterface {
List<ModelSchema> customTypeSchemas = [];

static ModelProvider get instance => _instance;

ModelType getModelTypeByModelName(String modelName) {
switch(modelName) {
switch (modelName) {
case "Todo":
return Todo.classType;
default:
throw Exception("Failed to find model in model provider for model name: " + modelName);
throw Exception(
"Failed to find model in model provider for model name: " +
modelName);
}
}
}
}
Loading