Skip to content

Commit

Permalink
Merge branch 'develop' into feature/notebook
Browse files Browse the repository at this point in the history
  • Loading branch information
CodeDoctorDE committed Mar 14, 2024
2 parents 240b893 + 0ba2af1 commit 5a87689
Show file tree
Hide file tree
Showing 39 changed files with 1,965 additions and 1,898 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
run: |
FLUTTER_VERSION=$(cat ../FLUTTER_VERSION)
echo "FLUTTER_VERSION=${FLUTTER_VERSION}" >> $GITHUB_ENV
- uses: subosito/flutter-action@v2
- uses: subosito/flutter-action@v2.12.0
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
channel: 'master'
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
run: |
FLUTTER_VERSION=$(cat ../FLUTTER_VERSION)
echo "FLUTTER_VERSION=${FLUTTER_VERSION}" >> $GITHUB_ENV
- uses: subosito/flutter-action@v2
- uses: subosito/flutter-action@v2.12.0
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
channel: 'master'
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
run: |
FLUTTER_VERSION=$(cat ../FLUTTER_VERSION)
echo "FLUTTER_VERSION=${FLUTTER_VERSION}" >> $GITHUB_ENV
- uses: subosito/flutter-action@v2
- uses: subosito/flutter-action@v2.12.0
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
channel: 'master'
Expand Down Expand Up @@ -256,7 +256,7 @@ jobs:
run: |
FLUTTER_VERSION=$(cat ../FLUTTER_VERSION)
echo "FLUTTER_VERSION=${FLUTTER_VERSION}" >> $GITHUB_ENV
- uses: subosito/flutter-action@v2
- uses: subosito/flutter-action@v2.12.0
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
channel: 'master'
Expand Down Expand Up @@ -320,7 +320,7 @@ jobs:
run: |
FLUTTER_VERSION=$(cat ../FLUTTER_VERSION)
echo "FLUTTER_VERSION=${FLUTTER_VERSION}" >> $GITHUB_ENV
- uses: subosito/flutter-action@v2
- uses: subosito/flutter-action@v2.12.0
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
channel: 'master'
Expand Down Expand Up @@ -460,7 +460,7 @@ jobs:
git pull --tags
- name: 🚀 Deploy stable
if: ${{ github.ref == 'refs/tags/stable' }}
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
continue-on-error: true
with:
prerelease: true
Expand All @@ -480,7 +480,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: 🚀 Deploy nightly
if: ${{ github.ref == 'refs/tags/nightly' }}
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
continue-on-error: true
with:
prerelease: true
Expand All @@ -499,7 +499,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
continue-on-error: true
if: startsWith(github.ref, 'refs/tags/v')
with:
Expand Down Expand Up @@ -553,7 +553,7 @@ jobs:
run: |
FLUTTER_VERSION=$(cat ../FLUTTER_VERSION)
echo "FLUTTER_VERSION=${FLUTTER_VERSION}" >> $GITHUB_ENV
- uses: subosito/flutter-action@v2
- uses: subosito/flutter-action@v2.12.0
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
channel: 'master'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/compress-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
compressOnly: true
- name: Create New Pull Request If Needed
if: steps.calibre.outputs.markdown != ''
uses: peter-evans/create-pull-request@v5
uses: peter-evans/create-pull-request@v6
with:
title: Compressed Images Nightly
branch-suffix: timestamp
Expand Down
18 changes: 11 additions & 7 deletions .github/workflows/dart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,21 @@ jobs:
runs-on: ubuntu-22.04
strategy:
matrix:
project: [api, app, tools]
projects: [app, api, tools]
defaults:
run:
working-directory: ${{ matrix.project }}
working-directory: ${{ matrix.projects }}
steps:
- name: ⬆️ Checkout
uses: actions/checkout@v4
- name: Get flutter version
working-directory: ./
run: |
FLUTTER_VERSION=$(cat ./FLUTTER_VERSION)
FLUTTER_VERSION=$(cat ../FLUTTER_VERSION)
echo "FLUTTER_VERSION=${FLUTTER_VERSION}" >> $GITHUB_ENV
- uses: subosito/flutter-action@v2
- uses: subosito/flutter-action@v2.12.0
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
channel: 'any'
channel: 'master'
- uses: actions/checkout@v4
- name: Print Dart SDK version
run: |
Expand All @@ -39,8 +38,13 @@ jobs:
- name: Analyze project source
run: |
flutter analyze --fatal-infos
- name: Run build_runner
if: matrix.projects != 'tools'
run: flutter pub run build_runner build --delete-conflicting-outputs
- name: Test for git changes
run: git diff --exit-code
# Your project will need to have tests in test/ and a dependency on
# package:test for this step to succeed. Note that Flutter projects will
# want to change this to 'flutter test'.
# - name: Run tests
# run: flutter test
# run: flutter test
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
run: |
FLUTTER_VERSION=$(cat FLUTTER_VERSION)
echo "FLUTTER_VERSION=${FLUTTER_VERSION}" >> $GITHUB_ENV
- uses: subosito/flutter-action@v2
- uses: subosito/flutter-action@v2.12.0
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
channel: "any"
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
run: |
FLUTTER_VERSION=$(cat FLUTTER_VERSION)
echo "FLUTTER_VERSION=${FLUTTER_VERSION}" >> $GITHUB_ENV
- uses: subosito/flutter-action@v2
- uses: subosito/flutter-action@v2.12.0
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
channel: "any"
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
token: ${{ secrets.CI_PAT }}
fetch-depth: 0
- name: Create release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
prerelease: ${{ github.event.inputs.stable != 'true' }}
tag_name: v${{ env.FLOW_VERSION }}
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
run: |
FLUTTER_VERSION=$(cat FLUTTER_VERSION)
echo "FLUTTER_VERSION=${FLUTTER_VERSION}" >> $GITHUB_ENV
- uses: subosito/flutter-action@v2
- uses: subosito/flutter-action@v2.12.0
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
channel: "any"
Expand Down Expand Up @@ -210,7 +210,7 @@ jobs:
run: |
FLUTTER_VERSION=$(cat FLUTTER_VERSION)
echo "FLUTTER_VERSION=${FLUTTER_VERSION}" >> $GITHUB_ENV
- uses: subosito/flutter-action@v2
- uses: subosito/flutter-action@v2.12.0
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
channel: "any"
Expand Down
2 changes: 1 addition & 1 deletion FLUTTER_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.16.5
3.19.3
1 change: 1 addition & 0 deletions api/analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ include: package:lints/recommended.yaml
analyzer:
exclude:
- "**/*.g.dart"
- "**/*.freezed.dart"
2 changes: 1 addition & 1 deletion api/lib/models/cached.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ part of 'cached.dart';
T _$identity<T>(T value) => value;

