diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 6d5094b80..01ede52f2 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -311,4 +311,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 07d075e408ef3b6ccbe0df6c789bf1ae2ccf52ee -COCOAPODS: 1.12.1 +COCOAPODS: 1.13.0 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 32381da78..d1edf438d 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -210,9 +210,9 @@ 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, + 9C7092B825E77E470056AE0B /* Embed App Extensions */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 9C7092B825E77E470056AE0B /* Embed App Extensions */, 2381EF8E346280DC477E9FB4 /* [CP] Embed Pods Frameworks */, 81B6F673ADB1C6FF9EA28A2F /* [CP] Copy Pods Resources */, ); @@ -251,7 +251,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1230; - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = "The Chromium Authors"; TargetAttributes = { 97C146ED1CF9000F007C117D = { diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index c87d15a33..a6b826db2 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ true; LunaWakeOnLAN getWakeOnLAN() => IO(); @@ -13,7 +13,7 @@ class IO implements LunaWakeOnLAN { Future wake() async { LunaProfile profile = LunaProfile.current; try { - final ip = IPv4Address(profile.wakeOnLANBroadcastAddress); + final ip = IPAddress(profile.wakeOnLANBroadcastAddress); final mac = MACAddress(profile.wakeOnLANMACAddress); return WakeOnLAN(ip, mac).wake().then((_) { showLunaSuccessSnackBar( diff --git a/lib/modules/settings/core/dialogs.dart b/lib/modules/settings/core/dialogs.dart index 63cb104a6..127dc9826 100644 --- a/lib/modules/settings/core/dialogs.dart +++ b/lib/modules/settings/core/dialogs.dart @@ -1,17 +1,17 @@ import 'package:flutter/material.dart'; +import 'package:wake_on_lan/wake_on_lan.dart'; import 'package:lunasea/database/tables/lunasea.dart'; import 'package:lunasea/firebase/types.dart'; import 'package:lunasea/modules.dart'; +import 'package:lunasea/modules/dashboard/core/adapters/calendar_starting_day.dart'; +import 'package:lunasea/modules/dashboard/core/adapters/calendar_starting_size.dart'; +import 'package:lunasea/modules/dashboard/core/adapters/calendar_starting_type.dart'; import 'package:lunasea/modules/settings/core/types/header.dart'; -import 'package:lunasea/system/state.dart'; import 'package:lunasea/system/localization.dart'; +import 'package:lunasea/system/state.dart'; import 'package:lunasea/utils/validator.dart'; import 'package:lunasea/vendor.dart'; import 'package:lunasea/widgets/ui.dart'; -import 'package:lunasea/modules/dashboard/core/adapters/calendar_starting_day.dart'; -import 'package:lunasea/modules/dashboard/core/adapters/calendar_starting_size.dart'; -import 'package:lunasea/modules/dashboard/core/adapters/calendar_starting_type.dart'; -import 'package:wake_on_lan/wake_on_lan.dart'; class SettingsDialogs { Future> setDefaultOption( @@ -1036,7 +1036,7 @@ class SettingsDialogs { controller: _controller, validator: (address) { if (address?.isEmpty ?? true) return null; - return IPv4Address.validate(address) + return IPAddress.validate(address).state ? null : 'settings.BroadcastAddressValidation'.tr(); }, @@ -1097,7 +1097,7 @@ class SettingsDialogs { controller: _controller, validator: (address) { if (address?.isEmpty ?? true) return null; - return MACAddress.validate(address) + return MACAddress.validate(address).state ? null : 'settings.MACAddressValidation'.tr(); }, diff --git a/macos/Podfile.lock b/macos/Podfile.lock index 3e1cc8c97..9cefde8f6 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -264,4 +264,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 6393d0a94dad32dd5039dc4568155b98fc1fbd38 -COCOAPODS: 1.12.1 +COCOAPODS: 1.13.0 diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig index 804ccd846..13938c7ab 100644 --- a/macos/Runner/Configs/AppInfo.xcconfig +++ b/macos/Runner/Configs/AppInfo.xcconfig @@ -1,3 +1,3 @@ PRODUCT_NAME = LunaSea PRODUCT_BUNDLE_IDENTIFIER = app.lunasea.lunasea -PRODUCT_COPYRIGHT = Copyright © 2022 Jagandeep Brar. All rights reserved. +PRODUCT_COPYRIGHT = Copyright © 2023 Jagandeep Brar. All rights reserved. diff --git a/pubspec.lock b/pubspec.lock index 0e1016062..da967f6b0 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1502,10 +1502,10 @@ packages: dependency: "direct main" description: name: wake_on_lan - sha256: b385cb8481d5a30085ed450f1487f0b403beac93d6878c6d6e252163a3de1a24 + sha256: "92ae49df3a34482f73288fb5e4c42e70e4c36111a8d750ff563b5ff13534cae7" url: "https://pub.dev" source: hosted - version: "3.2.0+1" + version: "4.1.0" watcher: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index cdabbc224..ab8e23ef4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -53,7 +53,7 @@ dependencies: tuple: ^2.0.2 url_launcher: ^6.1.12 uuid: ^3.0.7 - wake_on_lan: ^3.2.0+1 + wake_on_lan: ^4.1.0 window_manager: ^0.3.6 xml: ^6.3.0 dev_dependencies: diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc index 5de941ebf..d07b0cdd3 100644 --- a/windows/runner/Runner.rc +++ b/windows/runner/Runner.rc @@ -93,7 +93,7 @@ BEGIN VALUE "FileDescription", "Self-hosted controller built using the Flutter framework" "\0" VALUE "FileVersion", VERSION_AS_STRING "\0" VALUE "InternalName", "lunasea" "\0" - VALUE "LegalCopyright", "Copyright (C) 2022 Jagandeep Brar. All rights reserved." "\0" + VALUE "LegalCopyright", "Copyright (C) 2023 Jagandeep Brar. All rights reserved." "\0" VALUE "OriginalFilename", "LunaSea.exe" "\0" VALUE "ProductName", "LunaSea" "\0" VALUE "ProductVersion", VERSION_AS_STRING "\0"