Skip to content

Commit

Permalink
Merge branch 'main' into support-flutter-3.27
Browse files Browse the repository at this point in the history
  • Loading branch information
jpeiffer authored Dec 12, 2024
2 parents ceb82ec + dce282c commit 7012297
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 31 deletions.
10 changes: 10 additions & 0 deletions annotation/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
## [1.0.3+13] - December 10, 2024

* Automated dependency updates


## [1.0.3+12] - December 3, 2024

* Automated dependency updates


## [1.0.3+11] - October 1, 2024

* Automated dependency updates
Expand Down
18 changes: 9 additions & 9 deletions annotation/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
name: 'json_theme_annotation'
description: 'Simple package holding the annotations needed by the JsonTheme code generator.'
homepage: 'https://github.com/peiffer-innovations/json_theme'
version: '1.0.3+11'
version: '1.0.3+13'

environment:
environment:
sdk: '>=3.0.0 <4.0.0'

analyzer:
exclude:
analyzer:
exclude:
- 'lib/generated/**'
- 'lib/**/*.g.dart'

dev_dependencies:
dev_dependencies:
flutter_lints: '^5.0.0'
test: '^1.25.8'
test: '^1.25.12'

permittedLicenses:
permittedLicenses:
- 'Apache-2.0'
- 'BSD-2-Clause'
- 'BSD-3-Clause'
Expand All @@ -24,7 +24,7 @@ permittedLicenses:
- 'MPL-2.0'
- 'Zlib'

packageLicenseOverride:
packageLicenseOverride:
flutter: 'BSD-3-Clause'
flutter_driver: 'BSD-3-Clause'
flutter_goldens: 'BSD-3-Clause'
Expand All @@ -35,7 +35,7 @@ packageLicenseOverride:
integration_test: 'BSD-3-Clause'
rxdart: 'Apache-2.0'

ignore_updates:
ignore_updates:
- 'archive'
- 'async'
- 'boolean_selector'
Expand Down
5 changes: 5 additions & 0 deletions codegen/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## [1.1.3+4] - December 10, 2024

* Automated dependency updates


## [1.1.3+3] - November 5, 2024

* Automated dependency updates
Expand Down
4 changes: 2 additions & 2 deletions codegen/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'json_theme_codegen'
description: 'A library to generate the mapping of decoders to the class names they decode'
homepage: 'https://github.com/peiffer-innovations/json_theme'
version: '1.1.3+3'
version: '1.1.3+4'

environment:
sdk: '>=3.0.0 <4.0.0'
Expand All @@ -16,7 +16,7 @@ dependencies:
build: '^2.4.1'
build_runner: '^2.4.13'
code_builder: '^4.10.1'
json_theme_annotation: '^1.0.3+11'
json_theme_annotation: '^1.0.3+12'
recase: '^4.1.0'
source_gen: '^1.5.0'

Expand Down
11 changes: 11 additions & 0 deletions json_theme/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
* Add support to flutter 3.27


## [6.5.4+1] - December 10, 2024

* Automated dependency updates


## [6.5.4] - November 30th, 2024

* Updated dependency on example for `intl`.
* Updated `json_class` dependency due to `intl`.


## [6.5.3+6] - November 12, 2024

* Automated dependency updates
Expand Down
36 changes: 18 additions & 18 deletions json_theme/example/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
name: 'example'
description: 'Example application for the JSON Theme'
publish_to: 'none'
version: '1.0.0+41'
version: '1.0.0+42'

environment:
environment:
sdk: '>=3.3.0 <4.0.0'

dependencies:
flutter:
dependencies:
flutter:
sdk: 'flutter'
form_validation: '^3.1.1+8'
form_validation: '^3.2.0'
google_fonts: '^6.2.1'
intl: '^0.19.0'
json_theme:
intl: '>=0.19.0<1.0.0'
json_theme:
path: '../'
meta: '^1.12.0'

dev_dependencies:
dev_dependencies:
flutter_lints: '^5.0.0'
flutter_test:
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'

permittedLicenses:
permittedLicenses:
- 'Apache-2.0'
- 'BSD-2-Clause'
- 'BSD-3-Clause'
Expand All @@ -45,7 +45,7 @@ permittedLicenses:
- 'MPL-2.0'
- 'Zlib'

packageLicenseOverride:
packageLicenseOverride:
flutter: 'BSD-3-Clause'
flutter_driver: 'BSD-3-Clause'
flutter_goldens: 'BSD-3-Clause'
Expand All @@ -56,7 +56,7 @@ packageLicenseOverride:
integration_test: 'BSD-3-Clause'
rxdart: 'Apache-2.0'

ignore_updates:
ignore_updates:
- 'archive'
- 'async'
- 'boolean_selector'
Expand Down
4 changes: 2 additions & 2 deletions json_theme/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ analyzer:
dependencies:
flutter:
sdk: 'flutter'
json_class: '^3.0.0+16'
json_class: '^3.0.1'
json_schema: '^5.2.0'
json_theme_annotation: '^1.0.3+11'
json_theme_annotation: '^1.0.3+13'
logging: '^1.3.0'
meta: '^1.12.0'

Expand Down

0 comments on commit 7012297

Please sign in to comment.