Merge pull request #89 from wasabeef/fix-brand-name

fix: wrong bran name
wasabeef · Dec 14, 2023 · 19c5805 · 19c5805
2 parents 3ffd28e + 14e7d0c
commit 19c5805
Show file tree

Hide file tree

Showing 12 changed files with 77 additions and 59 deletions.
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.2.0
+
+**Bug fix**
+- Wrong brand name.
+
 ## 1.1.3
 
 **Development**

diff --git a/README.md b/README.md
@@ -86,7 +86,7 @@ print('platform:        ${uaData.platform}');              // e.g.. 'Android'
 print('platformVersion: ${uaData.platformVersion}');       // e.g.. '10'
 print('model:           ${uaData.model}');                 // e.g.. 'Pixel 4 XL'
 print('architecture:    ${uaData.architecture}');          // e.g.. 'arm64-v8a'
-print('brand:           ${uaData.brand}');                 // e.g.. 'google'
+print('brand:           ${uaData.brand}');                 // e.g.. 'Google'
 print('mobile:          ${uaData.mobile}');                // e.g.. true
 print('device:          ${uaData.device}');                // e.g.. 'coral'
 print('appName:         ${uaData.package.appName}');       // e.g.. 'SampleApp'

diff --git a/android/build.gradle b/android/build.gradle
@@ -1,5 +1,5 @@
 group 'jp.wasabeef.ua.client_hints'
-version '1.1.3'
+version '1.2.0'
 
 buildscript {
     ext.kotlin_version = '1.7.10'

diff --git a/android/src/main/kotlin/jp/wasabeef/ua/client_hints/UAClientHintsPlugin.kt b/android/src/main/kotlin/jp/wasabeef/ua/client_hints/UAClientHintsPlugin.kt
@@ -39,7 +39,7 @@ class UAClientHintsPlugin : FlutterPlugin, MethodCallHandler {
           "platformVersion" to Build.VERSION.RELEASE, // e.g.. 10
           "architecture" to Build.SUPPORTED_ABIS[0], // e.g.. armv7
           "model" to Build.MODEL, // e.g.. Pixel 4 XL
-          "brand" to info?.applicationInfo?.loadLabel(context.packageManager)?.toString(), // e.g.. Sample App
+          "brand" to Build.MANUFACTURER, // e.g.. Google
           "version" to info?.versionName, // e.g.. 1.0.0
           "mobile" to (uiManager.currentModeType == Configuration.UI_MODE_TYPE_NORMAL), // true/false
 					"device" to Build.DEVICE, // e.g.. coral

diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
   - Flutter (1.0.0)
-  - ua_client_hints (1.1.3):
+  - ua_client_hints (1.2.0):
     - Flutter
 
 DEPENDENCIES:
@@ -15,8 +15,8 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
-  ua_client_hints: d8d0ce034e13b28242fa75c7c339f2e3b1942d6b
+  ua_client_hints: 5887fe166a59d944cbade5eb84d60c4e417b4f55
 
 PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1
diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -5,42 +5,48 @@ packages:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.9.0"
+    version: "2.11.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   characters:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.dartlang.org"
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.3.0"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.dartlang.org"
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.16.0"
+    version: "1.17.1"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      url: "https://pub.dartlang.org"
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      url: "https://pub.dev"
     source: hosted
     version: "1.3.1"
   flutter:
@@ -52,49 +58,63 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      url: "https://pub.dartlang.org"
+      sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
     source: sdk
     version: "0.0.0"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.7"
   lints:
     dependency: transitive
     description:
       name: lints
-      url: "https://pub.dartlang.org"
+      sha256: "5cfd6509652ff5e7fe149b6df4859e687fca9048437857cb2e65c8d780f396e3"
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.12.12"
+    version: "0.12.15"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      url: "https://pub.dartlang.org"
+      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      url: "https://pub.dev"
     source: hosted
-    version: "0.1.5"
+    version: "0.2.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.0"
+    version: "1.9.1"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.2"
+    version: "1.8.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -104,58 +124,65 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      url: "https://pub.dev"
     source: hosted
-    version: "1.9.0"
+    version: "1.9.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.11.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.2.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
+      url: "https://pub.dev"
     source: hosted
-    version: "0.4.12"
+    version: "0.5.1"
   ua_client_hints:
     dependency: "direct main"
     description:
       path: ".."
       relative: true
     source: path
-    version: "1.1.3"
+    version: "1.2.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
 sdks:
-  dart: ">=2.17.0 <3.0.0"
+  dart: ">=3.0.0-0 <4.0.0"
   flutter: ">=2.10.0"
diff --git a/ios/Classes/UAClientHintsPlugin.swift b/ios/Classes/UAClientHintsPlugin.swift
@@ -19,7 +19,7 @@ public class UAClientHintsPlugin: NSObject, FlutterPlugin {
         "platformVersion": current.systemVersion, // e.g.. 14.2
         "architecture": cpuType(), // e.g.. armv7
         "model": current.model, // e.g.. iPhone, iPod touch
-        "brand": Bundle.main.object(forInfoDictionaryKey: "CFBundleDisplayName") ?? "App", // e.g.. Sample App
+        "brand": "Apple", // e.g.. Apple
         "version": Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString"), // e.g.. 1.0.0
         "mobile": current.userInterfaceIdiom == .phone || current.userInterfaceIdiom == .pad, // true/false
 				"device": device(), // e.g.. iPhone13,4

diff --git a/ios/ua_client_hints.podspec b/ios/ua_client_hints.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'ua_client_hints'
-  s.version          = '1.1.3'
+  s.version          = '1.2.0'
   s.summary          = 'Provide User-Agent Client Hints plugin.'
   s.description      = <<-DESC
 Provide User-Agent Client Hints plugin.

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: ua_client_hints
 description: Provide User-Agent Client Hints to Flutter.
-version: 1.1.3
+version: 1.2.0
 homepage: https://github.com/wasabeef/flutter_ua_client_hints
 repository: https://github.com/wasabeef/flutter_ua_client_hints
 documentation: https://github.com/wasabeef/flutter_ua_client_hints