From 8b0d56e0cc575612f66ede4c4e1c49aab6a6a03c Mon Sep 17 00:00:00 2001
From: linsui <2873532-linsui@users.noreply.gitlab.com>
Date: Mon, 12 Jun 2023 14:22:01 +0000
Subject: [PATCH] Fcitx5 0.0.6

---
 .../org.fcitx.fcitx5.android.plugin.anthy.yml | 200 ++++++++++++++++++
 metadata/org.fcitx.fcitx5.android.yml         | 168 +++++++++++++--
 2 files changed, 350 insertions(+), 18 deletions(-)
 create mode 100644 metadata/org.fcitx.fcitx5.android.plugin.anthy.yml

diff --git a/metadata/org.fcitx.fcitx5.android.plugin.anthy.yml b/metadata/org.fcitx.fcitx5.android.plugin.anthy.yml
new file mode 100644
index 0000000000..d64684420f
--- /dev/null
+++ b/metadata/org.fcitx.fcitx5.android.plugin.anthy.yml
@@ -0,0 +1,200 @@
+Categories:
+  - System
+License: LGPL-2.1-only
+AuthorName: Fcitx5 for Android Contributors
+WebSite: https://fcitx5-android.github.io
+SourceCode: https://github.com/fcitx5-android/fcitx5-android
+IssueTracker: https://github.com/fcitx5-android/fcitx5-android/issues
+Translation: https://explore.transifex.com/fcitx/fcitx5-android
+
+AutoName: Fcitx5 for Android (Anthy Plugin)
+
+RepoType: git
+Repo: https://github.com/fcitx5-android/fcitx5-android
+
+Builds:
+  - versionName: 0.0.6-0-g024241cf
+    versionCode: 41
+    commit: 024241cff19ca4bd79a3a6df511053c4c3aada29
+    subdir: plugin/anthy
+    submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -y g++ make cmake xz-utils bzip2 extra-cmake-modules gettext
+        ghc libghc-shake-dev opencc libghc-js-flot-data haskell-js-dgtable-utils automake
+        libtool openjdk-17-jdk-headless
+      - update-java-alternatives -a
+      - apt-get install -y -t bullseye-backports libime-bin fcitx5-modules
+    gradle:
+      - yes
+    binary: https://github.com/fcitx5-android/fcitx5-android/releases/download/0.0.6/org.fcitx.fcitx5.android.plugin.anthy-%v-armeabi-v7a-release.apk
+    srclibs:
+      - fcitx5-android-prebuilder@915bcacb0f21b842e1f888ade729038666987cdc
+    rm:
+      - lib/fcitx5/src/main/cpp/prebuilt
+    prebuild:
+      - sdkmanager 'cmake;3.22.1' 'ndk;25.0.8775105'
+      - buildTimestamp=$(curl -L https://github.com/fcitx5-android/fcitx5-android/releases/download/0.0.6/build-metadata.plugin.anthy.json
+        | sed -n -E 's/.*timestamp.*"(.*)"$/\1/p')
+      - echo -e "\nbuildTimestamp=$buildTimestamp" >> ../../gradle.properties
+      - sed -i -e '/ImportQualifiedPost/d' -e 's/import \(.*\) qualified as/import
+        qualified \1 as/g' $$fcitx5-android-prebuilder$$/Main.hs
+    scanignore:
+      - lib/fcitx5/src/main/cpp/fcitx5/src/modules/unicode/charselectdata
+    scandelete:
+      - build-logic/convention/build
+    build:
+      - pushd $$fcitx5-android-prebuilder$$
+      - mkdir build
+      - cd build
+      - ABI=armeabi-v7a ANDROID_NDK_ROOT=$$NDK$$/../25.0.8775105 CMAKE_VERSION=3.22.1
+        ANDROID_PLATFORM=23 COMP_SPELL_DICT=/usr/lib/x86_64-linux-gnu/fcitx5/libexec/comp-spell-dict
+        runghc ../Main.hs -j everything
+      - popd
+      - mv $$fcitx5-android-prebuilder$$/build ../../lib/fcitx5/src/main/cpp/prebuilt
+    ndk: 25.2.9519653
+    gradleprops:
+      - buildABI=armeabi-v7a
+
+  - versionName: 0.0.6-0-g024241cf
+    versionCode: 42
+    commit: 024241cff19ca4bd79a3a6df511053c4c3aada29
+    subdir: plugin/anthy
+    submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -y g++ make cmake xz-utils bzip2 extra-cmake-modules gettext
+        ghc libghc-shake-dev opencc libghc-js-flot-data haskell-js-dgtable-utils automake
+        libtool openjdk-17-jdk-headless
+      - update-java-alternatives -a
+      - apt-get install -y -t bullseye-backports libime-bin fcitx5-modules
+    gradle:
+      - yes
+    binary: https://github.com/fcitx5-android/fcitx5-android/releases/download/0.0.6/org.fcitx.fcitx5.android.plugin.anthy-%v-arm64-v8a-release.apk
+    srclibs:
+      - fcitx5-android-prebuilder@915bcacb0f21b842e1f888ade729038666987cdc
+    rm:
+      - lib/fcitx5/src/main/cpp/prebuilt
+    prebuild:
+      - sdkmanager 'cmake;3.22.1' 'ndk;25.0.8775105'
+      - buildTimestamp=$(curl -L https://github.com/fcitx5-android/fcitx5-android/releases/download/0.0.6/build-metadata.plugin.anthy.json
+        | sed -n -E 's/.*timestamp.*"(.*)"$/\1/p')
+      - echo -e "\nbuildTimestamp=$buildTimestamp" >> ../../gradle.properties
+      - sed -i -e '/ImportQualifiedPost/d' -e 's/import \(.*\) qualified as/import
+        qualified \1 as/g' $$fcitx5-android-prebuilder$$/Main.hs
+    scanignore:
+      - lib/fcitx5/src/main/cpp/fcitx5/src/modules/unicode/charselectdata
+    scandelete:
+      - build-logic/convention/build
+    build:
+      - pushd $$fcitx5-android-prebuilder$$
+      - mkdir build
+      - cd build
+      - ABI=arm64-v8a ANDROID_NDK_ROOT=$$NDK$$/../25.0.8775105 CMAKE_VERSION=3.22.1
+        ANDROID_PLATFORM=23 COMP_SPELL_DICT=/usr/lib/x86_64-linux-gnu/fcitx5/libexec/comp-spell-dict
+        runghc ../Main.hs -j everything
+      - popd
+      - mv $$fcitx5-android-prebuilder$$/build ../../lib/fcitx5/src/main/cpp/prebuilt
+    ndk: 25.2.9519653
+    gradleprops:
+      - buildABI=arm64-v8a
+
+  - versionName: 0.0.6-0-g024241cf
+    versionCode: 43
+    commit: 024241cff19ca4bd79a3a6df511053c4c3aada29
+    subdir: plugin/anthy
+    submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -y g++ make cmake xz-utils bzip2 extra-cmake-modules gettext
+        ghc libghc-shake-dev opencc libghc-js-flot-data haskell-js-dgtable-utils automake
+        libtool openjdk-17-jdk-headless
+      - update-java-alternatives -a
+      - apt-get install -y -t bullseye-backports libime-bin fcitx5-modules
+    gradle:
+      - yes
+    binary: https://github.com/fcitx5-android/fcitx5-android/releases/download/0.0.6/org.fcitx.fcitx5.android.plugin.anthy-%v-x86-release.apk
+    srclibs:
+      - fcitx5-android-prebuilder@915bcacb0f21b842e1f888ade729038666987cdc
+    rm:
+      - lib/fcitx5/src/main/cpp/prebuilt
+    prebuild:
+      - sdkmanager 'cmake;3.22.1' 'ndk;25.0.8775105'
+      - buildTimestamp=$(curl -L https://github.com/fcitx5-android/fcitx5-android/releases/download/0.0.6/build-metadata.plugin.anthy.json
+        | sed -n -E 's/.*timestamp.*"(.*)"$/\1/p')
+      - echo -e "\nbuildTimestamp=$buildTimestamp" >> ../../gradle.properties
+      - sed -i -e '/ImportQualifiedPost/d' -e 's/import \(.*\) qualified as/import
+        qualified \1 as/g' $$fcitx5-android-prebuilder$$/Main.hs
+    scanignore:
+      - lib/fcitx5/src/main/cpp/fcitx5/src/modules/unicode/charselectdata
+    scandelete:
+      - build-logic/convention/build
+    build:
+      - pushd $$fcitx5-android-prebuilder$$
+      - mkdir build
+      - cd build
+      - ABI=x86 ANDROID_NDK_ROOT=$$NDK$$/../25.0.8775105 CMAKE_VERSION=3.22.1 ANDROID_PLATFORM=23
+        COMP_SPELL_DICT=/usr/lib/x86_64-linux-gnu/fcitx5/libexec/comp-spell-dict runghc
+        ../Main.hs -j everything
+      - popd
+      - mv $$fcitx5-android-prebuilder$$/build ../../lib/fcitx5/src/main/cpp/prebuilt
+    ndk: 25.2.9519653
+    gradleprops:
+      - buildABI=x86
+
+  - versionName: 0.0.6-0-g024241cf
+    versionCode: 44
+    commit: 024241cff19ca4bd79a3a6df511053c4c3aada29
+    subdir: plugin/anthy
+    submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -y g++ make cmake xz-utils bzip2 extra-cmake-modules gettext
+        ghc libghc-shake-dev opencc libghc-js-flot-data haskell-js-dgtable-utils automake
+        libtool openjdk-17-jdk-headless
+      - update-java-alternatives -a
+      - apt-get install -y -t bullseye-backports libime-bin fcitx5-modules
+    gradle:
+      - yes
+    binary: https://github.com/fcitx5-android/fcitx5-android/releases/download/0.0.6/org.fcitx.fcitx5.android.plugin.anthy-%v-x86_64-release.apk
+    srclibs:
+      - fcitx5-android-prebuilder@915bcacb0f21b842e1f888ade729038666987cdc
+    rm:
+      - lib/fcitx5/src/main/cpp/prebuilt
+    prebuild:
+      - sdkmanager 'cmake;3.22.1' 'ndk;25.0.8775105'
+      - buildTimestamp=$(curl -L https://github.com/fcitx5-android/fcitx5-android/releases/download/0.0.6/build-metadata.plugin.anthy.json
+        | sed -n -E 's/.*timestamp.*"(.*)"$/\1/p')
+      - echo -e "\nbuildTimestamp=$buildTimestamp" >> ../../gradle.properties
+      - sed -i -e '/ImportQualifiedPost/d' -e 's/import \(.*\) qualified as/import
+        qualified \1 as/g' $$fcitx5-android-prebuilder$$/Main.hs
+    scanignore:
+      - lib/fcitx5/src/main/cpp/fcitx5/src/modules/unicode/charselectdata
+    scandelete:
+      - build-logic/convention/build
+    build:
+      - pushd $$fcitx5-android-prebuilder$$
+      - mkdir build
+      - cd build
+      - ABI=x86_64 ANDROID_NDK_ROOT=$$NDK$$/../25.0.8775105 CMAKE_VERSION=3.22.1 ANDROID_PLATFORM=23
+        COMP_SPELL_DICT=/usr/lib/x86_64-linux-gnu/fcitx5/libexec/comp-spell-dict runghc
+        ../Main.hs -j everything
+      - popd
+      - mv $$fcitx5-android-prebuilder$$/build ../../lib/fcitx5/src/main/cpp/prebuilt
+    ndk: 25.2.9519653
+    gradleprops:
+      - buildABI=x86_64
+
+AllowedAPKSigningKeys: e4db1e9edff13629d07de4bbf8165fe9bd8557ab55092672da8e40dbe484ecd7
+
+AutoUpdateMode: None
+UpdateCheckMode: HTTP
+VercodeOperation:
+  - 10 * %c + 1
+  - 10 * %c + 2
+  - 10 * %c + 3
+  - 10 * %c + 4
+UpdateCheckData: https://raw.githubusercontent.com/fcitx5-android/fcitx5-android/master/build-logic/convention/src/main/kotlin/Versions.kt|baseVersionCode
+    = (\d+)|https://github.com/fcitx5-android/fcitx5-android/releases/latest/download/build-metadata.plugin.anthy.json|"versionName":\s"(.*)"
+CurrentVersion: 0.0.6-0-g024241cf
+CurrentVersionCode: 44
diff --git a/metadata/org.fcitx.fcitx5.android.yml b/metadata/org.fcitx.fcitx5.android.yml
index 66c37e46ee..1d21ef1de7 100644
--- a/metadata/org.fcitx.fcitx5.android.yml
+++ b/metadata/org.fcitx.fcitx5.android.yml
@@ -286,43 +286,175 @@ Builds:
     gradleprops:
       - buildABI=x86
 
