Upgrade to flutter 3.3.0 + lint upgrade and fixes (#63)

* Remove unused import * Upgrades in example/android/ * Move lint to dev dependencies + upgrade it to 1.10.0 * Deprecation fix in example/ * Replace direct imports with package: import * Lint fixes * Changelog * Changelog new version 3.0.0 * Update version in pubspec + set sdk version to min 3.0.0 * Adapt dart + min flutter version again in pubspec
TinyCommunity · Sep 12, 2022 · 116ffe5 · 116ffe5
1 parent 1e1fe06
commit 116ffe5
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [3.0.0] - 2022-09-12
+
+- Upgrade to Flutter 3.3.0
+- Upgrade lint package to 1.1.0
+
 ## [2.1.0] - 2022-06-20
 
 ### Changed

diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -36,7 +36,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.example"
         minSdkVersion 16
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
@@ -9,7 +9,9 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true"
+            >
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues

diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -24,7 +24,7 @@ class ExamplePage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final TinyColor tc = TinyColor(Colors.blue);
+    final TinyColor tc = TinyColor.fromColor(Colors.blue);
 
     return Scaffold(
       appBar: AppBar(

diff --git a/lib/src/conversion.dart b/lib/src/conversion.dart
@@ -1,8 +1,7 @@
 import 'dart:math' as math;
 
 import 'package:flutter/painting.dart' show Color, HSLColor, HSVColor;
-
-import 'util.dart';
+import 'package:tinycolor2/src/util.dart';
 
 HSLColor rgbToHsl({
   required double r,

diff --git a/lib/src/extensions.dart b/lib/src/extensions.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/painting.dart';
-
-import 'tinycolor.dart';
+import 'package:tinycolor2/src/tinycolor.dart';
 
 /// Extends the Color class to allow direct TinyColor manipulation natively
 extension TinyColorExtension on Color {

diff --git a/lib/src/tinycolor.dart b/lib/src/tinycolor.dart
@@ -2,9 +2,7 @@ import 'dart:math' as math;
 
 import 'package:flutter/painting.dart' show Color, HSLColor, HSVColor;
 import 'package:pigment/pigment.dart';
-
-import 'conversion.dart';
-import 'util.dart';
+import 'package:tinycolor2/src/util.dart';
 
 class TinyColor {
   final Color originalColor;

diff --git a/lib/tinycolor2.dart b/lib/tinycolor2.dart
@@ -1,6 +1,6 @@
 library tinycolor2;
 
-export 'src/extensions.dart';
 export 'src/conversion.dart';
+export 'src/extensions.dart';
 export 'src/tinycolor.dart';
 export 'src/util.dart';
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,20 +1,20 @@
 name: tinycolor2
 description: Flutter Color manipulation and conversion, ported from JS tinycolor2
-version: 2.1.0
+version: 3.0.0
 homepage: https://github.com/TinyCommunity/tinycolor2
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
-  flutter: ">=1.12.0"
+  sdk: ">=2.17.0 <3.0.0"
+  flutter: ">=3.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  lint: ^1.5.3
   pigment: ^1.0.4
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
+  lint: ^1.10.0
 
 flutter:
diff --git a/test/tinycolor_test.dart b/test/tinycolor_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/painting.dart' show Color, HSLColor, HSVColor;
-
 import 'package:flutter_test/flutter_test.dart';
 import 'package:tinycolor2/tinycolor2.dart';
 
@@ -425,7 +424,7 @@ void main() {
         "==",
         () {
           expect(
-            color!,
+            color,
             TinyColor.fromColor(const Color(0xFFFFFFFF)),
           );
         },