1.2.0

* update dependencies, export emojis regex * update emoji data to version 16.0 * add tests for regexes * bump version to 1.2.0 * fix flutter examples * update CHANGELOG
Nikoro · Dec 22, 2024 · 75ac83b · 75ac83b
1 parent 28801d2
commit 75ac83b
Show file tree

Hide file tree

Showing 55 changed files with 536 additions and 308 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "dart.lineLength": 80
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 1.2.0
+- Updated emoji dataset to newest [Unicode 16.0](https://www.unicode.org/reports/tr51/)
+- Updated dependencies
+- Require Dart `^3.4.0`
+- Exported emoji regex:
+```dart
+final regex = Emojis.regex;
+  // print(regex); // RegExp: pattern=[#*\d]\uFE0F?\u20E3|[\xA9\...
+```
+
 ## 1.1.1
 - Changed *gif demo files to *webp format
 
@@ -526,4 +536,4 @@ print(result); // '🦦🤦🏾‍♀️🎅💃🏽👩🏾‍🚀'
 
 ## 0.1.0
 
-Initial release 🎉
+Initial release 🎉
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
   <a href="https://pub.dev/packages/emoji_extension"><img src="https://raw.githubusercontent.com/nikoro/emoji_extension/main/images/logo.png" width="600"/></a>
 </p>
 <h2 align="center">
-Emojis for Dart <a href="https://www.unicode.org/reports/tr51/">Unicode 15.1</a><br>
+Emojis for Dart <a href="https://www.unicode.org/reports/tr51/">Unicode 16.0</a><br>
 +<br>
 One, yet powerful <a href="#emojis-extension">emojis</a> String extension
 </h2>
@@ -20,7 +20,7 @@ One, yet powerful <a href="#emojis-extension">emojis</a> String extension
     <img alt="MIT License" src="https://tinyurl.com/3uf9tzpy">
   </a>
   <a href="https://www.unicode.org/reports/tr51/">
-    <img alt="Unicode 15.1" src="https://img.shields.io/badge/unicode-15.1-5555FF?logo=unicode&logoColor=white">
+    <img alt="Unicode 16.0" src="https://img.shields.io/badge/unicode-16.0-5555FF?logo=unicode&logoColor=white">
   </a>
   <a href="https://youtu.be/fLPVkksEpJw">
     <img alt="YouTube Tutorial" src="https://tinyurl.com/2amvfxbu">
@@ -30,7 +30,7 @@ One, yet powerful <a href="#emojis-extension">emojis</a> String extension
 ---
 ## Features
 
-- Contains over **5,000** emojis from Unicode 15.1 💪
+- Contains over **5,000** emojis from Unicode 16.0 💪
 - Supports:
   - `shorcodes`: **Discord**, **Github**, **Slack** 🫡
   - skin tone variations: 👍 👍🏻 👍🏼 👍🏽 👍🏾 👍🏿
@@ -856,17 +856,17 @@ Emojis.versions // [Version.v6_0, Version.v7_0, Version.v8_0, Version.v9_0, ...]
                .fourth // Version.v9_0
                .fifth // Version.v10_0
                .sixth // Version.v11_0
-               .penultimate // Version.v15_0
-               .last // Version.v15_1
+               .penultimate // Version.v15_1
+               .last // Version.v16_0
                .values // [6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 12.1, 13.0, ...]
                       .first // 6.0
                       .second // 7.0
                       .third // 8.0
                       .fourth // 9.0
                       .fifth // 10.0
                       .sixth // 11.0
-                      .penultimate // 15.0
-                      .last // 15.1
+                      .penultimate // 15.1
+                      .last // 16.0
 ```
 <div align="center"><a href="#table-of-contents">↑ Table of contents ↑</a></div>
 

diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -22,6 +22,9 @@ void main() {
   final hasColor = Emoji('🩵').hasColor;
   // print(hasColor); // true
 
+  final regex = Emojis.regex;
+  // print(regex); // RegExp: pattern=[#*\d]\uFE0F?\u20E3|[\xA9\...
+
   final emojis = Emojis.all;
   // print(emojis); // [Emoji(value: 😀, ...), Emoji(value: 😃, ...), ...]
 

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -5,16 +5,16 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.19.1"
   emoji_extension:
     dependency: "direct main"
     description:
       path: ".."
       relative: true
     source: path
-    version: "1.1.1"
+    version: "1.2.0"
 sdks:
-  dart: ">=2.19.6 <4.0.0"
+  dart: ">=3.4.0 <4.0.0"
diff --git a/flutter_examples/emoji_chat_app_example/.gitignore b/flutter_examples/emoji_chat_app_example/.gitignore
@@ -5,9 +5,11 @@
 *.swp
 .DS_Store
 .atom/
+.build/
 .buildlog/
 .history
 .svn/
+.swiftpm/
 migrate_working_dir/
 
 # IntelliJ related

diff --git a/flutter_examples/emoji_chat_app_example/.metadata b/flutter_examples/emoji_chat_app_example/.metadata
@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "300451adae589accbece3490f4396f10bdf15e6e"
+  revision: "603104015dd692ea3403755b55d07813d5cf8965"
   channel: "stable"
 
 project_type: app
@@ -13,26 +13,26 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: 300451adae589accbece3490f4396f10bdf15e6e
-      base_revision: 300451adae589accbece3490f4396f10bdf15e6e
+      create_revision: 603104015dd692ea3403755b55d07813d5cf8965
+      base_revision: 603104015dd692ea3403755b55d07813d5cf8965
     - platform: android
-      create_revision: 300451adae589accbece3490f4396f10bdf15e6e
-      base_revision: 300451adae589accbece3490f4396f10bdf15e6e
+      create_revision: 603104015dd692ea3403755b55d07813d5cf8965
+      base_revision: 603104015dd692ea3403755b55d07813d5cf8965
     - platform: ios
-      create_revision: 300451adae589accbece3490f4396f10bdf15e6e
-      base_revision: 300451adae589accbece3490f4396f10bdf15e6e
+      create_revision: 603104015dd692ea3403755b55d07813d5cf8965
+      base_revision: 603104015dd692ea3403755b55d07813d5cf8965
     - platform: linux
-      create_revision: 300451adae589accbece3490f4396f10bdf15e6e
-      base_revision: 300451adae589accbece3490f4396f10bdf15e6e
+      create_revision: 603104015dd692ea3403755b55d07813d5cf8965
+      base_revision: 603104015dd692ea3403755b55d07813d5cf8965
     - platform: macos
-      create_revision: 300451adae589accbece3490f4396f10bdf15e6e
-      base_revision: 300451adae589accbece3490f4396f10bdf15e6e
+      create_revision: 603104015dd692ea3403755b55d07813d5cf8965
+      base_revision: 603104015dd692ea3403755b55d07813d5cf8965
     - platform: web
-      create_revision: 300451adae589accbece3490f4396f10bdf15e6e
-      base_revision: 300451adae589accbece3490f4396f10bdf15e6e
+      create_revision: 603104015dd692ea3403755b55d07813d5cf8965
+      base_revision: 603104015dd692ea3403755b55d07813d5cf8965
     - platform: windows
-      create_revision: 300451adae589accbece3490f4396f10bdf15e6e
-      base_revision: 300451adae589accbece3490f4396f10bdf15e6e
+      create_revision: 603104015dd692ea3403755b55d07813d5cf8965
+      base_revision: 603104015dd692ea3403755b55d07813d5cf8965
 
   # User provided section
 

diff --git a/flutter_examples/emoji_chat_app_example/android/.gitignore b/flutter_examples/emoji_chat_app_example/android/.gitignore
@@ -7,7 +7,7 @@ gradle-wrapper.jar
 GeneratedPluginRegistrant.java
 
 # Remember to never publicly share your keystore.
-# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+# See https://flutter.dev/to/reference-keystore
 key.properties
 **/*.keystore
 **/*.jks
diff --git a/flutter_examples/emoji_chat_app_example/android/app/build.gradle b/flutter_examples/emoji_chat_app_example/android/app/build.gradle
@@ -1,67 +1,44 @@
 plugins {
     id "com.android.application"
     id "kotlin-android"
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
     id "dev.flutter.flutter-gradle-plugin"
 }
 
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
-    }
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
-
 android {
-    namespace "com.example.emoji_chat_app_example"
-    compileSdk flutter.compileSdkVersion
-    ndkVersion flutter.ndkVersion
+    namespace = "com.example.emoji_chat_app_example"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
-    }
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+        jvmTarget = JavaVersion.VERSION_1_8
     }
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.example.emoji_chat_app_example"
+        applicationId = "com.example.emoji_chat_app_example"
         // You can update the following values to match your application needs.
-        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion flutter.minSdkVersion
-        targetSdkVersion flutter.targetSdkVersion
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
+        // For more information, see: https://flutter.dev/to/review-gradle-config.
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
     }
 
     buildTypes {
         release {
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
+            signingConfig = signingConfigs.debug
         }
     }
 }
 
 flutter {
-    source '../..'
+    source = "../.."
 }
-
-dependencies {}
diff --git a/flutter_examples/emoji_chat_app_example/android/app/src/main/AndroidManifest.xml b/flutter_examples/emoji_chat_app_example/android/app/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
             android:name=".MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
+            android:taskAffinity=""
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
@@ -31,7 +32,7 @@
             android:value="2" />
     </application>
     <!-- Required to query activities that can process text, see:
-         https://developer.android.com/training/package-visibility?hl=en and
+         https://developer.android.com/training/package-visibility and
          https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
 
          In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->

diff --git a/flutter_examples/emoji_chat_app_example/android/build.gradle b/flutter_examples/emoji_chat_app_example/android/build.gradle
@@ -5,12 +5,12 @@ allprojects {
     }
 }
 
-rootProject.buildDir = '../build'
+rootProject.buildDir = "../build"
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
 subprojects {
-    project.evaluationDependsOn(':app')
+    project.evaluationDependsOn(":app")
 }
 
 tasks.register("clean", Delete) {

diff --git a/flutter_examples/emoji_chat_app_example/android/gradle.properties b/flutter_examples/emoji_chat_app_example/android/gradle.properties
@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx4G
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/flutter_examples/emoji_chat_app_example/android/gradle/wrapper/gradle-wrapper.properties b/flutter_examples/emoji_chat_app_example/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
diff --git a/flutter_examples/emoji_chat_app_example/android/settings.gradle b/flutter_examples/emoji_chat_app_example/android/settings.gradle
@@ -5,10 +5,9 @@ pluginManagement {
         def flutterSdkPath = properties.getProperty("flutter.sdk")
         assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
         return flutterSdkPath
-    }
-    settings.ext.flutterSdkPath = flutterSdkPath()
+    }()
 
-    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
     repositories {
         google()
@@ -19,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+    id "com.android.application" version "8.1.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
 }
 
 include ":app"
diff --git a/flutter_examples/emoji_chat_app_example/ios/Runner/AppDelegate.swift b/flutter_examples/emoji_chat_app_example/ios/Runner/AppDelegate.swift
@@ -1,7 +1,7 @@
-import UIKit
 import Flutter
+import UIKit
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,

diff --git a/flutter_examples/emoji_chat_app_example/macos/Runner/AppDelegate.swift b/flutter_examples/emoji_chat_app_example/macos/Runner/AppDelegate.swift
@@ -1,7 +1,7 @@
 import Cocoa
 import FlutterMacOS
 
-@NSApplicationMain
+@main
 class AppDelegate: FlutterAppDelegate {
   override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
     return true

diff --git a/flutter_examples/emoji_chat_app_example/macos/RunnerTests/RunnerTests.swift b/flutter_examples/emoji_chat_app_example/macos/RunnerTests/RunnerTests.swift
@@ -1,5 +1,5 @@
-import FlutterMacOS
 import Cocoa
+import FlutterMacOS
 import XCTest
 
 class RunnerTests: XCTestCase {