-  - versionName: 0.0.5-0-g679ab7db
-    versionCode: 34
-    disable: not reproducible
-    commit: 679ab7dbcf3ea21af1ba4785acbb591dedb5b9de
+  - versionName: 0.0.6-0-g024241cf
+    versionCode: 41
+    commit: 024241cff19ca4bd79a3a6df511053c4c3aada29
     subdir: app
     submodules: true
     sudo:
       - apt-get update
       - apt-get install -y g++ make cmake xz-utils bzip2 extra-cmake-modules gettext
-        ghc libghc-shake-dev opencc libghc-js-flot-data haskell-js-dgtable-utils
+        ghc libghc-shake-dev opencc libghc-js-flot-data haskell-js-dgtable-utils automake
+        libtool openjdk-17-jdk-headless
+      - update-java-alternatives -a
       - apt-get install -y -t bullseye-backports libime-bin fcitx5-modules
     gradle:
       - yes
-    binary: https://github.com/fcitx5-android/fcitx5-android/releases/download/0.0.5/org.fcitx.fcitx5.android-%v-x86_64-release.apk
+    binary: https://github.com/fcitx5-android/fcitx5-android/releases/download/0.0.6/org.fcitx.fcitx5.android-%v-armeabi-v7a-release.apk
     srclibs:
