Merge pull request #336 from Leptopoda/feature/melos

Feature/melos

.github/workflows/dart.yml

@@ -1,4 +1,4 @@
-# Created with package:mono_repo v6.5.5
+# Created with package:mono_repo v6.5.6
 name: Dart CI
 on:
   push:
@@ -33,7 +33,7 @@ jobs:
         name: Checkout repository
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
       - name: mono_repo self validate
-        run: dart pub global activate mono_repo 6.5.5
+        run: dart pub global activate mono_repo 6.5.6
       - name: mono_repo self validate
         run: dart pub global run mono_repo generate --validate
   job_002:

.gitignore

@@ -0,0 +1,6 @@
+
+.dart_tool/
+pubspec.lock
+
+# Melos reccomends not adding them to vcs but we need them as we don't use melos in CI
+# **/pubspec_overrides.yaml

melos.yaml

@@ -0,0 +1,19 @@
+name: nextcloud-neon
+repository: https://github.com/provokateurin/nextcloud-neon
+
+sdkPath: .fvm/flutter_sdk
+
+bootstrap:
+  # It seems so that running "pub get" in parallel has some issues (like
+  # https://github.com/dart-lang/pub/issues/3404). Disabling this feature
+  # makes the CI much more stable.
+  runPubGetInParallel: false
+
+packages:
+  - packages/*
+  - packages/dynamite/*
+  - packages/neon/*
+
+ide:
+  intellij:
+    enabled: false

packages/app/pubspec.lock

@@ -146,7 +146,7 @@ packages:
     source: hosted
     version: "0.7.8"
   dynamite_runtime:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
       path: "../dynamite/dynamite_runtime"
       relative: true
@@ -177,7 +177,7 @@ packages:
     source: hosted
     version: "6.1.4"
   file_icons:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
       path: "../file_icons"
       relative: true
@@ -534,7 +534,7 @@ packages:
     source: hosted
     version: "1.0.0"
   nextcloud:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
       path: "../nextcloud"
       relative: true
@@ -790,7 +790,7 @@ packages:
     source: hosted
     version: "0.1.6"
   settings:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
       path: "../settings"
       relative: true
@@ -882,7 +882,7 @@ packages:
     source: sdk
     version: "0.0.99"
   sort_box:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
       path: "../sort_box"
       relative: true

packages/app/pubspec.yaml

@@ -11,15 +11,25 @@ dependencies:
     sdk: flutter
   flutter_native_splash: ^2.2.19
   neon:
-    path: ../neon/neon
+    git:
+      url: https://github.com/provokateurin/nextcloud-neon
+      path: packages/neon/neon
   neon_files:
-    path: ../neon/neon_files
+    git:
+      url: https://github.com/provokateurin/nextcloud-neon
+      path: packages/neon/neon_files
   neon_news:
-    path: ../neon/neon_news
+    git:
+      url: https://github.com/provokateurin/nextcloud-neon
+      path: packages/neon/neon_news
   neon_notes:
-    path: ../neon/neon_notes
+    git:
+      url: https://github.com/provokateurin/nextcloud-neon
+      path: packages/neon/neon_notes
   neon_notifications:
-    path: ../neon/neon_notifications
+    git:
+      url: https://github.com/provokateurin/nextcloud-neon
+      path: packages/neon/neon_notifications
   shared_preferences: ^2.1.1
 
 dev_dependencies:

packages/app/pubspec_overrides.yaml

@@ -0,0 +1,27 @@
+# melos_managed_dependency_overrides: dynamite_runtime,file_icons,neon,neon_files,neon_news,neon_notes,neon_notifications,nextcloud,settings,sort_box,wakelock_windows
+dependency_overrides:
+  dynamite_runtime:
+    path: ../dynamite/dynamite_runtime
+  file_icons:
+    path: ../file_icons
+  neon:
+    path: ../neon/neon
+  neon_files:
+    path: ../neon/neon_files
+  neon_news:
+    path: ../neon/neon_news
+  neon_notes:
+    path: ../neon/neon_notes
+  neon_notifications:
+    path: ../neon/neon_notifications
+  nextcloud:
+    path: ../nextcloud
+  settings:
+    path: ../settings
+  sort_box:
+    path: ../sort_box
+  wakelock_windows:
+    git:
+      url: https://github.com/creativecreatorormaybenot/wakelock
+      ref: 094b4a74c31e547c11525bcc050dbd06b02a1f67
+      path: wakelock_windows

packages/neon/neon/pubspec.yaml

@@ -26,7 +26,9 @@ dependencies:
   json_annotation: ^4.8.1
   material_design_icons_flutter: ^6.0.7096
   nextcloud:
-    path: ../../nextcloud
+    git:
+      url: https://github.com/provokateurin/nextcloud-neon
+      path: packages/nextcloud
   package_info_plus: ^4.0.0
   path: ^1.8.3
   path_provider: ^2.0.15
@@ -35,10 +37,14 @@ dependencies:
   quick_actions: ^1.0.3
   rxdart: ^0.27.7
   settings:
-    path: ../../settings
+    git:
+      url: https://github.com/provokateurin/nextcloud-neon
+      path: packages/settings
   shared_preferences: ^2.1.1
   sort_box:
-    path: ../../sort_box
+    git:
+      url: https://github.com/provokateurin/nextcloud-neon
+      path: packages/sort_box
   sqflite: ^2.2.8+2
   sqflite_common_ffi: ^2.2.5
   tray_manager: ^0.2.0

packages/neon/neon/pubspec_overrides.yaml

@@ -0,0 +1,15 @@
+# melos_managed_dependency_overrides: dynamite_runtime,nextcloud,settings,sort_box,wakelock_windows
+dependency_overrides:
+  dynamite_runtime:
+    path: ../../dynamite/dynamite_runtime
+  nextcloud:
+    path: ../../nextcloud
+  settings:
+    path: ../../settings
+  sort_box:
+    path: ../../sort_box
+  wakelock_windows:
+    git:
+      url: https://github.com/creativecreatorormaybenot/wakelock
+      ref: 094b4a74c31e547c11525bcc050dbd06b02a1f67
+      path: wakelock_windows

packages/neon/neon_files/pubspec.yaml

@@ -9,7 +9,9 @@ environment:
 dependencies:
   collection: ^1.17.0
   file_icons:
-    path: ../../file_icons
+    git:
+      url: https://github.com/provokateurin/nextcloud-neon
+      path: packages/file_icons
   file_picker: ^5.3.0
   filesize: ^2.0.1
   flutter:
@@ -18,18 +20,27 @@ dependencies:
   intersperse: ^2.0.0
   material_design_icons_flutter: ^6.0.7096
   neon:
-    path: ../neon
+    git:
+      url: https://github.com/provokateurin/nextcloud-neon
+      path: packages/neon/neon
   nextcloud:
-    path: ../../nextcloud
+    git:
+      url: https://github.com/provokateurin/nextcloud-neon
+      path: packages/nextcloud
   open_file: ^3.3.1
   path: ^1.8.3
   provider: ^6.0.5
   queue: ^3.1.0+2
   rxdart: ^0.27.7
   settings:
-    path: ../../settings
+    git:
+      url: https://github.com/provokateurin/nextcloud-neon
+      path: packages/settings
+  share_plus: ^7.0.0
   sort_box:
-    path: ../../sort_box
+    git:
+      url: https://github.com/provokateurin/nextcloud-neon
+      path: packages/sort_box
 
 dev_dependencies:
   nit_picking:

packages/neon/neon_files/pubspec_overrides.yaml

@@ -0,0 +1,14 @@
+# melos_managed_dependency_overrides: dynamite_runtime,file_icons,neon,nextcloud,settings,sort_box
+dependency_overrides:
+  dynamite_runtime:
+    path: ../../dynamite/dynamite_runtime
+  file_icons:
+    path: ../../file_icons
+  neon:
+    path: ../neon
+  nextcloud:
+    path: ../../nextcloud
+  settings:
+    path: ../../settings
+  sort_box:
+    path: ../../sort_box

packages/neon/neon_news/pubspec.yaml

@@ -13,16 +13,24 @@ dependencies:
   html: ^0.15.3
   material_design_icons_flutter: ^6.0.7096
   neon:
-    path: ../neon
+    git:
+      url: https://github.com/provokateurin/nextcloud-neon
+      path: packages/neon/neon
   nextcloud:
-    path: ../../nextcloud
+    git:
+      url: https://github.com/provokateurin/nextcloud-neon
+      path: packages/nextcloud
   provider: ^6.0.5
   rxdart: ^0.27.7
   settings:
-    path: ../../settings
+    git:
+      url: https://github.com/provokateurin/nextcloud-neon
+      path: packages/settings
   share_plus: ^7.0.0
   sort_box:
-    path: ../../sort_box
+    git:
+      url: https://github.com/provokateurin/nextcloud-neon
+      path: packages/sort_box
   url_launcher: ^6.1.11
   wakelock: ^0.6.2
   webview_flutter: ^4.2.0

packages/neon/neon_news/pubspec_overrides.yaml

@@ -0,0 +1,17 @@
+# melos_managed_dependency_overrides: dynamite_runtime,neon,nextcloud,settings,sort_box,wakelock_windows
+dependency_overrides:
+  dynamite_runtime:
+    path: ../../dynamite/dynamite_runtime
+  neon:
+    path: ../neon
+  nextcloud:
+    path: ../../nextcloud
+  settings:
+    path: ../../settings
+  sort_box:
+    path: ../../sort_box
+  wakelock_windows:
+    git:
+      url: https://github.com/creativecreatorormaybenot/wakelock
+      ref: 094b4a74c31e547c11525bcc050dbd06b02a1f67
+      path: wakelock_windows

packages/neon/neon_notes/pubspec.yaml

@@ -13,16 +13,24 @@ dependencies:
   flutter_markdown: ^0.6.14
   material_design_icons_flutter: ^6.0.7096
   neon:
-    path: ../neon
+    git:
+      url: https://github.com/provokateurin/nextcloud-neon
+      path: packages/neon/neon
   nextcloud:
-    path: ../../nextcloud
+    git:
+      url: https://github.com/provokateurin/nextcloud-neon
+      path: packages/nextcloud
   provider: ^6.0.5
   queue: ^3.1.0+2
   rxdart: ^0.27.7
   settings:
-    path: ../../settings
+    git:
+      url: https://github.com/provokateurin/nextcloud-neon
+      path: packages/settings
   sort_box:
-    path: ../../sort_box
+    git:
+      url: https://github.com/provokateurin/nextcloud-neon
+      path: packages/sort_box
   url_launcher: ^6.1.11
   wakelock: ^0.6.2
 

packages/neon/neon_notes/pubspec_overrides.yaml

@@ -0,0 +1,17 @@
+# melos_managed_dependency_overrides: dynamite_runtime,neon,nextcloud,settings,sort_box,wakelock_windows
+dependency_overrides:
+  dynamite_runtime:
+    path: ../../dynamite/dynamite_runtime
+  neon:
+    path: ../neon
+  nextcloud:
+    path: ../../nextcloud
+  settings:
+    path: ../../settings
+  sort_box:
+    path: ../../sort_box
+  wakelock_windows:
+    git:
+      url: https://github.com/creativecreatorormaybenot/wakelock
+      ref: 094b4a74c31e547c11525bcc050dbd06b02a1f67
+      path: wakelock_windows

packages/neon/neon_notifications/pubspec.yaml

@@ -11,9 +11,13 @@ dependencies:
     sdk: flutter
   material_design_icons_flutter: ^6.0.7096
   neon:
-    path: ../neon
+    git:
+      url: https://github.com/provokateurin/nextcloud-neon
+      path: packages/neon/neon
   nextcloud:
-    path: ../../nextcloud
+    git:
+      url: https://github.com/provokateurin/nextcloud-neon
+      path: packages/nextcloud
   provider: ^6.0.5
   rxdart: ^0.27.7
 

packages/neon/neon_notifications/pubspec_overrides.yaml

@@ -0,0 +1,12 @@
+# melos_managed_dependency_overrides: dynamite_runtime,neon,nextcloud,settings,sort_box
+dependency_overrides:
+  dynamite_runtime:
+    path: ../../dynamite/dynamite_runtime
+  neon:
+    path: ../neon
+  nextcloud:
+    path: ../../nextcloud
+  settings:
+    path: ../../settings
+  sort_box:
+    path: ../../sort_box

packages/nextcloud/README.md

@@ -15,6 +15,13 @@ dependencies:
       url: https://github.com/provokateurin/nextcloud-neon
       path: packages/nextcloud
       ref: $COMMIT
+
+dependency_overrides:
+  dynamite_runtime:
+    git:
+      url: https://github.com/provokateurin/nextcloud-neon
+      path: packages/dynamite/dynamite_runtime
+      ref: $COMMIT
 ```
 You can either remove the `ref` or use a commit hash. It's not recommended to remove it, because then the version will be updated very often.
 

packages/nextcloud/pubspec.yaml

@@ -12,7 +12,9 @@ dependencies:
   crypto: ^3.0.3
   crypton: ^2.0.5
   dynamite_runtime:
-    path: ../dynamite/dynamite_runtime
+    git:
+      url: https://github.com/provokateurin/nextcloud-neon
+      path: packages/dynamite/dynamite_runtime
   intl: ^0.18.0
   universal_io: ^2.2.0
   version: ^3.0.2
@@ -24,7 +26,9 @@ dev_dependencies:
   built_value_generator: ^8.5.0
   coverage: ^1.6.3
   dynamite:
-    path: ../dynamite/dynamite
+    git:
+      url: https://github.com/provokateurin/nextcloud-neon
+      path: packages/dynamite/dynamite
   nit_picking:
     git:
       url: https://github.com/stack11/dart_nit_picking

packages/nextcloud/pubspec_overrides.yaml

@@ -0,0 +1,6 @@
+# melos_managed_dependency_overrides: dynamite,dynamite_runtime
+dependency_overrides:
+  dynamite:
+    path: ../dynamite/dynamite
+  dynamite_runtime:
+    path: ../dynamite/dynamite_runtime

pubspec.yaml

@@ -0,0 +1,9 @@
+name: neon_workspace
+publish_to: none
+
+environment:
+  sdk: '>=3.0.0 <4.0.0'
+dev_dependencies:
+  fvm: ^2.4.1
+  melos: ^3.0.1
+  mono_repo: ^6.5.6

tool/ci.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Created with package:mono_repo v6.5.5
+# Created with package:mono_repo v6.5.6
 
 # Support built in commands on windows out of the box.
 # When it is a flutter repo (check the pubspec.yaml for "sdk: flutter")

tool/install.sh

@@ -4,7 +4,8 @@ cd "$(dirname "$0")/.."
 
 git submodule init
 git submodule update
-dart pub global activate mono_repo 6.5.0
+dart pub global activate melos 3.0.1
+dart pub global activate mono_repo 6.5.6
 dart pub global activate fvm 2.4.1
 yes | fvm install
 fvm exec mono_repo pub get