From 018d1846ce075a84c8acfe58f3c5dfeccbfc5589 Mon Sep 17 00:00:00 2001 From: Alexander Batalov Date: Tue, 28 Sep 2021 19:26:56 +0300 Subject: [PATCH 1/4] [package_info_plus] fix app name on iOS and macOS --- .../package_info_plus/ios/Classes/FLTPackageInfoPlusPlugin.m | 1 + .../macos/Classes/FLTPackageInfoPlusPlugin.m | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/package_info_plus/package_info_plus/ios/Classes/FLTPackageInfoPlusPlugin.m b/packages/package_info_plus/package_info_plus/ios/Classes/FLTPackageInfoPlusPlugin.m index 6bd6050c5b..c86b6d226b 100644 --- a/packages/package_info_plus/package_info_plus/ios/Classes/FLTPackageInfoPlusPlugin.m +++ b/packages/package_info_plus/package_info_plus/ios/Classes/FLTPackageInfoPlusPlugin.m @@ -17,6 +17,7 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result { if ([call.method isEqualToString:@"getAll"]) { result(@{ @"appName" : [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"] + ?: [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"] ?: [NSNull null], @"packageName" : [[NSBundle mainBundle] bundleIdentifier] ?: [NSNull null], @"version" : [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"] diff --git a/packages/package_info_plus/package_info_plus_macos/macos/Classes/FLTPackageInfoPlusPlugin.m b/packages/package_info_plus/package_info_plus_macos/macos/Classes/FLTPackageInfoPlusPlugin.m index 6bd6050c5b..c86b6d226b 100644 --- a/packages/package_info_plus/package_info_plus_macos/macos/Classes/FLTPackageInfoPlusPlugin.m +++ b/packages/package_info_plus/package_info_plus_macos/macos/Classes/FLTPackageInfoPlusPlugin.m @@ -17,6 +17,7 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result { if ([call.method isEqualToString:@"getAll"]) { result(@{ @"appName" : [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"] + ?: [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"] ?: [NSNull null], @"packageName" : [[NSBundle mainBundle] bundleIdentifier] ?: [NSNull null], @"version" : [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"] From b7f42402ff0382144dfb3eb317612fd570c8a223 Mon Sep 17 00:00:00 2001 From: Alexander Batalov Date: Thu, 30 Sep 2021 09:43:48 +0300 Subject: [PATCH 2/4] fix formatting issues --- .../package_info_plus/ios/Classes/FLTPackageInfoPlusPlugin.m | 3 +-- .../macos/Classes/FLTPackageInfoPlusPlugin.m | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/package_info_plus/package_info_plus/ios/Classes/FLTPackageInfoPlusPlugin.m b/packages/package_info_plus/package_info_plus/ios/Classes/FLTPackageInfoPlusPlugin.m index c86b6d226b..33c99253f4 100644 --- a/packages/package_info_plus/package_info_plus/ios/Classes/FLTPackageInfoPlusPlugin.m +++ b/packages/package_info_plus/package_info_plus/ios/Classes/FLTPackageInfoPlusPlugin.m @@ -17,8 +17,7 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result { if ([call.method isEqualToString:@"getAll"]) { result(@{ @"appName" : [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"] - ?: [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"] - ?: [NSNull null], + ?: [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"] ?: [NSNull null], @"packageName" : [[NSBundle mainBundle] bundleIdentifier] ?: [NSNull null], @"version" : [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"] ?: [NSNull null], diff --git a/packages/package_info_plus/package_info_plus_macos/macos/Classes/FLTPackageInfoPlusPlugin.m b/packages/package_info_plus/package_info_plus_macos/macos/Classes/FLTPackageInfoPlusPlugin.m index c86b6d226b..33c99253f4 100644 --- a/packages/package_info_plus/package_info_plus_macos/macos/Classes/FLTPackageInfoPlusPlugin.m +++ b/packages/package_info_plus/package_info_plus_macos/macos/Classes/FLTPackageInfoPlusPlugin.m @@ -17,8 +17,7 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result { if ([call.method isEqualToString:@"getAll"]) { result(@{ @"appName" : [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"] - ?: [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"] - ?: [NSNull null], + ?: [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"] ?: [NSNull null], @"packageName" : [[NSBundle mainBundle] bundleIdentifier] ?: [NSNull null], @"version" : [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"] ?: [NSNull null], From a92a6d991be88373a7ba6fb182468a2d806efc2f Mon Sep 17 00:00:00 2001 From: Majid Date: Fri, 1 Oct 2021 21:15:00 +0200 Subject: [PATCH 3/4] add changelong and pump version --- packages/package_info_plus/package_info_plus/CHANGELOG.md | 4 ++++ packages/package_info_plus/package_info_plus/pubspec.yaml | 4 ++-- .../package_info_plus/package_info_plus_macos/CHANGELOG.md | 4 ++++ .../package_info_plus/package_info_plus_macos/pubspec.yaml | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/package_info_plus/package_info_plus/CHANGELOG.md b/packages/package_info_plus/package_info_plus/CHANGELOG.md index d27b6e1871..c1240f731f 100644 --- a/packages/package_info_plus/package_info_plus/CHANGELOG.md +++ b/packages/package_info_plus/package_info_plus/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.2.0 + +- fix app name on macOS + ## 1.1.0 - migrate integration_test to flutter sdk diff --git a/packages/package_info_plus/package_info_plus/pubspec.yaml b/packages/package_info_plus/package_info_plus/pubspec.yaml index 2bce004bfc..89a676984a 100644 --- a/packages/package_info_plus/package_info_plus/pubspec.yaml +++ b/packages/package_info_plus/package_info_plus/pubspec.yaml @@ -1,6 +1,6 @@ name: package_info_plus description: Flutter plugin for querying information about the application package, such as CFBundleVersion on iOS or versionCode on Android. -version: 1.1.0 +version: 1.2.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ @@ -26,7 +26,7 @@ dependencies: sdk: flutter package_info_plus_platform_interface: ^1.0.2 package_info_plus_linux: ^1.0.3 - package_info_plus_macos: ^1.1.1 + package_info_plus_macos: ^1.2.0 package_info_plus_windows: ^1.0.3 package_info_plus_web: ^1.0.4 diff --git a/packages/package_info_plus/package_info_plus_macos/CHANGELOG.md b/packages/package_info_plus/package_info_plus_macos/CHANGELOG.md index 30d9bf40dc..446c222fe2 100644 --- a/packages/package_info_plus/package_info_plus_macos/CHANGELOG.md +++ b/packages/package_info_plus/package_info_plus_macos/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.2.0 + +- fix app name on iOS and macOS + ## 1.1.1 - Improve documentation diff --git a/packages/package_info_plus/package_info_plus_macos/pubspec.yaml b/packages/package_info_plus/package_info_plus_macos/pubspec.yaml index b8f327d8b3..96e157b107 100644 --- a/packages/package_info_plus/package_info_plus_macos/pubspec.yaml +++ b/packages/package_info_plus/package_info_plus_macos/pubspec.yaml @@ -1,6 +1,6 @@ name: package_info_plus_macos description: macOS implementation of the package_info_plus plugin. -version: 1.1.1 +version: 1.2.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ From 6d79247f18712785f9991295d3c8e59129a0e25d Mon Sep 17 00:00:00 2001 From: Majid Date: Fri, 1 Oct 2021 21:15:33 +0200 Subject: [PATCH 4/4] add changelong and pump version --- packages/package_info_plus/package_info_plus/CHANGELOG.md | 2 +- packages/package_info_plus/package_info_plus_macos/CHANGELOG.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/package_info_plus/package_info_plus/CHANGELOG.md b/packages/package_info_plus/package_info_plus/CHANGELOG.md index c1240f731f..04c2af5a7d 100644 --- a/packages/package_info_plus/package_info_plus/CHANGELOG.md +++ b/packages/package_info_plus/package_info_plus/CHANGELOG.md @@ -1,6 +1,6 @@ ## 1.2.0 -- fix app name on macOS +- fix app name on iOS and macOS ## 1.1.0 diff --git a/packages/package_info_plus/package_info_plus_macos/CHANGELOG.md b/packages/package_info_plus/package_info_plus_macos/CHANGELOG.md index 446c222fe2..5bd3a64af9 100644 --- a/packages/package_info_plus/package_info_plus_macos/CHANGELOG.md +++ b/packages/package_info_plus/package_info_plus_macos/CHANGELOG.md @@ -1,6 +1,6 @@ ## 1.2.0 -- fix app name on iOS and macOS +- fix app name on macOS ## 1.1.1