-      - fcitx5-android-prebuilder@e919646e5561aaaad34f87664819dfb1f9a0bc52
+      - fcitx5-android-prebuilder@915bcacb0f21b842e1f888ade729038666987cdc
     rm:
-      - app/src/main/cpp/prebuilt
+      - lib/fcitx5/src/main/cpp/prebuilt
     prebuild:
-      - sdkmanager 'cmake;3.22.1'
-      - buildTimestamp=$(curl -L https://github.com/fcitx5-android/fcitx5-android/releases/download/$(echo
-        $$VERSION$$ | sed 's/-.*//')/build-metadata.json | sed -n -E 's/.*timestamp.*"(.*)"$/\1/p')
+      - sdkmanager 'cmake;3.22.1' 'ndk;25.0.8775105'
+      - buildTimestamp=$(curl -L https://github.com/fcitx5-android/fcitx5-android/releases/download/0.0.6/build-metadata.json
+        | sed -n -E 's/.*timestamp.*"(.*)"$/\1/p')
       - echo -e "\nbuildTimestamp=$buildTimestamp" >> ../gradle.properties
       - sed -i -e '/ImportQualifiedPost/d' -e 's/import \(.*\) qualified as/import
         qualified \1 as/g' $$fcitx5-android-prebuilder$$/Main.hs
     scanignore:
