Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🚚 restructure folders with basic melos #453

Merged
merged 41 commits into from
Jun 7, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
bf4c1bf
🚚 restructure folders with basic melos
Jun 7, 2024
bd09794
👷 update ci workflows to use melos for formatting and analyzing
Jun 7, 2024
c6dc9cb
👷 fix melos not found
Jun 7, 2024
28ae836
remove flutter_ prefix on folders
Jun 7, 2024
6b1d621
revert .gitignore
Jun 7, 2024
d516fad
move dev_dependencies below dependencies
Jun 7, 2024
60efb8f
add scripts to melos.yaml
Jun 7, 2024
2def4e5
maplibre_gl: update analysis options
Jun 7, 2024
7360f8f
symlinks to readme and changelog
Jun 7, 2024
573c2dd
LICENCE symlink
Jun 7, 2024
3915447
fix typos
Jun 7, 2024
98e9fd1
use bluefireteam/melos-action
Jun 7, 2024
ff9040e
use correct melos command in ci
Jun 7, 2024
58a11ff
fix LICENCE symlink
Jun 7, 2024
a6ceab4
Merge branch 'main' into maintenance/restructure-folders
Jun 7, 2024
64aad81
fix melos name
Jun 7, 2024
0c244e9
remove _workspace suffic
Jun 7, 2024
6b72dde
fix failing ci
Jun 7, 2024
719a928
rename to `maplibre_gl_workspace`, fix `maplibre_gl` path for example…
josxha Jun 7, 2024
a83ee2c
🚚 restructure folders with basic melos
Jun 7, 2024
6661949
👷 update ci workflows to use melos for formatting and analyzing
Jun 7, 2024
c3e05a2
👷 fix melos not found
Jun 7, 2024
c2170e1
remove flutter_ prefix on folders
Jun 7, 2024
646b4a2
revert .gitignore
Jun 7, 2024
0bc3c66
move dev_dependencies below dependencies
Jun 7, 2024
d7ab694
add scripts to melos.yaml
Jun 7, 2024
a7ce337
maplibre_gl: update analysis options
Jun 7, 2024
ff35bd1
symlinks to readme and changelog
Jun 7, 2024
9656813
LICENCE symlink
Jun 7, 2024
e151224
fix typos
Jun 7, 2024
6a307d8
use bluefireteam/melos-action
Jun 7, 2024
83f03d4
use correct melos command in ci
Jun 7, 2024
87143ab
fix LICENCE symlink
Jun 7, 2024
42f28b8
fix melos name
Jun 7, 2024
f8ac98b
remove _workspace suffic
Jun 7, 2024
3851d9d
fix failing ci
Jun 7, 2024
0c312e0
rename to `maplibre_gl_workspace`, fix `maplibre_gl` path for example…
josxha Jun 7, 2024
a6c4251
fix rebase problems, add changelog entry, gitignore build dir
josxha Jun 7, 2024
7fc2f0b
Merge branch 'maintenance/restructure-folders' of https://github.com/…
josxha Jun 7, 2024
94ec64e
use melos in flutter_beta CI
josxha Jun 7, 2024
bee80eb
remove redundant `flutter pub get`
josxha Jun 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .github/workflows/flutter_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ jobs:
- uses: subosito/flutter-action@v2
with:
cache: true
- run: flutter pub get
- name: melos bootstrap
run: dart run melos bootstrap
josxha marked this conversation as resolved.
Show resolved Hide resolved
- name: Lint analysis
run: dart format --set-exit-if-changed .
run: dart run melos format --set-exit-if-changed .
josxha marked this conversation as resolved.
Show resolved Hide resolved

lint:
name: "Static code analysis"
Expand All @@ -32,8 +35,10 @@ jobs:
cd scripts
flutter pub get
cd ..
- name: melos bootstrap
run: dart run melos bootstrap
- name: Lint analysis
run: flutter analyze
run: dart run melos analyze
josxha marked this conversation as resolved.
Show resolved Hide resolved

build-android:
name: "Build Android apk"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ jobs:
publish_maplibre_gl_platform_interface:
uses: ./.github/workflows/publish-single.yml
with:
working-directory: maplibre_gl_platform_interface
working-directory: flutter_maplibre_gl_platform_interface
publish_maplibre_gl_web:
needs: [publish_maplibre_gl_platform_interface]
uses: ./.github/workflows/publish-single.yml
with:
working-directory: maplibre_gl_web
working-directory: flutter_maplibre_gl_web
publish_maplibre_gl:
needs: [publish_maplibre_gl_platform_interface, publish_maplibre_gl_web]
uses: ./.github/workflows/publish-single.yml
with:
working-directory: .
working-directory: flutter_maplibre_gl
josxha marked this conversation as resolved.
Show resolved Hide resolved
95 changes: 81 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
.buildlog/
.history
.svn/
migrate_working_dir/

# IntelliJ related
*.iml
Expand All @@ -22,30 +21,98 @@ migrate_working_dir/
.settings/
.vscode/

# Flutter repo-specific
josxha marked this conversation as resolved.
Show resolved Hide resolved
/bin/cache/
/bin/mingit/
/dev/benchmarks/mega_gallery/
/dev/bots/.recipe_deps
/dev/bots/android_tools/
/dev/docs/doc/
/dev/docs/flutter.docs.zip
/dev/docs/lib/
/dev/docs/pubspec.yaml
/dev/integration_tests/**/xcuserdata
/dev/integration_tests/**/Pods
/packages/flutter/coverage/
version

