Migrate to single module

Signed-off-by: Hui-Hong You <hiroshi@ghostsinthelab.org>

Author: hiroshiyui

.gitignore

@@ -13,4 +13,4 @@
 .externalNativeBuild
 .cxx
 local.properties
-/libchewing-android-module/src/main/assets/
+/app/src/main/assets/

.gitmodules

@@ -2,3 +2,7 @@
 	path = libchewing-android-module/src/main/cpp/libs/libchewing
 	url = https://github.com/hiroshiyui/libchewing.git
 	branch = android
+[submodule "app/src/main/cpp/libs/libchewing"]
+	path = app/src/main/cpp/libs/libchewing
+	url = https://github.com/hiroshiyui/libchewing.git
+	branch = android

.idea/gradle.xml

@@ -17,39 +17,104 @@
  */
 
 plugins {
-    alias(libs.plugins.android.application)
+    alias(libs.plugins.android.library)
     alias(libs.plugins.jetbrains.kotlin.android)
 }
 
+val versionName: String = "0.8.1"
+
 android {
     namespace = "com.miyabi_hiroshi.app.libchewing_android_app_module"
     compileSdk = 34
 
     defaultConfig {
-        applicationId = "com.miyabi_hiroshi.app.libchewing_android_app_module"
         minSdk = 23
-        targetSdk = 34
-        versionCode = 1
-        versionName = "1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+        externalNativeBuild {
+            cmake {
+                cFlags("-Wno-unused-function", "-Wno-unused-but-set-variable")
+                cppFlags += ""
+                targets("libchewing", "libchewing_android_module")
+            }
+        }
+
+        setProperty("archivesBaseName", "${project.name}_${versionName}")
     }
 
     buildTypes {
         release {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
         }
+        debug {
+            isMinifyEnabled = false
+        }
+    }
+    externalNativeBuild {
+        cmake {
+            path("src/main/cpp/CMakeLists.txt")
+            version = "3.24.0+"
+            path = file("src/main/cpp/CMakeLists.txt")
+        }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
+    }
+    buildToolsVersion = "34.0.0"
+    ndkVersion = "26.1.10909125"
+
+    val chewingLibraryPath: String = "${rootDir}/app/src/main/cpp/libs/libchewing"
+
+    tasks.register<Exec>("prepareChewing") {
+        workingDir(chewingLibraryPath)
+        commandLine("cmake", "--preset", "c99-release", "-DBUILD_SHARED_LIBS=OFF", ".")
+    }
+
+    val chewingDataFiles =
+        listOf<String>("dictionary.dat", "index_tree.dat", "pinyin.tab", "swkb.dat", "symbols.dat")
+
+    tasks.register<Exec>("buildChewingData") {
+        dependsOn("prepareChewing")
+        workingDir("$chewingLibraryPath/build")
+        commandLine("make", "data", "all_static_data")
+    }
+
+    tasks.register<Copy>("copyChewingDataFiles") {
+        dependsOn("buildChewingData")
+        for (chewingDataFile in chewingDataFiles) {
+            from("$chewingLibraryPath/build/data/$chewingDataFile")
+            into("$rootDir/app/src/main/assets")
+        }
+    }
+
+    tasks.preBuild {
+        dependsOn("copyChewingDataFiles")
+    }
+
+    tasks.register<Delete>("cleanChewingDataFiles") {
+        for (chewingDataFile in chewingDataFiles) {
+            file("$rootDir/app/src/main/assets/$chewingDataFile").delete()
+        }
+    }
+
+    tasks.register<Exec>("execMakeClean") {
+        onlyIf { file("$chewingLibraryPath/build/Makefile").exists() }
+        workingDir("$chewingLibraryPath/build")
+        commandLine("make", "clean")
+        isIgnoreExitValue = true
+    }
+
+    tasks.clean {
+        dependsOn("cleanChewingDataFiles", "execMakeClean")
     }
 }
 

.idea/vcs.xml

@@ -34,7 +34,7 @@ add_subdirectory(${CMAKE_SOURCE_DIR}/libs/libchewing EXCLUDE_FROM_ALL)
 # used in the AndroidManifest.xml file.
 add_library(${CMAKE_PROJECT_NAME} SHARED
         # List C/C++ source files with relative paths to this CMakeLists.txt.
-        libchewing_android_module.cpp)
+        app.cpp)
 
 # Specifies libraries CMake should link to your target library. You
 # can link libraries from various origins, such as libraries defined in this

app/build.gradle.kts

@@ -9,8 +9,6 @@
     Chewing JNI functions
 */
 
-
-
 /* chewing_new2() */
 extern "C" JNIEXPORT jlong JNICALL
 Java_com_miyabi_1hiroshi_app_libchewing_1android_1module_Chewing_chewingNew(