-      - app/src/main/cpp/fcitx5/src/modules/unicode/charselectdata
+      - lib/fcitx5/src/main/cpp/fcitx5/src/modules/unicode/charselectdata
+    scandelete:
+      - build-logic/convention/build
     build:
       - pushd $$fcitx5-android-prebuilder$$
       - mkdir build
       - cd build
-      - ABI=x86_64 ANDROID_NDK_ROOT=$$NDK$$ CMAKE_VERSION=3.22.1 ANDROID_PLATFORM=23
+      - ABI=armeabi-v7a ANDROID_NDK_ROOT=$$NDK$$/../25.0.8775105 CMAKE_VERSION=3.22.1
+        ANDROID_PLATFORM=23 COMP_SPELL_DICT=/usr/lib/x86_64-linux-gnu/fcitx5/libexec/comp-spell-dict
+        runghc ../Main.hs -j everything
+      - popd
+      - mv $$fcitx5-android-prebuilder$$/build ../lib/fcitx5/src/main/cpp/prebuilt
+    ndk: 25.2.9519653
+    gradleprops:
+      - buildABI=armeabi-v7a
+
+  - versionName: 0.0.6-0-g024241cf
+    versionCode: 42
+    commit: 024241cff19ca4bd79a3a6df511053c4c3aada29
+    subdir: app
+    submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -y g++ make cmake xz-utils bzip2 extra-cmake-modules gettext
+        ghc libghc-shake-dev opencc libghc-js-flot-data haskell-js-dgtable-utils automake
+        libtool openjdk-17-jdk-headless
+      - update-java-alternatives -a
+      - apt-get install -y -t bullseye-backports libime-bin fcitx5-modules
+    gradle:
+      - yes
+    binary: https://github.com/fcitx5-android/fcitx5-android/releases/download/0.0.6/org.fcitx.fcitx5.android-%v-arm64-v8a-release.apk
+    srclibs:
+      - fcitx5-android-prebuilder@915bcacb0f21b842e1f888ade729038666987cdc
+    rm:
+      - lib/fcitx5/src/main/cpp/prebuilt
+    prebuild:
+      - sdkmanager 'cmake;3.22.1' 'ndk;25.0.8775105'
+      - buildTimestamp=$(curl -L https://github.com/fcitx5-android/fcitx5-android/releases/download/0.0.6/build-metadata.json
+        | sed -n -E 's/.*timestamp.*"(.*)"$/\1/p')
+      - echo -e "\nbuildTimestamp=$buildTimestamp" >> ../gradle.properties
+      - sed -i -e '/ImportQualifiedPost/d' -e 's/import \(.*\) qualified as/import
+        qualified \1 as/g' $$fcitx5-android-prebuilder$$/Main.hs
+    scanignore:
+      - lib/fcitx5/src/main/cpp/fcitx5/src/modules/unicode/charselectdata
+    scandelete:
+      - build-logic/convention/build
+    build:
+      - pushd $$fcitx5-android-prebuilder$$
+      - mkdir build
+      - cd build
+      - ABI=arm64-v8a ANDROID_NDK_ROOT=$$NDK$$/../25.0.8775105 CMAKE_VERSION=3.22.1
+        ANDROID_PLATFORM=23 COMP_SPELL_DICT=/usr/lib/x86_64-linux-gnu/fcitx5/libexec/comp-spell-dict
+        runghc ../Main.hs -j everything
+      - popd
+      - mv $$fcitx5-android-prebuilder$$/build ../lib/fcitx5/src/main/cpp/prebuilt
+    ndk: 25.2.9519653
+    gradleprops:
+      - buildABI=arm64-v8a
+
+  - versionName: 0.0.6-0-g024241cf
+    versionCode: 43
+    commit: 024241cff19ca4bd79a3a6df511053c4c3aada29
+    subdir: app
+    submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -y g++ make cmake xz-utils bzip2 extra-cmake-modules gettext
+        ghc libghc-shake-dev opencc libghc-js-flot-data haskell-js-dgtable-utils automake
+        libtool openjdk-17-jdk-headless
+      - update-java-alternatives -a
+      - apt-get install -y -t bullseye-backports libime-bin fcitx5-modules
+    gradle:
+      - yes
+    binary: https://github.com/fcitx5-android/fcitx5-android/releases/download/0.0.6/org.fcitx.fcitx5.android-%v-x86-release.apk
+    srclibs:
+      - fcitx5-android-prebuilder@915bcacb0f21b842e1f888ade729038666987cdc
+    rm:
+      - lib/fcitx5/src/main/cpp/prebuilt
+    prebuild:
+      - sdkmanager 'cmake;3.22.1' 'ndk;25.0.8775105'
+      - buildTimestamp=$(curl -L https://github.com/fcitx5-android/fcitx5-android/releases/download/0.0.6/build-metadata.json
+        | sed -n -E 's/.*timestamp.*"(.*)"$/\1/p')
+      - echo -e "\nbuildTimestamp=$buildTimestamp" >> ../gradle.properties
+      - sed -i -e '/ImportQualifiedPost/d' -e 's/import \(.*\) qualified as/import
+        qualified \1 as/g' $$fcitx5-android-prebuilder$$/Main.hs
+    scanignore:
+      - lib/fcitx5/src/main/cpp/fcitx5/src/modules/unicode/charselectdata
+    scandelete:
+      - build-logic/convention/build
+    build:
+      - pushd $$fcitx5-android-prebuilder$$
+      - mkdir build
+      - cd build
+      - ABI=x86 ANDROID_NDK_ROOT=$$NDK$$/../25.0.8775105 CMAKE_VERSION=3.22.1 ANDROID_PLATFORM=23
         COMP_SPELL_DICT=/usr/lib/x86_64-linux-gnu/fcitx5/libexec/comp-spell-dict runghc
         ../Main.hs -j everything
       - popd