final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');

CachedData _$CachedDataFromJson(Map<String, dynamic> json) {
return _CachedData.fromJson(json);
Expand Down
2 changes: 1 addition & 1 deletion api/lib/models/event/item/model.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ part of 'model.dart';
T _$identity<T>(T value) => value;

final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');

CalendarItem _$CalendarItemFromJson(Map<String, dynamic> json) {
switch (json['runtimeType']) {
Expand Down
2 changes: 1 addition & 1 deletion api/lib/models/event/model.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ part of 'model.dart';
T _$identity<T>(T value) => value;

final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');

Event _$EventFromJson(Map<String, dynamic> json) {
return _Event.fromJson(json);
Expand Down
2 changes: 1 addition & 1 deletion api/lib/models/extra.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ part of 'extra.dart';
T _$identity<T>(T value) => value;

final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');

ExtraProperties _$ExtraPropertiesFromJson(Map<String, dynamic> json) {
return CalDavExtraProperties.fromJson(json);
Expand Down
2 changes: 1 addition & 1 deletion api/lib/models/group/model.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ part of 'model.dart';
T _$identity<T>(T value) => value;

final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');

Group _$GroupFromJson(Map<String, dynamic> json) {
return _Group.fromJson(json);
Expand Down
2 changes: 1 addition & 1 deletion api/lib/models/label/model.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ part of 'model.dart';
T _$identity<T>(T value) => value;

final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');

Label _$LabelFromJson(Map<String, dynamic> json) {
return _Label.fromJson(json);
Expand Down
2 changes: 1 addition & 1 deletion api/lib/models/model.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ part of 'model.dart';
T _$identity<T>(T value) => value;

final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');

/// @nodoc
mixin _$ConnectedModel<A, B> {
Expand Down
2 changes: 1 addition & 1 deletion api/lib/models/note/model.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ part of 'model.dart';
T _$identity<T>(T value) => value;

final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');

Notebook _$NotebookFromJson(Map<String, dynamic> json) {
return _Notebook.fromJson(json);
Expand Down
2 changes: 1 addition & 1 deletion api/lib/models/place/model.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ part of 'model.dart';
T _$identity<T>(T value) => value;

final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');

Place _$PlaceFromJson(Map<String, dynamic> json) {
return _Place.fromJson(json);
Expand Down
2 changes: 1 addition & 1 deletion api/lib/models/user/model.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ part of 'model.dart';
T _$identity<T>(T value) => value;

final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');

User _$UserFromJson(Map<String, dynamic> json) {
return _User.fromJson(json);
Expand Down
6 changes: 3 additions & 3 deletions api/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ dependencies:
freezed_annotation: ^2.4.1
json_annotation: ^4.8.1
collection: ^1.17.2
lib5: ^0.1.0
lib5: ^0.2.0
dart_leap:
git:
url: https://github.com/LinwoodDev/dart_pkgs
ref: 992f8062618ef1e78ee92efc7a709eb0d476e1d0
path: packages/dart_leap
dev_dependencies:
build_runner: ^2.4.7
freezed: ^2.4.6
build_runner: ^2.4.8
freezed: ^2.4.7
json_serializable: ^6.7.0
lints: ^3.0.0
test: ^1.25.0
2 changes: 1 addition & 1 deletion app/AppImageBuilder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ AppDir:
id: dev.linwood.flow
name: Linwood Flow
icon: dev.linwood.flow
version: 0.2.2
version: 0.3.0
exec: flow
exec_args: $@
apt:
Expand Down
1 change: 1 addition & 0 deletions app/analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ analyzer:
exclude:
- "build/**"
- "**/*.g.dart"
- "**/*.freezed.dart"
- "lib/generated_plugin_registrant.dart"
1 change: 1 addition & 0 deletions app/devtools_options.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
extensions:
10 changes: 5 additions & 5 deletions app/lib/api/storage/remote/model.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ part of 'model.dart';
T _$identity<T>(T value) => value;

final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');

RemoteStorage _$RemoteStorageFromJson(Map<String, dynamic> json) {
switch (json['runtimeType']) {
Expand Down Expand Up @@ -192,7 +192,7 @@ class _$CalDavStorageImpl extends CalDavStorage {
}

@override
bool operator ==(dynamic other) {
bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$CalDavStorageImpl &&
Expand Down Expand Up @@ -375,7 +375,7 @@ class _$ICalStorageImpl extends ICalStorage {
}

@override
bool operator ==(dynamic other) {
bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$ICalStorageImpl &&
Expand Down Expand Up @@ -558,7 +558,7 @@ class _$WebDavStorageImpl extends WebDavStorage {
}

@override
bool operator ==(dynamic other) {
bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$WebDavStorageImpl &&
Expand Down Expand Up @@ -741,7 +741,7 @@ class _$SiaStorageImpl extends SiaStorage {
}

@override
bool operator ==(dynamic other) {
bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$SiaStorageImpl &&
Expand Down
4 changes: 2 additions & 2 deletions app/lib/cubits/flow.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ part of 'flow.dart';
T _$identity<T>(T value) => value;

final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');

/// @nodoc
mixin _$FlowState {
Expand Down Expand Up @@ -109,7 +109,7 @@ class _$FlowStateImpl implements _FlowState {
}

@override
bool operator ==(dynamic other) {
bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$FlowStateImpl &&
Expand Down
4 changes: 2 additions & 2 deletions app/lib/cubits/settings.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ part of 'settings.dart';
T _$identity<T>(T value) => value;

final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');

/// @nodoc
mixin _$FlowSettings {
Expand Down Expand Up @@ -251,7 +251,7 @@ class _$FlowSettingsImpl extends _FlowSettings {
}

@override
bool operator ==(dynamic other) {
bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$FlowSettingsImpl &&
Expand Down
Loading

0 comments on commit 5a87689

Please sign in to comment.