diff --git a/.drone.yml b/.drone.yml index 7fc521a..00a4cab 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,20 +1,6 @@ --- kind: pipeline -name: linux - arm64 - Julia 1.5 - -platform: - os: linux - arch: arm64 - -steps: -- name: build - image: julia:1.5 - commands: - - "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'" - ---- -kind: pipeline -name: linux - arm - Julia 1.6 +name: linux - arm - Julia 1.10 platform: os: linux @@ -22,13 +8,13 @@ platform: steps: - name: build - image: julia:1.6 + image: julia:1.10 commands: - "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'" --- kind: pipeline -name: linux - arm64 - Julia 1.6 +name: linux - arm64 - Julia 1.10 platform: os: linux @@ -36,6 +22,6 @@ platform: steps: - name: build - image: julia:1.6 + image: julia:1.10 commands: - "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 70b34ad..08f772b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,8 +10,7 @@ jobs: fail-fast: false matrix: version: - - '1.6' - - '1.9' + - '1.10' - 'nightly' os: - ubuntu-latest @@ -29,7 +28,7 @@ jobs: with: version: ${{ matrix.version }} arch: ${{ matrix.arch }} - - uses: actions/cache@v1 + - uses: actions/cache@v4 env: cache-name: cache-artifacts with: diff --git a/Project.toml b/Project.toml index 2605e15..6988d2b 100644 --- a/Project.toml +++ b/Project.toml @@ -4,11 +4,11 @@ keywords = ["Entities", "Emoji"] license = "MIT" name = "Emoji_Entities" uuid = "fd8f23de-bd2f-5c75-921c-0c9ab51355f5" -version = "1.1.0" +version = "1.2.0" [deps] +RelocatableFolders = "05181044-ff0b-4ac5-8273-598c1e38db00" StrTables = "9700d1a9-a7c8-5760-9816-a99fda30bb8f" -Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" [extras] Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" @@ -17,5 +17,6 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" test = ["Test"] [compat] -julia = "1" +RelocatableFolders = "1" StrTables = "1" +julia = "1.10" diff --git a/README.md b/README.md index e773ac2..c2044aa 100644 --- a/README.md +++ b/README.md @@ -36,3 +36,5 @@ Emoji_Entities.jl This builds tables for looking up Emoji names and returning the Unicode character(s), looking up a character or pair of characters and finding Emoji names that return it/them, and finding all of the Emoji name completions for a particular string, if any. + +Version 1.2 supports Unicode v16.0 diff --git a/data/emoji.dat b/data/emoji.dat index 0b5917e..562d0cc 100644 Binary files a/data/emoji.dat and b/data/emoji.dat differ diff --git a/src/Emoji_Entities.jl b/src/Emoji_Entities.jl index 43d1739..6cf8f86 100644 --- a/src/Emoji_Entities.jl +++ b/src/Emoji_Entities.jl @@ -1,4 +1,5 @@ -__precompile__() +# License is MIT: https://github.com/JuliaString/Emoji_Entities/LICENSE.md + """ # Public API (nothing is exported) @@ -10,7 +11,7 @@ __precompile__() """ module Emoji_Entities -using StrTables +using StrTables, RelocatableFolders VER = UInt32(1) @@ -31,9 +32,10 @@ struct Emoji_Table{T} <: AbstractEntityTable max2c::UInt32 end +const DATA_PATH = @path joinpath(@__DIR__, "../data", "emoji.dat") + function __init__() - global default = - Emoji_Table(StrTables.load(joinpath(@__DIR__, "../data", "emoji.dat"))...) + global default = Emoji_Table(StrTables.load(DATA_PATH)...) nothing end diff --git a/src/manual_emoji.jl b/src/manual_emoji.jl index 118aaec..bee0f8e 100644 --- a/src/manual_emoji.jl +++ b/src/manual_emoji.jl @@ -2,4 +2,47 @@ # the automatic entries # It is a vector of Pair{String,String} -const manual = [] +# Additions from Unicode 16.0 to 15.1 not yet in emoji_pretty.json +const manual = [ + "face_with_bags_under_eyes" => "🫩", + "fingerprint" => "πŸ«†", + "leafless_tree" => "πŸͺΎ", + "root_vegetable" => "🫜", + "harp" => "πŸͺ‰", + "shovel" => "πŸͺ", + "splatter" => "🫟" +] + +#= +# Additions from Unicode 15.0 to 15.1 not yet in emoji_pretty.json +const manual = [ + "phoenix" => "πŸ¦β€πŸ”₯", + "lime" => "πŸ‹β€πŸŸ©", + "brown_mushroom" => "πŸ„β€πŸŸ«", + "broken_chain" => "⛓️‍πŸ’₯", + "head_shaking_horizontally" => "πŸ™‚β€β†”οΈ", + "head_shaking_vertically" => "πŸ™‚β€β†•οΈ", + "adult_child" => "πŸ§‘β€πŸ§’", + "adult_child_child" => "πŸ§‘β€πŸ§’β€πŸ§’", + "adult_adult_child" => "πŸ§‘β€πŸ§‘β€πŸ§’", + "adult_adult_child_child" => "πŸ§‘β€πŸ§‘β€πŸ§’β€πŸ§’", + "person_walking_facing_right" => "πŸšΆβ€βž‘οΈ", + "person_running_facing_right" => "πŸƒβ€βž‘οΈ", + "person_kneeling_facing_right" => "πŸ§Žβ€βž‘οΈ", + "person_with_white_cane_facing_right" => "πŸ§‘β€πŸ¦―β€βž‘οΈ", + "person_in_manual_wheelchair_facing_right" => "πŸ§‘β€πŸ¦½β€βž‘οΈ", + "person_in_motorized_wheelchair_facing_right" => "πŸ§‘β€πŸ¦Όβ€βž‘οΈ", + "man_walking_facing_right" => "πŸšΆβ€β™‚οΈβ€βž‘οΈ", + "man_running_facing_right" => "πŸƒβ€β™‚οΈβ€βž‘οΈ", + "man_kneeling_facing_right" => "πŸ§Žβ€β™‚οΈβ€βž‘οΈ", + "man_with_white_cane_facing_right" => "πŸ‘¨β€πŸ¦―β€βž‘οΈ", + "man_in_manual_wheelchair_facing_right" => "πŸ‘¨β€πŸ¦½β€βž‘οΈ", + "man_in_motorized_wheelchair_facing_right" => "πŸ‘¨β€πŸ¦Όβ€βž‘οΈ", + "woman_walking_facing_right" => "πŸšΆβ€β™€οΈβ€βž‘οΈ", + "woman_running_facing_right" => "πŸƒβ€β™€οΈβ€βž‘οΈ", + "woman_kneeling_facing_right" => "πŸ§Žβ€β™€οΈβ€βž‘οΈ", + "woman_with_white_cane_facing_right" => "πŸ‘©β€πŸ¦―β€βž‘οΈ", + "woman_in_manual_wheelchair_facing_right" => "πŸ‘©β€πŸ¦½β€βž‘οΈ", + "woman_in_motorized_wheelchair_facing_right" => "πŸ‘©β€πŸ¦Όβ€βž‘οΈ", + ] +=#