diff --git a/.gitignore b/.gitignore index 62a864e..45f05da 100644 --- a/.gitignore +++ b/.gitignore @@ -30,4 +30,8 @@ migrate_working_dir/ build/ .metadata -coverage/ \ No newline at end of file +coverage/ + +# FVM Version Cache +.fvm/ +.fvmrc diff --git a/CHANGELOG.md b/CHANGELOG.md index dfa223c..cb9c943 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## [2.0.0] - 11 July 2024 + +- Upgrade to flutter_timetable 2.0.0 + ## [1.1.0] - 17 August 2023 - Updated flutter_timetable to version 1.1.0 diff --git a/example/.metadata b/example/.metadata deleted file mode 100644 index af040ba..0000000 --- a/example/.metadata +++ /dev/null @@ -1,36 +0,0 @@ -# This file tracks properties of this Flutter project. -# Used by Flutter tool to assess capabilities and perform upgrades etc. -# -# This file should be version controlled. - -version: - revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - channel: stable - -project_type: app - -# Tracks metadata for the flutter migrate command -migration: - platforms: - - platform: root - create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - - platform: android - create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - - platform: ios - create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - - platform: web - create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543 - - # User provided section - - # List of Local paths (relative to this file) that should be - # ignored by the migrate tool. - # - # Files that are not part of the templates will be ignored by default. - unmanaged_files: - - 'lib/main.dart' - - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/example/pubspec.lock b/example/pubspec.lock index d07a326..aba20bc 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -37,18 +37,18 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be + sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.0.8" fake_async: dependency: transitive description: @@ -68,24 +68,23 @@ packages: path: ".." relative: true source: path - version: "1.1.0" + version: "2.0.0" flutter_date_time_picker: dependency: transitive description: - path: "." - ref: "3.3.0" - resolved-ref: b217e0cb858be997181dedb6c07578ebb0e7fad1 - url: "https://github.com/Iconica-Development/flutter_date_time_picker" - source: git + name: flutter_date_time_picker + sha256: d34231fae366fca3b14af3f810d750d56cb282a56e4721470d65074b1fbce969 + url: "https://forgejo.internal.iconica.nl/api/packages/internal/pub/" + source: hosted version: "3.3.0" flutter_lints: dependency: "direct dev" description: name: flutter_lints - sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c + sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.0.3" flutter_test: dependency: "direct dev" description: flutter @@ -94,60 +93,83 @@ packages: flutter_timetable: dependency: transitive description: - path: "." - ref: "1.1.0" - resolved-ref: "528dc5c2408e12ffa641706aa4466ae650fc2275" - url: "https://github.com/Iconica-Development/flutter_timetable" - source: git - version: "1.1.0" + name: flutter_timetable + sha256: "86eb6709133f179ea4d9f338a95630a43a4d03f9dc86719622c17970fb8a0655" + url: "https://forgejo.internal.iconica.nl/api/packages/internal/pub/" + source: hosted + version: "2.0.0" intl: dependency: transitive description: name: intl - sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91" + sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf url: "https://pub.dev" source: hosted - version: "0.17.0" + version: "0.19.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + url: "https://pub.dev" + source: hosted + version: "10.0.4" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + url: "https://pub.dev" + source: hosted + version: "3.0.3" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" lints: dependency: transitive description: name: lints - sha256: "5cfd6509652ff5e7fe149b6df4859e687fca9048437857cb2e65c8d780f396e3" + sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.1" matcher: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.12.0" path: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" sky_engine: dependency: transitive description: flutter @@ -165,18 +187,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -197,10 +219,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.7.0" vector_math: dependency: transitive description: @@ -209,14 +231,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" - web: + vm_service: dependency: transitive description: - name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + name: vm_service + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "14.2.1" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" - flutter: ">=2.0.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/lib/flutter_agenda.dart b/lib/flutter_agenda.dart index 5499ea6..bf1b833 100644 --- a/lib/flutter_agenda.dart +++ b/lib/flutter_agenda.dart @@ -7,5 +7,3 @@ library agenda; export 'package:flutter_agenda/src/agenda.dart'; export 'package:flutter_agenda/src/models/agenda_event.dart'; export 'package:flutter_agenda/src/models/agenda_theme.dart'; - -export 'package:flutter_timetable/timetable.dart'; diff --git a/lib/src/agenda.dart b/lib/src/agenda.dart index a0734e8..421f05b 100644 --- a/lib/src/agenda.dart +++ b/lib/src/agenda.dart @@ -6,7 +6,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_agenda/src/models/agenda_event.dart'; import 'package:flutter_agenda/src/models/agenda_theme.dart'; import 'package:flutter_date_time_picker/flutter_date_time_picker.dart'; -import 'package:flutter_timetable/timetable.dart'; +import 'package:flutter_timetable/flutter_timetable.dart'; class AgendaWidget extends StatefulWidget { /// [AgendaWidget] is a widget that displays a timetable with events. diff --git a/lib/src/models/agenda_theme.dart b/lib/src/models/agenda_theme.dart index 372866d..e522a46 100644 --- a/lib/src/models/agenda_theme.dart +++ b/lib/src/models/agenda_theme.dart @@ -3,7 +3,7 @@ // SPDX-License-Identifier: BSD-3-Clause import 'package:flutter_date_time_picker/flutter_date_time_picker.dart'; -import 'package:flutter_timetable/timetable.dart'; +import 'package:flutter_timetable/flutter_timetable.dart'; class AgendaTheme { /// [AgendaTheme] is a class that contains all styling options diff --git a/pubspec.yaml b/pubspec.yaml index 7128b44..24ff64c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,25 +1,23 @@ name: flutter_agenda description: Agenda widget with an underlying timetable included -version: 1.1.0 +version: 2.0.0 homepage: https://github.com/Iconica-Development/flutter_agenda -publish_to: none +publish_to: https://forgejo.internal.iconica.nl/api/packages/internal/pub environment: - sdk: ">=2.18.0 <3.0.0" + sdk: ">=3.0.0 <4.0.0" flutter: ">=1.17.0" dependencies: flutter: sdk: flutter flutter_date_time_picker: - git: - url: https://github.com/Iconica-Development/flutter_date_time_picker - ref: 3.3.0 + hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub + version: ">=3.3.0 <4.0.0" flutter_timetable: - git: - url: https://github.com/Iconica-Development/flutter_timetable - ref: 1.1.0 + hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub + version: ">=2.0.0 <3.0.0" dev_dependencies: flutter_test: