Skip to content

Commit

Permalink
Merge branch 'dev' into feature/templatestudies
Browse files Browse the repository at this point in the history
  • Loading branch information
johannesvedder committed Jul 23, 2024
2 parents 30a1888 + ea9597d commit 46c1415
Show file tree
Hide file tree
Showing 13 changed files with 57 additions and 30 deletions.
3 changes: 3 additions & 0 deletions .fvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"flutter": "3.22.3"
}
1 change: 1 addition & 0 deletions .github/workflows/e2e_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
paths:
- ".github/workflows/e2e_tests.yml"
- ".github/workflows/init-workspace/action.yml"
- 'designer_v2/**'
- 'core/**'
- 'flutter_common/**'
Expand Down
18 changes: 13 additions & 5 deletions .github/workflows/init-workspace/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,20 @@ description: Initialize workspace for all packages
runs:
using: "composite"
steps:
- name: Set up Flutter
uses: subosito/flutter-action@v2
- uses: kuhnroyal/flutter-fvm-config-action@v2
id: fvm-config-action

- uses: subosito/flutter-action@v2
with:
channel: stable
# Increase this version manually when we add support for a new Flutter release
flutter-version: '3.22.x'
flutter-version: ${{ steps.fvm-config-action.outputs.FLUTTER_VERSION }}
channel: ${{ steps.fvm-config-action.outputs.FLUTTER_CHANNEL }}
id: flutter-action

- run: |
echo CACHE-PATH=${{ steps.flutter-action.outputs.CACHE-PATH }}
mkdir -p .fvm
ln -s ${{ steps.flutter-action.outputs.CACHE-PATH }} .fvm/flutter_sdk
shell: bash
- name: Install melos
run: dart pub global activate melos
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -161,3 +161,6 @@ generated/

# Megalinter
megalinter-reports/

# FVM Version Cache
.fvm/
14 changes: 13 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Getting Started

