Merge pull request #21 from wasabeef/deps-update

chore: update dependencies

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,2 @@
 ### What does this change?
 
-### What is the value of this and can you measure success?
-
-### Screenshots (Optional)
-
-

.github/workflows/flutter-ci.yml → .github/workflows/flutter-ci.yaml

@@ -13,7 +13,10 @@ jobs:
       - uses: actions/[email protected]
       - uses: subosito/flutter-action@v1
         with:
-          channel: 'beta'
+          flutter-version: '2.5.2'
+      - uses: dart-lang/setup-dart@v1
+        with:
+          sdk: '2.14.3'
 
       - name: Cache Gradle modules
         uses: actions/[email protected]
@@ -46,7 +49,7 @@ jobs:
             ${{ runner.os }}-
 
       - name: Get flutter dependencies.
-        run: make dependencies
+        run: make deps
 
 #      - name: Check for any formatting and statically analyze the code.
 #        run: make format-analyze

.tool-versions

@@ -0,0 +1,3 @@
+dart 2.14.3
+flutter 2.5.2-stable
+nodejs 16.9.0

.vscode/launch.json

@@ -0,0 +1,14 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Run example on main.dart",
+            "program": "${workspaceFolder}/example/lib/main.dart",
+            "request": "launch",
+            "type": "dart",
+            "args": [
+                "--debug"
+            ]
+        }
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "dart.flutterSdkPath": "~/.asdf/installs/flutter/2.5.2-stable",
+    "dart.sdkPath": "~/.asdf/installs/dart/2.14.3/dart-sdk"
+}

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.1.0
+
+Dependencies
+- Update Flutter to >=2.0.0
+- Update Dart to >=2.12.0
+
 ## 1.0.2
 
 Bug Fix:

Makefile

@@ -1,14 +1,5 @@
-.PHONY: setup
-setup:
-	flutter channel beta
-	flutter upgrade
-	flutter pub get
-	npm install
-	gem update cocoapods
-	cd ios/ && pod install && cd ..
-
-.PHONY: dependencies
-dependencies:
+.PHONY: deps
+deps:
 	flutter pub get
 
 .PHONY: analyze

android/build.gradle

@@ -1,15 +1,15 @@
 group 'jp.wasabeef.ua.client_hints'
-version '1.0.3'
+version '1.1.0'
 
 buildscript {
-    ext.kotlin_version = '1.4.20'
+    ext.kotlin_version = '1.5.30'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

example/android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.4.20'
+    ext.kotlin_version = '1.5.30'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists

example/ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>8.0</string>
+  <string>9.0</string>
 </dict>
 </plist>

example/ios/Podfile.lock

@@ -1,6 +1,6 @@
 PODS:
   - Flutter (1.0.0)
-  - ua_client_hints (1.0.0):
+  - ua_client_hints (1.1.0):
     - Flutter
 
 DEPENDENCIES:
@@ -14,9 +14,9 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/ua_client_hints/ios"
 
 SPEC CHECKSUMS:
-  Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
-  ua_client_hints: 4f9c8b4d4a919e7fc89dc5c76d6afcbcf7a2fa27
+  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
+  ua_client_hints: 314de6b4221bf713b1a6a5fb8bc68917ad3eaaec
 
 PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
 
-COCOAPODS: 1.10.0
+COCOAPODS: 1.11.2

example/lib/main.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:ua_client_hints/ua_client_hints.dart';
 
@@ -39,7 +38,34 @@ void main() async {
   print("Sec-CH-UA-Full-Version :${header['Sec-CH-UA-Full-Version']}");
   print("Sec-CH-UA-Mobile :${header['Sec-CH-UA-Mobile']}");
 
-  return runApp(const MaterialApp(
-    home: Scaffold(body: Center(child: Text('User-Agent Client Hints'))),
+  return runApp(MaterialApp(
+    home: Scaffold(
+      appBar: AppBar(
+        title: const Text("User-Agent Client Hints"),
+      ),
+      body: Container(
+        child: ListView.separated(
+            padding: const EdgeInsets.only(top: 16),
+            shrinkWrap: true,
+            itemBuilder: (context, index) {
+              return Container(
+                  padding: const EdgeInsets.symmetric(horizontal: 8),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        header.keys.elementAt(index),
+                        style: const TextStyle(fontWeight: FontWeight.bold),
+                      ),
+                      Text(
+                        header.values.elementAt(index),
+                      ),
+                    ],
+                  ));
+            },
+            separatorBuilder: (_, index) => const Divider(),
+            itemCount: header.length),
+      ),
+    ),
   ));
 }

example/pubspec.lock

@@ -7,56 +7,56 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0-nullsafety.3"
+    version: "2.8.1"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.3"
+    version: "2.1.0"
   characters:
     dependency: transitive
     description:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.5"
+    version: "1.1.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.3"
+    version: "1.3.1"
   clock:
     dependency: transitive
     description:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.3"
+    version: "1.1.0"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.0-nullsafety.5"
+    version: "1.15.0"
   effective_dart:
     dependency: "direct dev"
     description:
       name: effective_dart
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.2"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.3"
+    version: "1.2.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -73,21 +73,21 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10-nullsafety.3"
+    version: "0.12.10"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.6"
+    version: "1.7.0"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety.3"
+    version: "1.8.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -99,63 +99,63 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety.4"
+    version: "1.8.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety.6"
+    version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.3"
+    version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.3"
+    version: "1.1.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.3"
+    version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19-nullsafety.6"
+    version: "0.4.2"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.5"
+    version: "1.3.0"
   ua_client_hints:
     dependency: "direct main"
     description:
       path: ".."
       relative: true
     source: path
-    version: "1.0.3"
+    version: "1.1.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.5"
+    version: "2.1.0"
 sdks:
-  dart: ">=2.12.0-29.10.beta <3.0.0"
-  flutter: ">=1.22.0"
+  dart: ">=2.14.0 <3.0.0"
+  flutter: ">=2.5.0"

example/pubspec.yaml

@@ -6,8 +6,8 @@ version: 1.0.0+1
 publish_to: 'none'
 
 environment:
-  sdk: '>=2.11.0 <3.0.0'
-  flutter: '>=1.22.0'
+  sdk: '>=2.14.0 <3.0.0'
+  flutter: '>=2.5.0'
 
 dependencies:
   flutter:
@@ -19,7 +19,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  effective_dart: ^1.3.0
+  effective_dart: ^1.3.2
 
 flutter:
   uses-material-design: true

ios/ua_client_hints.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'ua_client_hints'
-  s.version          = '1.0.3'
+  s.version          = '1.1.0'
   s.summary          = 'Provide User-Agent Client Hints plugin.'
   s.description      = <<-DESC
 Provide User-Agent Client Hints plugin.