Start of Flutter 3.22

peiffer-innovations · May 14, 2024 · 95ebc99 · 95ebc99
1 parent de67f0d
commit 95ebc99
Show file tree

Hide file tree

Showing 58 changed files with 9,744 additions and 9,788 deletions.
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Flutter
         uses: subosito/flutter-action@v2

diff --git a/.github/workflows/publish_annotation.yml b/.github/workflows/publish_annotation.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Validate
         uses: peiffer-innovations/actions-flutter-validate@v1

diff --git a/.github/workflows/publish_codegen.yml b/.github/workflows/publish_codegen.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Validate
         uses: peiffer-innovations/actions-flutter-validate@v1

diff --git a/.github/workflows/publisher.yml b/.github/workflows/publisher.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
@@ -32,7 +32,7 @@ jobs:
           path: json_theme
 
       - name: Checkout Schemas
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: peiffer-innovations/flutter_json_schemas
           token: ${{ secrets.REPO_TOKEN }}

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Validate
         uses: peiffer-innovations/actions-flutter-validate@v1
         with:

diff --git a/.github/workflows/update_dependencies.yml b/.github/workflows/update_dependencies.yml
@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - name: Dependencies
-        uses: peiffer-innovations/actions-dart-dependency-updater@v1.0.18
+        uses: peiffer-innovations/actions-dart-dependency-updater@v1
         with:
           merge: true
           paths: annotation
@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: Dependencies
-        uses: peiffer-innovations/actions-dart-dependency-updater@v1.0.18
+        uses: peiffer-innovations/actions-dart-dependency-updater@v1
         with:
           merge: true
           paths: codegen
@@ -39,7 +39,7 @@ jobs:
 
     steps:
       - name: Dependencies
-        uses: peiffer-innovations/actions-dart-dependency-updater@v1.0.18
+        uses: peiffer-innovations/actions-dart-dependency-updater@v1
         with:
           merge: true
           paths: json_theme,json_theme/example

diff --git a/annotation/pubspec.yaml b/annotation/pubspec.yaml
@@ -3,19 +3,19 @@ description: 'Simple package holding the annotations needed by the JsonTheme cod
 homepage: 'https://github.com/peiffer-innovations/json_theme'
 version: '1.0.3+7'
 
-environment: 
+environment:
   sdk: '>=3.0.0 <4.0.0'
 
-analyzer: 
-  exclude: 
+analyzer:
+  exclude:
     - 'lib/generated/**'
     - 'lib/**/*.g.dart'
 
-dev_dependencies: 
-  flutter_lints: '^3.0.2'
+dev_dependencies:
+  flutter_lints: '^4.0.0'
   test: '^1.25.5'
 
-ignore_updates: 
+ignore_updates:
   - 'archive'
   - 'async'
   - 'boolean_selector'

diff --git a/codegen/pubspec.yaml b/codegen/pubspec.yaml
@@ -3,15 +3,15 @@ description: 'A library to generate the mapping of decoders to the class names t
 homepage: 'https://github.com/peiffer-innovations/json_theme'
 version: '1.1.2+14'
 
-environment: 
+environment:
   sdk: '>=3.0.0 <4.0.0'
 
-analyzer: 
-  exclude: 
+analyzer:
+  exclude:
     - 'lib/generated/**'
     - 'lib/**/*.g.dart'
 
-dependencies: 
+dependencies:
   analyzer: '^6.4.1'
   build: '^2.4.1'
   build_runner: '^2.4.9'
@@ -20,15 +20,15 @@ dependencies:
   recase: '^4.1.0'
   source_gen: '^1.5.0'
 
-dev_dependencies: 
-  flutter_lints: '^3.0.2'
-  test: '^1.25.4'
+dev_dependencies:
+  flutter_lints: '^4.0.0'
+  test: '^1.25.5'
 
-dependency_overrides: 
-  json_theme_annotation: 
+dependency_overrides:
+  json_theme_annotation:
     path: '../annotation'
 
-ignore_updates: 
+ignore_updates:
   - 'archive'
   - 'async'
   - 'boolean_selector'

diff --git a/json_theme/CHANGELOG.md b/json_theme/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [6.5.0] - May 14th, 2024
+
+* Swapped MaterialStateProperty with WidgetStateProperty in preperation for other Flutter 3.22 work.
+
+
 ## [6.4.1+5] - April 30, 2024
 
 * Automated dependency updates

diff --git a/json_theme/example/macos/Podfile.lock b/json_theme/example/macos/Podfile.lock
@@ -16,8 +16,8 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
-  path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
+  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
 
 PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.15.2
diff --git a/json_theme/example/macos/Runner.xcodeproj/project.pbxproj b/json_theme/example/macos/Runner.xcodeproj/project.pbxproj
@@ -203,7 +203,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "The Flutter Authors";
 				TargetAttributes = {
 					33CC10EC2044A3C60003C045 = {

diff --git a/json_theme/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/json_theme/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/json_theme/example/pubspec.yaml b/json_theme/example/pubspec.yaml
@@ -3,40 +3,40 @@ description: 'Example application for the JSON Theme'
 publish_to: 'none'
 version: '1.0.0+39'
 
-environment: 
+environment:
   sdk: '>=3.3.0 <4.0.0'
 
-dependencies: 
-  flutter: 
+dependencies:
+  flutter:
     sdk: 'flutter'
   form_validation: '^3.1.1+5'
   google_fonts: '^6.2.1'
   intl: '^0.19.0'
-  json_theme: 
+  json_theme:
     path: '../'
-  meta: '^1.10.0'
+  meta: '1.12.0'
 
-dev_dependencies: 
-  flutter_lints: '^3.0.2'
-  flutter_test: 
+dev_dependencies:
+  flutter_lints: '^4.0.0'
+  flutter_test:
     sdk: 'flutter'
 
-flutter: 
+flutter:
   uses-material-design: true
-  assets: 
+  assets:
     - 'assets/themes/'
-  fonts: 
+  fonts:
     - family: 'lato'
-      fonts: 
+      fonts:
         - asset: 'assets/fonts/Lato-Regular.ttf'
     - family: 'metal'
-      fonts: 
+      fonts:
         - asset: 'assets/fonts/MetalMania-Regular.ttf'
     - family: 'MaterialIcons'
-      fonts: 
+      fonts:
         - asset: 'assets/fonts/MaterialIcons-Regular.ttf'
 
-ignore_updates: 
+ignore_updates:
   - 'archive'
   - 'async'
   - 'boolean_selector'

diff --git a/json_theme/lib/json_theme.dart b/json_theme/lib/json_theme.dart
@@ -2,4 +2,4 @@ export 'json_theme_schemas.dart';
 //
 export 'src/codec/theme_decoder.dart';
 export 'src/codec/theme_encoder.dart';
-export 'src/model/json_material_state_property.dart';
+export 'src/model/json_widget_state_property.dart';