# packages file containing multi-root paths
.packages.generated

# Flutter/Dart/Pub related
**/doc/api/
**/ios/Flutter/.last_build_id
.dart_tool/
.flutter-plugins
.flutter-plugins-dependencies
.packages
.pub-cache/
.pub/
/build/
pubspec.lock
**/pubspec.lock
build/
flutter_*.png
linked_*.ds
unlinked.ds
unlinked_spec.ds

# Android related
**/android/**/gradle-wrapper.jar
**/android/.gradle
**/android/captures/
**/android/gradlew
**/android/gradlew.bat
**/android/local.properties
**/android/**/GeneratedPluginRegistrant.java
**/android/key.properties
*.jks

# iOS/XCode related
**/ios/**/*.mode1v3
**/ios/**/*.mode2v3
**/ios/**/*.moved-aside
**/ios/**/*.pbxuser
**/ios/**/*.perspectivev3
**/ios/**/*sync/
**/ios/**/.sconsign.dblite
**/ios/**/.tags*
**/ios/**/.vagrant/
**/ios/**/DerivedData/
**/ios/**/Icon?
**/ios/**/Pods/
**/ios/**/.symlinks/
**/ios/**/profile
**/ios/**/xcuserdata
**/ios/.generated/
**/ios/Flutter/App.framework
**/ios/Flutter/Flutter.framework
**/ios/Flutter/Flutter.podspec
**/ios/Flutter/Generated.xcconfig
**/ios/Flutter/app.flx
**/ios/Flutter/app.zip
**/ios/Flutter/flutter_assets/
**/ios/Flutter/flutter_export_environment.sh
**/ios/ServiceDefinitions.json
**/ios/Runner/GeneratedPluginRegistrant.*

# macOS
**/macos/Flutter/GeneratedPluginRegistrant.swift
**/macos/Flutter/Flutter-Debug.xcconfig
**/macos/Flutter/Flutter-Release.xcconfig
**/macos/Flutter/Flutter-Profile.xcconfig

# Coverage
coverage/

# Symbolication related
# Symbols
app.*.symbols

# Obfuscation related
app.*.map.json

# Android Studio will place build artifacts here
/android/app/debug
/android/app/profile
/android/app/release
# Exceptions to above rules.
!**/ios/**/default.mode1v3
!**/ios/**/default.mode2v3
!**/ios/**/default.pbxuser
!**/ios/**/default.perspectivev3
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
!/dev/ci/**/Gemfile.lock
google-java-format-1.13.0-all-deps.jar

# Misc
GeneratedPluginRegistrant.swift
# melos
josxha marked this conversation as resolved.
Show resolved Hide resolved
pubspec_overrides.yaml
Binary file removed android/gradle/wrapper/gradle-wrapper.jar
josxha marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
3 changes: 2 additions & 1 deletion example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ dependencies:
device_info_plus: ^9.0.2

dev_dependencies:
very_good_analysis: ^5.0.0
flutter_test:
sdk: flutter
very_good_analysis: ^5.0.0


flutter:
uses-material-design: true
Expand Down
7 changes: 4 additions & 3 deletions example/pubspec_overrides.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# melos_managed_dependency_overrides: maplibre_gl,maplibre_gl_platform_interface,maplibre_gl_web
dependency_overrides:
maplibre_gl:
path: ..
path: ../flutter_maplibre_gl
maplibre_gl_platform_interface:
path: ../maplibre_gl_platform_interface
path: ../flutter_maplibre_gl_platform_interface
maplibre_gl_web:
path: ../maplibre_gl_web
path: ../flutter_maplibre_gl_web
20 changes: 20 additions & 0 deletions flutter_maplibre_gl.code-workspace
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"folders": [
{
"name": "exampel",
josxha marked this conversation as resolved.
Show resolved Hide resolved
"path": "./example"
},
{
"name": "flutter_maplibre_gl",
"path": "./flutter_maplibre_gl"
},
{
"name": "flutter_maplibre_gl_platform_interface",
"path": "./flutter_maplibre_gl_platform_interface"
},
{
"name": "flutter_maplibre_gl_web",
"path": "./flutter_maplibre_gl_web"
},
]
}
51 changes: 51 additions & 0 deletions flutter_maplibre_gl/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# Miscellaneous
*.class
*.log
*.pyc
*.swp
.DS_Store
.atom/
.buildlog/
.history
.svn/
migrate_working_dir/

# IntelliJ related
*.iml
*.ipr
*.iws
.idea/

# Visual Studio Code related
.classpath
.project
.settings/
.vscode/

# Flutter/Dart/Pub related
**/doc/api/
**/ios/Flutter/.last_build_id
.dart_tool/
.flutter-plugins
.flutter-plugins-dependencies
.pub-cache/
.pub/
/build/
pubspec.lock

# Coverage
coverage/

# Symbolication related
app.*.symbols

# Obfuscation related
app.*.map.json

# Android Studio will place build artifacts here
/android/app/debug
/android/app/profile
/android/app/release

# Misc
GeneratedPluginRegistrant.swift
josxha marked this conversation as resolved.
Show resolved Hide resolved
File renamed without changes.
josxha marked this conversation as resolved.
Show resolved Hide resolved
File renamed without changes.
Loading
Loading