-      - mv $$fcitx5-android-prebuilder$$/build src/main/cpp/prebuilt
-    ndk: r25
+      - mv $$fcitx5-android-prebuilder$$/build ../lib/fcitx5/src/main/cpp/prebuilt
+    ndk: 25.2.9519653
+    gradleprops:
+      - buildABI=x86
+
+  - versionName: 0.0.6-0-g024241cf
+    versionCode: 44
+    commit: 024241cff19ca4bd79a3a6df511053c4c3aada29
+    subdir: app
+    submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -y g++ make cmake xz-utils bzip2 extra-cmake-modules gettext
+        ghc libghc-shake-dev opencc libghc-js-flot-data haskell-js-dgtable-utils automake
+        libtool openjdk-17-jdk-headless
+      - update-java-alternatives -a
+      - apt-get install -y -t bullseye-backports libime-bin fcitx5-modules
+    gradle:
+      - yes
+    binary: https://github.com/fcitx5-android/fcitx5-android/releases/download/0.0.6/org.fcitx.fcitx5.android-%v-x86_64-release.apk
+    srclibs:
+      - fcitx5-android-prebuilder@915bcacb0f21b842e1f888ade729038666987cdc
+    rm:
+      - lib/fcitx5/src/main/cpp/prebuilt
+    prebuild:
+      - sdkmanager 'cmake;3.22.1' 'ndk;25.0.8775105'
+      - buildTimestamp=$(curl -L https://github.com/fcitx5-android/fcitx5-android/releases/download/0.0.6/build-metadata.json
+        | sed -n -E 's/.*timestamp.*"(.*)"$/\1/p')
+      - echo -e "\nbuildTimestamp=$buildTimestamp" >> ../gradle.properties
+      - sed -i -e '/ImportQualifiedPost/d' -e 's/import \(.*\) qualified as/import
+        qualified \1 as/g' $$fcitx5-android-prebuilder$$/Main.hs
+    scanignore:
+      - lib/fcitx5/src/main/cpp/fcitx5/src/modules/unicode/charselectdata
+    scandelete:
+      - build-logic/convention/build
+    build:
+      - pushd $$fcitx5-android-prebuilder$$
+      - mkdir build
+      - cd build
+      - ABI=x86_64 ANDROID_NDK_ROOT=$$NDK$$/../25.0.8775105 CMAKE_VERSION=3.22.1 ANDROID_PLATFORM=23
+        COMP_SPELL_DICT=/usr/lib/x86_64-linux-gnu/fcitx5/libexec/comp-spell-dict runghc
+        ../Main.hs -j everything
+      - popd
+      - mv $$fcitx5-android-prebuilder$$/build ../lib/fcitx5/src/main/cpp/prebuilt
+    ndk: 25.2.9519653
     gradleprops:
       - buildABI=x86_64
 
@@ -335,7 +467,7 @@ VercodeOperation:
   - 10 * %c + 2
   - 10 * %c + 3
   - 10 * %c + 4
-UpdateCheckData: https://raw.githubusercontent.com/fcitx5-android/fcitx5-android/master/app/build.gradle.kts|baseVersionCode
+UpdateCheckData: https://raw.githubusercontent.com/fcitx5-android/fcitx5-android/master/build-logic/convention/src/main/kotlin/Versions.kt|baseVersionCode
     = (\d+)|https://github.com/fcitx5-android/fcitx5-android/releases/latest/download/build-metadata.json|"versionName":\s"(.*)"
-CurrentVersion: 0.0.5-0-g679ab7db
-CurrentVersionCode: 34
+CurrentVersion: 0.0.6-0-g024241cf
+CurrentVersionCode: 44