Skip to content

Commit

Permalink
Merge pull request #71 from sdresselmann/task/update_dependencies
Browse files Browse the repository at this point in the history
Task/update dependencies
  • Loading branch information
sdresselmann authored Apr 25, 2024
2 parents a217385 + d085a47 commit e8f1618
Show file tree
Hide file tree
Showing 11 changed files with 172 additions and 165 deletions.
1 change: 0 additions & 1 deletion .env

This file was deleted.

20 changes: 10 additions & 10 deletions .github/workflows/code_analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '11'
- uses: subosito/flutter-action@v2
with:
flutter-version: '3.13.9'
- run: flutter analyze
- run: dart format lib
- uses: actions/checkout@v3
- uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '11'
- uses: subosito/flutter-action@v2
with:
flutter-version: '3.19.6'
- run: flutter analyze
- run: dart format lib
49 changes: 23 additions & 26 deletions .github/workflows/flutter_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,26 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '11'
- uses: subosito/flutter-action@v2
with:
flutter-version: '3.13.9'

- name: Patch for linux build
run: |
flutter doctor
sudo apt-get update -y
sudo apt-get install -y ninja-build libgtk-3-dev
flutter doctor
- run: flutter pub get
- run: flutter test
- name: run integration tests under Xfvb
run: |
export DISPLAY=:99
sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
flutter test -d linux integration_test/regression.dart
- uses: actions/checkout@v3
- uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '11'
- uses: subosito/flutter-action@v2
with:
flutter-version: '3.19.6'

- name: Patch for linux build
run: |
flutter doctor
sudo apt-get update -y
sudo apt-get install -y ninja-build libgtk-3-dev
flutter doctor
- run: flutter pub get
- run: flutter test
- name: run integration tests under Xfvb
run: |
export DISPLAY=:99
sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
flutter test -d linux integration_test/regression.dart
8 changes: 3 additions & 5 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,11 @@ include: package:lint/analysis_options.yaml

# You might want to exclude auto-generated files from dart analysis
analyzer:
strong-mode:
# implicit-casts: true
language:
strict-casts: true
strict-raw-types: true
strict-casts: true
strict-raw-types: true
exclude:
#- '**.freezed.dart'
#- '**.freezed.dart'

linter:
# The lint rules applied to this project can be customized in the
Expand Down
2 changes: 1 addition & 1 deletion lib/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'package:lifting_progress_tracker/core/constants/localization.dart';
import 'package:lifting_progress_tracker/core/constants/routes.dart';

class MyApp extends StatelessWidget {
const MyApp({Key? key}) : super(key: key);
const MyApp({super.key});

@override
Widget build(BuildContext context) {
Expand Down
11 changes: 6 additions & 5 deletions lib/app_utils.dart
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:get_it/get_it.dart';
import 'package:lifting_progress_tracker/core/services/user_service.dart';
import 'package:lifting_progress_tracker/core/utils/logging.dart';
import 'package:lifting_progress_tracker/core/utils/service_locators.dart';
import 'package:lifting_progress_tracker/firebase/services/firebase_service.dart';

Future<void> setupAppUtils() async {
void setupAppUtils() {
registerLazySingletons();
await dotenv.load();

setupLogging();
await setup();
setup();
}

Future<void> setup() async {
await GetIt.I.get<FirebaseService>().initializeFirebaseApp();
final UserService userService = GetIt.I.get<UserService>();
setupCurrentUser();
}

Future<void> setupCurrentUser() async {
final UserService userService = GetIt.I.get<UserService>();
await userService.initializeUser();
userService.initUserCollections();
}
2 changes: 1 addition & 1 deletion lib/firebase/firebase_options.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// File generated by FlutterFire CLI.
// ignore_for_file: lines_longer_than_80_chars, avoid_classes_with_only_static_members
// ignore_for_file: lines_longer_than_80_chars, avoid_classes_with_only_static_members, combinators_ordering
import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
import 'package:flutter/foundation.dart'
show defaultTargetPlatform, kIsWeb, TargetPlatform;
Expand Down
7 changes: 2 additions & 5 deletions lib/firebase/services/firebase_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import 'dart:async';

import 'package:firebase_auth/firebase_auth.dart';
import 'package:firebase_core/firebase_core.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:lifting_progress_tracker/core/models/app_user.dart';
import 'package:lifting_progress_tracker/firebase/firebase_options.dart';
import 'package:logging/logging.dart';
Expand Down Expand Up @@ -49,10 +48,8 @@ class FirebaseService {

// Authenticate with test user for dev purposes!
Future<void> signInTestUser() async {
final String? username = dotenv.env["TEST_USER_EMAIL"];
final String? password = dotenv.env["TEST_USER_PASSWORD"];

if (username == null || password == null) return;
const String username = String.fromEnvironment("TEST_USER_EMAIL");
const String password = String.fromEnvironment("TEST_USER_PASSWORD");

try {
final UserCredential userCredential = await _signIn(
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/starting/starting.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const String _title = "Home";

/// The page used as main entry point for this app.
class StartingPage extends StatefulWidget {
const StartingPage({Key? key}) : super(key: key);
const StartingPage({super.key});

@override
State<StartingPage> createState() => _StartingPageState();
Expand Down
Loading

0 comments on commit e8f1618

Please sign in to comment.