From 157174cedf8bccc25afb65f73bd6027bad9626c5 Mon Sep 17 00:00:00 2001 From: Simon Bengtsson Date: Sat, 31 Aug 2024 15:33:38 +0200 Subject: [PATCH] Update lockfiles --- README.md | 5 +++++ ios/Podfile | 2 +- ios/Podfile.lock | 12 ++++++------ macos/Podfile.lock | 10 +++++----- macos/Runner/AppDelegate.swift | 2 +- tools/scripts.dart | 10 +++++----- tools/version_editor.dart | 6 +++--- 7 files changed, 26 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 1fc8eed..4edc803 100644 --- a/README.md +++ b/README.md @@ -50,3 +50,8 @@ By default a google stun server is used to connect peers. The simplest way to en Contributions are very much welcome on everything from bug reports to feature development. If you want to change something major write an issue about it first to ensure it will be considered for merge. + +### Publish guide (for contributors) + +`dart tools/scripts.dart bump` +`dart tools/scripts.dart release` diff --git a/ios/Podfile b/ios/Podfile index ec11c2e..44a6b36 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -platform :ios, '12.0' +platform :ios, '13.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/ios/Podfile.lock b/ios/Podfile.lock index e49540d..08621f3 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -36,9 +36,9 @@ PODS: - DKImagePickerController/PhotoGallery - Flutter - Flutter (1.0.0) - - flutter_webrtc (0.9.36): + - flutter_webrtc (0.11.3): - Flutter - - WebRTC-SDK (= 114.5735.10) + - WebRTC-SDK (= 125.6422.04) - integration_test (0.0.1): - Flutter - package_info_plus (0.4.5): @@ -70,7 +70,7 @@ PODS: - Flutter - wakelock (0.0.1): - Flutter - - WebRTC-SDK (114.5735.10) + - WebRTC-SDK (125.6422.04) DEPENDENCIES: - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) @@ -136,7 +136,7 @@ SPEC CHECKSUMS: DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60 file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 - flutter_webrtc: b33475c3a57d59ff05bf87b4f5d3feceac63f291 + flutter_webrtc: 75b868e4f9e817c7a9a42ca4b6169063de4eec9f integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573 package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c pasteboard: 982969ebaa7c78af3e6cc7761e8f5e77565d9ce0 @@ -151,8 +151,8 @@ SPEC CHECKSUMS: SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4 url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f - WebRTC-SDK: 8c0edd05b880a39648118192c252667ea06dea51 + WebRTC-SDK: c3d69a87e7185fad3568f6f3cff7c9ac5890acf3 -PODFILE CHECKSUM: 7b8cdbdc22ae435eeac5b91941fe5d96f9f24b54 +PODFILE CHECKSUM: 8ef235bdccd8ca5a972ce5c0d02d76a19067f053 COCOAPODS: 1.15.2 diff --git a/macos/Podfile.lock b/macos/Podfile.lock index 2574e6d..6c6d292 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -3,9 +3,9 @@ PODS: - FlutterMacOS - device_info_plus (0.0.1): - FlutterMacOS - - flutter_webrtc (0.9.36): + - flutter_webrtc (0.11.3): - FlutterMacOS - - WebRTC-SDK (= 114.5735.10) + - WebRTC-SDK (= 125.6422.04) - FlutterMacOS (1.0.0) - package_info_plus (0.0.1): - FlutterMacOS @@ -32,7 +32,7 @@ PODS: - FlutterMacOS - wakelock_macos (0.0.1): - FlutterMacOS - - WebRTC-SDK (114.5735.10) + - WebRTC-SDK (125.6422.04) - window_manager (0.2.0): - FlutterMacOS @@ -93,7 +93,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: desktop_drop: 69eeff437544aa619c8db7f4481b3a65f7696898 device_info_plus: ce1b7762849d3ec103d0e0517299f2db7ad60720 - flutter_webrtc: 823284e171ecb2487b7210c214886a949c122a59 + flutter_webrtc: 2b4e4a2de70a1485836e40fd71a7a94c77d49bd9 FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 package_info_plus: fa739dd842b393193c5ca93c26798dff6e3d0e0c pasteboard: 9b69dba6fedbb04866be632205d532fe2f6b1d99 @@ -106,7 +106,7 @@ SPEC CHECKSUMS: tray_manager: 9064e219c56d75c476e46b9a21182087930baf90 url_launcher_macos: 5f437abeda8c85500ceb03f5c1938a8c5a705399 wakelock_macos: bc3f2a9bd8d2e6c89fee1e1822e7ddac3bd004a9 - WebRTC-SDK: 8c0edd05b880a39648118192c252667ea06dea51 + WebRTC-SDK: c3d69a87e7185fad3568f6f3cff7c9ac5890acf3 window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8 PODFILE CHECKSUM: 963639d5148db2f75442340858b9034c09ed58df diff --git a/macos/Runner/AppDelegate.swift b/macos/Runner/AppDelegate.swift index fe5ac13..ef78660 100644 --- a/macos/Runner/AppDelegate.swift +++ b/macos/Runner/AppDelegate.swift @@ -1,7 +1,7 @@ import Cocoa import FlutterMacOS -@NSApplicationMain +@main class AppDelegate: FlutterAppDelegate { //let bluetoothService = BluetoothService() diff --git a/tools/scripts.dart b/tools/scripts.dart index 8d28384..5a0500f 100644 --- a/tools/scripts.dart +++ b/tools/scripts.dart @@ -51,7 +51,7 @@ release() async { print('$startedTimeStr Starting build...'); var version = VersionEditor().readCurrentVersion(); - version = VersionEditor().bumpPatchVersion(); + //version = VersionEditor().bumpPatchVersion(); print('Building $version'); runLocalCommand('flutter build macos'); @@ -74,12 +74,12 @@ release() async { //await WindowsAppBuilder().build(); await AppStoreVersionSubmitter().submit(); - await MicrosoftStoreSubmitter().submit(); + //await MicrosoftStoreSubmitter().submit(); //await SnapStoreSubmitter().buildAndSubmit(); - runLocalCommand('npx appdmg appdmg.json ./build/airdash.dmg'); - runLocalCommand( - 'gh release create v${version.join('.')} build/airdash.dmg build/airdash.apk --notes "See what\'s new in the [release notes](https://github.com/simonbengtsson/airdash/blob/master/CHANGELOG.md). Some distribution files are included as assets in this release, but the update will soon be available in all supported app stores."'); + //runLocalCommand('npx appdmg appdmg.json ./build/airdash.dmg'); + // runLocalCommand( + // 'gh release create v${version.join('.')} build/airdash.dmg build/airdash.apk --notes "See what\'s new in the [release notes](https://github.com/simonbengtsson/airdash/blob/master/CHANGELOG.md). Some distribution files are included as assets in this release, but the update will soon be available in all supported app stores."'); // runLocalCommand( // 'gh release create v${version.join('.')} build/airdash.snap build/airdash.msix build/airdash.apk --notes "See what\'s new in the [release notes](https://github.com/simonbengtsson/airdash/blob/master/CHANGELOG.md). Some distribution files are included as assets in this release, but the update will soon be available in all supported app stores."'); diff --git a/tools/version_editor.dart b/tools/version_editor.dart index 87786d3..c08412e 100644 --- a/tools/version_editor.dart +++ b/tools/version_editor.dart @@ -10,8 +10,8 @@ class VersionEditor { var oldVersion = readCurrentVersion(); var newVersion = [oldVersion[0], oldVersion[1], oldVersion[2] + 1]; - _replaceLine(snapcraftFile, "version: '${oldVersion.join('.')}'", - "version: '${newVersion.join('.')}'"); + _replaceLine(snapcraftFile, "version: \"${oldVersion.join('.')}\"", + "version: \"${newVersion.join('.')}\""); _replaceLine( pubspecFile, 'version: ${oldVersion.join('.')}+${oldVersion[2]}', @@ -48,7 +48,7 @@ class VersionEditor { var indexes = lines.where((element) => element.startsWith(lineMatch)); if (indexes.length != 1) { throw Exception( - 'Not matching 1 line. Matches: ${indexes.length} Wanted: $lineMatch'); + 'Not matching 1 line. Matches: ${indexes.length} Wanted: $lineMatch File: ${file.path}'); } var index = lines.indexWhere((element) => element.startsWith(lineMatch)); lines[index] = newLine;