diff --git a/devenv.lock b/devenv.lock index 4c2996e..e22a6b5 100644 --- a/devenv.lock +++ b/devenv.lock @@ -3,10 +3,10 @@ "devenv": { "locked": { "dir": "src/modules", - "lastModified": 1747717470, + "lastModified": 1753386188, "owner": "cachix", "repo": "devenv", - "rev": "c7f2256ee4a4a4ee9cbf1e82a6e49b253c374995", + "rev": "a19c43648f108256e442e46dc32d4eee57c71ac3", "type": "github" }, "original": { @@ -40,10 +40,10 @@ ] }, "locked": { - "lastModified": 1747372754, + "lastModified": 1750779888, "owner": "cachix", "repo": "git-hooks.nix", - "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -74,16 +74,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746807397, - "owner": "cachix", - "repo": "devenv-nixpkgs", - "rev": "c5208b594838ea8e6cca5997fbf784b7cca1ca90", + "lastModified": 1753250450, + "owner": "nixos", + "repo": "nixpkgs", + "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", "type": "github" }, "original": { - "owner": "cachix", - "ref": "rolling", - "repo": "devenv-nixpkgs", + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", "type": "github" } }, diff --git a/devenv.nix b/devenv.nix index f78c60c..04acce7 100644 --- a/devenv.nix +++ b/devenv.nix @@ -1,37 +1,72 @@ -{ - pkgs, - lib, - config, - inputs, - ... -}: - -{ +{pkgs, ...}: { android = { enable = true; emulator.enable = false; flutter.enable = true; + flutter.package = pkgs.flutter; buildTools.version = [ "34.0.0" - "33.0.1" ]; platforms.version = [ - "27" - "28" - "29" - "30" - "31" - "32" - "33" - "34" "35" ]; ndk.enable = true; - ndk.version = [ - "25.1.8937393" - "26.3.11579264" - "27.2.12479018" - ]; }; + + packages = with pkgs; [ + # Needed by flutter_secure_storage + libsecret.dev + # jsoncpp.dev + + # gtk3.dev + # pcre2.dev + # libsysprof-capture + # util-linux.dev + # libselinux.dev + # libsepol.dev + # # libthai.dev + # libgcrypt.dev + # libdatrie.dev + # libgpg-error.dev + # xorg.libXdmcp.dev + # lerc.dev + # libxkbcommon.dev + # libepoxy.dev + # xorg.libXtst + + # pkg-config + ]; } +# - devShell = +# - with pkgs; +# - mkShell { +# - ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk"; +# - buildInputs = [ +# - flutter +# - androidSdk +# - jdk17 +# - +# - # Needed by flutter_secure_storage +# - libsecret.dev +# - jsoncpp.dev +# - +# - gtk3.dev +# - pcre2.dev +# - libsysprof-capture +# - util-linux.dev +# - libselinux.dev +# - libsepol.dev +# - libthai.dev +# - libgcrypt.dev +# - libdatrie.dev +# - libgpg-error.dev +# - xorg.libXdmcp.dev +# - lerc.dev +# - libxkbcommon.dev +# - libepoxy.dev +# - xorg.libXtst +# - +# - pkg-config +# - ]; +# - }; diff --git a/devenv.yaml b/devenv.yaml index 01189cf..75f316a 100644 --- a/devenv.yaml +++ b/devenv.yaml @@ -1,7 +1,7 @@ # yaml-language-server: $schema=https://devenv.sh/devenv.schema.json inputs: nixpkgs: - url: github:cachix/devenv-nixpkgs/rolling + url: github:nixos/nixpkgs/nixos-unstable # If you're using non-OSS software, you can set allowUnfree to true. allowUnfree: true diff --git a/local.properties b/local.properties index cbda872..722751e 100644 --- a/local.properties +++ b/local.properties @@ -1,3 +1,3 @@ # This file was automatically generated by nix-shell. -sdk.dir=/nix/store/h2bpv7cnfxmpsfk875jspixz25npv09a-androidsdk/libexec/android-sdk -ndk.dir=/nix/store/h2bpv7cnfxmpsfk875jspixz25npv09a-androidsdk/libexec/android-sdk/ndk/ +sdk.dir=/nix/store/anp8wd3pa24wa0c90cmh6zb778y0zmr0-androidsdk/libexec/android-sdk +ndk.dir=/nix/store/anp8wd3pa24wa0c90cmh6zb778y0zmr0-androidsdk/libexec/android-sdk/ndk-bundle diff --git a/pubspec.lock b/pubspec.lock index 0d2e0bd..31da726 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,14 +1,22 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + archive: + dependency: transitive + description: + name: archive + sha256: "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd" + url: "https://pub.dev" + source: hosted + version: "4.0.7" async: dependency: transitive description: name: async - sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 + sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" url: "https://pub.dev" source: hosted - version: "2.12.0" + version: "2.13.0" boolean_selector: dependency: transitive description: @@ -57,14 +65,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.8" + dart_pubspec_licenses: + dependency: transitive + description: + name: dart_pubspec_licenses + sha256: "23ddb78ff9204d08e3109ced67cd3c6c6a066f581b0edf5ee092fc3e1127f4ea" + url: "https://pub.dev" + source: hosted + version: "3.0.4" fake_async: dependency: transitive description: name: fake_async - sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.3.3" ffi: dependency: transitive description: @@ -102,14 +118,22 @@ packages: url: "https://pub.dev" source: hosted version: "3.4.1" + flutter_drawing_board: + dependency: "direct main" + description: + name: flutter_drawing_board + sha256: b7eef8c506a12485853e8b4cdc110d1d307993279b588f3a35902a7d7082dbd4 + url: "https://pub.dev" + source: hosted + version: "0.9.8" flutter_lints: dependency: "direct dev" description: name: flutter_lints - sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" + sha256: "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1" url: "https://pub.dev" source: hosted - version: "5.0.0" + version: "6.0.0" flutter_secure_storage: dependency: "direct main" description: @@ -172,10 +196,10 @@ packages: dependency: "direct main" description: name: http - sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f + sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" http_parser: dependency: transitive description: @@ -184,6 +208,14 @@ packages: url: "https://pub.dev" source: hosted version: "4.1.2" + image: + dependency: transitive + description: + name: image + sha256: "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928" + url: "https://pub.dev" + source: hosted + version: "4.5.4" js: dependency: transitive description: @@ -192,6 +224,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.6.7" + json_annotation: + dependency: transitive + description: + name: json_annotation + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" + url: "https://pub.dev" + source: hosted + version: "4.9.0" jwt_decoder: dependency: "direct main" description: @@ -204,10 +244,10 @@ packages: dependency: transitive description: name: leak_tracker - sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec + sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0" url: "https://pub.dev" source: hosted - version: "10.0.8" + version: "10.0.9" leak_tracker_flutter_testing: dependency: transitive description: @@ -228,10 +268,10 @@ packages: dependency: transitive description: name: lints - sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 + sha256: a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0 url: "https://pub.dev" source: hosted - version: "5.1.1" + version: "6.0.0" logging: dependency: "direct main" description: @@ -324,18 +364,26 @@ packages: dependency: "direct main" description: name: pdfrx - sha256: fdb2320a136d287bcbe64faf45e3f21b7dbbb0ce0150a64fddc2c1776db6f1bf + sha256: "0b4d3231a38967ce5b27f480076a336e74db30293926218c6a0aa96d29de0082" url: "https://pub.dev" source: hosted - version: "1.1.25" + version: "2.0.4" + pdfrx_engine: + dependency: transitive + description: + name: pdfrx_engine + sha256: "4cdba7df1ee83e32c572c7721838e67341742be4b597cc1325549bf90f03511f" + url: "https://pub.dev" + source: hosted + version: "0.1.9" permission_handler: dependency: "direct main" description: name: permission_handler - sha256: "2d070d8684b68efb580a5997eb62f675e8a885ef0be6e754fb9ef489c177470f" + sha256: bc917da36261b00137bbc8896bf1482169cd76f866282368948f032c8c1caae1 url: "https://pub.dev" source: hosted - version: "12.0.0+1" + version: "12.0.1" permission_handler_android: dependency: transitive description: @@ -376,6 +424,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.2.1" + petitparser: + dependency: transitive + description: + name: petitparser + sha256: "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646" + url: "https://pub.dev" + source: hosted + version: "6.1.0" platform: dependency: transitive description: @@ -392,6 +448,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.8" + posix: + dependency: transitive + description: + name: posix + sha256: "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61" + url: "https://pub.dev" + source: hosted + version: "6.0.3" rxdart: dependency: transitive description: @@ -489,10 +553,10 @@ packages: dependency: transitive description: name: synchronized - sha256: "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6" + sha256: c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0 url: "https://pub.dev" source: hosted - version: "3.3.1" + version: "3.4.0" term_glyph: dependency: transitive description: @@ -521,10 +585,10 @@ packages: dependency: transitive description: name: url_launcher - sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603" + sha256: f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8 url: "https://pub.dev" source: hosted - version: "6.3.1" + version: "6.3.2" url_launcher_android: dependency: transitive description: @@ -601,10 +665,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" + sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 url: "https://pub.dev" source: hosted - version: "14.3.1" + version: "15.0.0" web: dependency: transitive description: @@ -617,10 +681,10 @@ packages: dependency: transitive description: name: win32 - sha256: dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f + sha256: "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03" url: "https://pub.dev" source: hosted - version: "5.12.0" + version: "5.14.0" xdg_directories: dependency: transitive description: @@ -629,6 +693,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" + xml: + dependency: transitive + description: + name: xml + sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 + url: "https://pub.dev" + source: hosted + version: "6.5.0" + yaml: + dependency: transitive + description: + name: yaml + sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce + url: "https://pub.dev" + source: hosted + version: "3.1.3" sdks: - dart: ">=3.7.0 <4.0.0" + dart: ">=3.8.1 <4.0.0" flutter: ">=3.29.0" diff --git a/pubspec.yaml b/pubspec.yaml index 102fa0f..ab7f961 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -43,8 +43,9 @@ dependencies: flutter_cache_manager: ^3.4.1 flutter_secure_storage: ^9.2.2 jwt_decoder: ^2.0.1 - pdfrx: ^1.1.25 + pdfrx: ^2.0.4 logging: ^1.3.0 + flutter_drawing_board: ^0.9.8 dev_dependencies: flutter_test: @@ -55,7 +56,7 @@ dev_dependencies: # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^5.0.0 + flutter_lints: ^6.0.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec