release 2.0.1

fix: AndroidManifest.xml

.github/workflows/gradle-publish.yml

@@ -39,7 +39,7 @@ jobs:
     - name: Publish to GitHub Packages
       uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
       with:
-        arguments: publish
+        arguments: publishAllPublicationsToGitHubPackagesRepository
       env:
         USERNAME: ${{ github.actor }}
         TOKEN: ${{ secrets.GITHUB_TOKEN }}

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "dev.usbharu"
-version = "1.1.0"
+version = "2.0.1"
 
 repositories {
     google()
@@ -81,4 +81,19 @@ publishing{
             }
         }
     }
+    repositories {
+        maven {
+            name = "Gitea"
+            url = uri("https://git.usbharu.dev/api/packages/usbharu/maven")
+
+            credentials(HttpHeaderCredentials::class.java) {
+                name = "Authorization"
+                value = "token "+(project.findProperty("gpr.gitea") as String? ?: System.getenv("GITEA"))
+            }
+
+            authentication {
+                create<HttpHeaderAuthentication>("header")
+            }
+        }
+    }
 }

buildSrc/build.gradle.kts

@@ -9,12 +9,4 @@ repositories {
 
 dependencies {
     compileOnly(gradleApi())
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
+}
-    implementation("io.ktor:ktor-client-core:2.2.3")
-    implementation("io.ktor:ktor-client-cio:2.2.3")
-}
-
-buildscript {
-
-}
-ext["kotlin_version"] = "1.8.10"

buildSrc/src/main/kotlin/EmojiPlugin.kt