1. [Setup Flutter](https://flutter.dev/docs/get-started/install)
2. Make sure both flutter and dart are in your PATH. Run `dart --version` and
2. Make sure `flutter` and `dart` are both in your PATH. Run `dart --version` and
`flutter --version` to check.
3. Clone this repository and `cd` into it.
4. Install [Melos](https://melos.invertase.dev/) by running: `dart pub global
Expand Down Expand Up @@ -90,6 +90,18 @@ features or bug fixes, create a new branch and open a pull request.

Please make sure to follow these guidelines when contributing to the project.

## Flutter Version Management

The StudyU monorepo uses the [FVM](https://fvm.app/) tool to manage the Flutter
SDK version. This allows us to have a consistent Flutter version across all
packages. The Flutter SDK version is specified in the `.fvm` file in the root
directory. To install the Flutter SDK version, run `fvm install` in the root directory.
You might also want to integrate FVM within your IDE. For Android Studio you can change the Flutter
SDK path in the settings for the Flutter plugin. Open the Android Studio settings and navigate to
Languages & Frameworks -> Flutter -> Flutter SDK path and set the path to the FVM Flutter SDK
(`<path to the studyu repository>/.fvm/flutter_sdk`). For VS Code, have a look at
the [FVM documentation](https://fvm.app/documentation/guides/vscode).

## Database and Backend

We are using a self-hosted instance of [Supabase](https://supabase.com/) as a
Expand Down
4 changes: 2 additions & 2 deletions app/android/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ GEM
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.3.0)
aws-partitions (1.956.0)
aws-sdk-core (3.201.1)
aws-partitions (1.957.0)
aws-sdk-core (3.201.2)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
Expand Down
8 changes: 4 additions & 4 deletions app/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1105,10 +1105,10 @@ packages:
dependency: transitive
description:
name: shared_preferences_platform_interface
sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b"
sha256: "034650b71e73629ca08a0bd789fd1d83cc63c2d1e405946f7cef7bc37432f93a"
url: "https://pub.dev"
source: hosted
version: "2.3.2"
version: "2.4.0"
shared_preferences_web:
dependency: transitive
description:
Expand Down Expand Up @@ -1308,10 +1308,10 @@ packages:
dependency: transitive
description:
name: url_launcher_android
sha256: eac82dc8e5f48818054f46021e9e5f34c239f8d301e7e29165b977c8d1189fed
sha256: "95d8027db36a0e52caf55680f91e33ea6aa12a3ce608c90b06f4e429a21067ac"
url: "https://pub.dev"
source: hosted
version: "6.3.4"
version: "6.3.5"
url_launcher_ios:
dependency: transitive
description:
Expand Down
6 changes: 3 additions & 3 deletions app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies:
flutter_local_notifications: ^17.2.1+2
flutter_localizations:
sdk: flutter
flutter_timezone: ^2.0.1
flutter_timezone: ^2.1.0
flutter_web_plugins:
sdk: flutter
flutter_widget_from_html: ^0.15.1
Expand All @@ -36,8 +36,8 @@ dependencies:
quiver: ^3.2.1
rainbow_color: ^2.0.1
record: ^5.1.2
sentry_flutter: ^8.3.0
sentry_logging: ^8.3.0
sentry_flutter: ^8.4.0
sentry_logging: ^8.4.0
shared_preferences: ^2.2.3
studyu_core: ^4.4.4
studyu_flutter_common: ^1.8.5
Expand Down
4 changes: 2 additions & 2 deletions core/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -226,10 +226,10 @@ packages:
dependency: transitive
description:
name: graphs
sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19
sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
url: "https://pub.dev"
source: hosted
version: "2.3.1"
version: "2.3.2"
http:
dependency: transitive
description:
Expand Down
12 changes: 6 additions & 6 deletions designer_v2/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -515,10 +515,10 @@ packages:
dependency: transitive
description:
name: graphs
sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19
sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
url: "https://pub.dev"
source: hosted
version: "2.3.1"
version: "2.3.2"
gtk:
dependency: transitive
description:
Expand Down Expand Up @@ -1048,10 +1048,10 @@ packages:
dependency: transitive
description:
name: shared_preferences_platform_interface
sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b"
sha256: "034650b71e73629ca08a0bd789fd1d83cc63c2d1e405946f7cef7bc37432f93a"
url: "https://pub.dev"
source: hosted
version: "2.3.2"
version: "2.4.0"
shared_preferences_web:
dependency: transitive
description:
Expand Down Expand Up @@ -1299,10 +1299,10 @@ packages:
dependency: transitive
description:
name: url_launcher_android
sha256: eac82dc8e5f48818054f46021e9e5f34c239f8d301e7e29165b977c8d1189fed
sha256: "95d8027db36a0e52caf55680f91e33ea6aa12a3ce608c90b06f4e429a21067ac"
url: "https://pub.dev"
source: hosted
version: "6.3.4"
version: "6.3.5"
url_launcher_ios:
dependency: transitive
description:
Expand Down
8 changes: 4 additions & 4 deletions flutter_common/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -500,10 +500,10 @@ packages:
dependency: transitive
description:
name: shared_preferences_platform_interface
sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b"
sha256: "034650b71e73629ca08a0bd789fd1d83cc63c2d1e405946f7cef7bc37432f93a"
url: "https://pub.dev"
source: hosted
version: "2.3.2"
version: "2.4.0"
shared_preferences_web:
dependency: transitive
description:
Expand Down Expand Up @@ -640,10 +640,10 @@ packages:
dependency: transitive
description:
name: url_launcher_android
sha256: eac82dc8e5f48818054f46021e9e5f34c239f8d301e7e29165b977c8d1189fed
sha256: "95d8027db36a0e52caf55680f91e33ea6aa12a3ce608c90b06f4e429a21067ac"
url: "https://pub.dev"
source: hosted
version: "6.3.4"
version: "6.3.5"
url_launcher_ios:
dependency: transitive
description:
Expand Down
2 changes: 1 addition & 1 deletion melos.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: studyu

repository: https://github.com/hpi-studyu/studyu
sdkPath: .fvm/flutter_sdk

packages:
- app
Expand Down
4 changes: 2 additions & 2 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,10 @@ packages:
dependency: transitive
description:
name: graphs
sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19
sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
url: "https://pub.dev"
source: hosted
version: "2.3.1"
version: "2.3.2"
http:
dependency: transitive
description:
Expand Down

0 comments on commit 46c1415

Please sign in to comment.