@@ -1,128 +1,160 @@
-import io.ktor.client.*
-import io.ktor.client.engine.cio.*
-import io.ktor.client.request.*
-import io.ktor.client.statement.*
-import kotlinx.coroutines.runBlocking
 import org.gradle.api.Action
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import java.net.URI
+import java.net.http.HttpClient
+import java.net.http.HttpRequest
+import java.net.http.HttpResponse
+import java.time.Duration
 
 class EmojiPlugin : Plugin<Project> {
     override fun apply(project: Project) {
         project.task("generateEmoji")
             .doLast(Action {
-                runBlocking {
+                val httpClient = HttpClient.newBuilder()
+                    .version(HttpClient.Version.HTTP_1_1)
+                    .followRedirects(HttpClient.Redirect.NORMAL)
+                    .connectTimeout(Duration.ofSeconds(10))
+                    .build()
 
-                    val httpClient = HttpClient(CIO)
+                val req = HttpRequest
-                    val bodyAsText =
+                    .newBuilder(URI.create("https://unicode.org/Public/emoji/15.1/emoji-test.txt"))
-                        httpClient.get("https://unicode.org/Public/emoji/15.0/emoji-test.txt")
+                    .GET()
-                            .bodyAsText()
+                    .setHeader(
-                    println(project.buildDir.path)
+                        "User-Agent",
+                        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.3"
+                    )
+                    .build()
+
+
+                val bodyAsText = httpClient.send(req, HttpResponse.BodyHandlers.ofString()).body()
+
+                println(project.buildDir.path)
 //                    println(bodyAsText)
 
-                    val file =
+                val file =
-                        project.layout.buildDirectory.file("generated/source/emoji/main/kotlin/Emojis.kt")
+                    project.layout.buildDirectory.file("generated/source/emoji/main/kotlin/Emojis.kt")
-                    val asFile = file.get().asFile
+                val asFile = file.get().asFile
-                    asFile.parentFile.mkdirs()
+                asFile.parentFile.mkdirs()
-                    val split = bodyAsText.replace("\r", "").split("\n");
+                val split = bodyAsText.replace("\r", "").split("\n");
 
-                    println(split.size)
+                println(split.size)
 
-                    var group: String = ""
+                var group: String = ""
-                    var subgroup: String = ""
+                var subgroup: String = ""
 
-                    data class Emoji(val group: String, val value: String)
+                var emojiCount = 0
+                var groupCount = 0
 
-                    val enumList = mutableMapOf<String, Emoji>()
+                data class Emoji(val group: String, val value: String)
-                    //TODO グループ分けしたことで重複がなくなるはずなので修正
-                    for (s in split) {
-                        when {
-                            s.startsWith("# group:") -> {
-                                group = s.substringAfter(": ")
-                            }
 
-                            s.startsWith("# subgroup:") -> {
+                val enumList = mutableMapOf<String, Emoji>()
-                                subgroup = s.substringAfter(": ")
+                //TODO グループ分けしたことで重複がなくなるはずなので修正
-                            }
+                for (s in split) {
+                    if (emojiCount >= 99) {
+                        emojiCount = 0
+                        groupCount++
+                    }
 
-                            s.isNullOrBlank() -> {}
+                    when {
-                            s.startsWith("#") -> {}
+                        s.startsWith("# group:") -> {
-                            else -> {
+                            group = s.substringAfter(": ")
-                                val description = s.substringAfterLast("E").substringAfter(" ")
+                        }
-                                val status = s.substringAfter(";").substringBefore("#").trim()
-                                if (!description.contains("skin tone") && !status.contains("unqualified")) {
 
-                                    val code =
+                        s.startsWith("# subgroup:") -> {
-                                        s.substringBefore(";").replace(Regex(" +"), " ").trim()
+                            subgroup = s.substringAfter(": ")
-                                    val char = s.substringAfter("# ").substringBefore(" ").trim()
+                        }
-                                    enumList.put(
+
-                                        description,
+                        s.isNullOrBlank() -> {}
-                                        Emoji(
+                        s.startsWith("#") -> {}
-                                            group,
+                        else -> {
-                                            "${
+                            val description = s.substringAfterLast("E").substringAfter(" ")
-                                                (description + "_" + status).toUpperCase()
+                            val status = s.substringAfter(";").substringBefore("#").trim()
-                                                    .replace(" ", "_")
+
-                                                    .replace("-", "_")
+                            val code =
-                                                    .replace(":", "_")
+                                s.substringBefore(";").replace(Regex(" +"), " ").trim()
-                                                    .replace(",", "_")
+                            val char = s.substringAfter("# ").substringBefore(" ").trim()
-                                                    .replace(".", "_")
+
-                                                    .replace("’", "_")
+                            val statusString = when (status) {
-                                                    .replace("1ST", "FIRST")
+                                "fully-qualified" -> "Status.FULLY_QUALIFIED"
-                                                    .replace("2ND", "SECOND")
+                                "unqualified" -> "Status.UNAUALIFIED"
-                                                    .replace("3RD", "THIRD")
+                                "minimally-qualified" -> "Status.MINIMALLY_QUALIFIED"
-                                                    .replace("!", "_EXCLAMATION_MARK_")
+
-                                                    .replace("#", "SHARP")
+                                else -> {
-                                                    .replace("*", "ASTRISC")
+                                    println(status)
-                                                    .replace("0", "ZERO")
+                                    continue
-                                                    .replace("1", "ONE")
-                                                    .replace("2", "TWO")
-                                                    .replace("3", "THREE")
-                                                    .replace("4", "FOUR")
-                                                    .replace("5", "FIVE")
-                                                    .replace("6", "SIX")
-                                                    .replace("7", "SEVEN")
-                                                    .replace("8", "EIGHT")
-                                                    .replace("9", "NINE")
-                                                    .replace("“", "_")
-                                                    .replace("”", "_")
-                                                    .replace("(", "_")
-                                                    .replace(")", "_")
-                                                    .replace("&", "_AND_")
-                                                    .replace("Ã", "A")
-                                                    .replace("É", "E")
-                                                    .replace("Í", "I")
-                                                    .replace("Ñ", "N")
-                                                    .replace("Å", "A")
-                                                    .replace("Ô", "O")
-                                                    .replace("Ç", "C")
-                                                    .replace(Regex("_+"), "_")
-                                            }(\"$group\",\"$subgroup\",\"$code\",\"$char\",\"$description\")"
-                                        )
-                                    )
                                 }
                             }
+
+                            enumList.putIfAbsent(
+                                (description + "_" + status),
+                                Emoji(
+                                    group + groupCount,
+                                    "${
+                                        (description + "_" + status).toUpperCase()
+                                            .replace(" ", "_")
+                                            .replace("-", "_")
+                                            .replace(":", "_")
+                                            .replace(",", "_")
+                                            .replace(".", "_")
+                                            .replace("’", "_")
+                                            .replace("1ST", "FIRST")
+                                            .replace("2ND", "SECOND")
+                                            .replace("3RD", "THIRD")
+                                            .replace("!", "_EXCLAMATION_MARK_")
+                                            .replace("#", "SHARP")
+                                            .replace("*", "ASTRISC")
+                                            .replace("0", "ZERO")
+                                            .replace("1", "ONE")
+                                            .replace("2", "TWO")
+                                            .replace("3", "THREE")
+                                            .replace("4", "FOUR")
+                                            .replace("5", "FIVE")
+                                            .replace("6", "SIX")
+                                            .replace("7", "SEVEN")
+                                            .replace("8", "EIGHT")
+                                            .replace("9", "NINE")
+                                            .replace("“", "_")
+                                            .replace("”", "_")
+                                            .replace("(", "_")
+                                            .replace(")", "_")
+                                            .replace("&", "_AND_")
+                                            .replace("Ã", "A")
+                                            .replace("É", "E")
+                                            .replace("Í", "I")
+                                            .replace("Ñ", "N")
+                                            .replace("Å", "A")
+                                            .replace("Ô", "O")
+                                            .replace("Ç", "C")
+                                            .replace(Regex("_+"), "_")
+                                    }(\"$group\",\"$subgroup\",\"$code\",\"$char\",\"$description\",$statusString)"
+                                )
+                            )
+
+                            emojiCount++
                         }
                     }
-                    val emojis = mutableMapOf<String, MutableList<Emoji>>()
+                }
-                    enumList.values.forEach {
+                val emojis = mutableMapOf<String, MutableList<Emoji>>()
-                        emojis.getOrPut(
+                enumList.values.forEach {
-                            it.group.replace(" ", "").replace("&", "And")
+                    emojis.getOrPut(
-                        ) { mutableListOf() }.add(it)
+                        it.group.replace(" ", "").replace("&", "And")
-                    }
+                    ) { mutableListOf() }.add(it)
+                }
 
-                    val map = emojis.map {
+                val map = emojis.map {
-                        "enum class ${it.key}(override val group:String,override val subgroup:String,override val code:String,override val char:String,override val description:String):UnicodeEmoji{\n" +
+                    "enum class ${it.key}(override val group:String,override val subgroup:String,override val code:String,override val char:String,override val description:String,val status:Status):UnicodeEmoji{\n" +
-                                "${
+                            "${
-                                    it.value.map { it.value }.joinToString(
+                                it.value.map { it.value }.joinToString(
-                                        ",\n"
+                                    ",\n"
-                                    )
+                                )
-                                }}"
+                            }}"
-                    }
+                }
 
-                    val joinToString = map.joinToString("\n")
+                val joinToString = map.joinToString("\n")
-                    //language=kotlin
+                //language=kotlin
-                    val trimIndent =
+                val trimIndent =
-                        """@Suppress("unused")
+                    """@Suppress("unused")
 interface UnicodeEmoji {
     val group: String
     val subgroup: String
@@ -131,6 +163,12 @@ interface UnicodeEmoji {
     val description: String
 }
 
+enum class Status{
+FULLY_QUALIFIED,
+UNAUALIFIED,
+MINIMALLY_QUALIFIED
+}
+
 object Emojis {
 val allEmojis:MutableList<UnicodeEmoji> = mutableListOf<UnicodeEmoji>()
 init {
@@ -138,9 +176,9 @@ init {
 }
 ${joinToString}
 }"""
-                    asFile.writeText(trimIndent)
+                asFile.writeText(trimIndent)
+
 
-                }
             })
     }
 }

src/androidMain/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="dev.usbharu.library"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="dev.usbharu.emoji"/>