Android: restructure project

.gitignore

@@ -25,7 +25,8 @@ android/icons/*.png
 
 libttsespeak.so
 
-android/res/raw/espeakdata.zip
+android/app/src/main/res/raw/espeakdata.zip
+android/app/src/main/res/raw/espeakdata_version
 android/res/raw/espeakdata_version
 
 local.properties

android/app/build.gradle

@@ -0,0 +1,90 @@
+import org.gradle.crypto.checksum.Checksum
+
+plugins {
+    id 'com.android.application'
+    id 'org.gradle.crypto.checksum' version '1.4.0'
+}
+
+android {
+    compileSdk 33
+    buildToolsVersion "33.0.2"
+    ndkVersion "25.2.9519653"
+    namespace "com.reecedunn.espeak"
+
+    defaultConfig {
+        applicationId "com.reecedunn.espeak"
+        minSdk 19
+        targetSdk 33
+        versionCode 22
+        versionName "1.52-dev"
+
+        testApplicationId "com.reecedunn.espeak.test"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        externalNativeBuild {
+            cmake {
+                arguments "-DUSE_ASYNC:BOOL=OFF", "-DUSE_MBROLA:BOOL=OFF"
+                targets "ttsespeak", "espeak-data"
+            }
+        }
+    }
+
+    externalNativeBuild {
+        cmake {
+            path file('src/main/cpp/CMakeLists.txt')
+            version "3.22.1"
+        }
+    }
+
+    lint {
+        abortOnError false
+    }
+}
+
+dependencies {
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'com.google.android:android-test:4.1.1.4'
+    androidTestImplementation 'org.hamcrest:hamcrest-all:1.3'
+}
+
+tasks.register('checkData') {
+    doFirst {
+        assert file("../../espeak-ng-data/en_dict").exists()
+        assert file("../../espeak-ng-data/intonations").exists()
+        assert file("../../espeak-ng-data/phondata").exists()
+        assert file("../../espeak-ng-data/phondata-manifest").exists()
+        assert file("../../espeak-ng-data/phonindex").exists()
+        assert file("../../espeak-ng-data/phontab").exists()
+    }
+}
+
+tasks.register('createDataArchive', Zip) {
+    preserveFileTimestamps = false
+    reproducibleFileOrder = true
+    archiveFileName = "espeakdata.zip"
+    destinationDirectory = file("src/main/res/raw")
+
+    from("build/generated/espeak-ng-data/") {
+        into "espeak-ng-data"
+    }
+}
+
+tasks.register('createDataHash', Checksum) {
+    dependsOn tasks.createDataArchive
+    checksumAlgorithm.set(Checksum.Algorithm.SHA256)
+    inputFiles.setFrom(file("./src/main/res/raw/espeakdata.zip"))
+    outputDirectory.set(layout.buildDirectory.dir('intermediates/datahash'))
+}
+
+tasks.register('createDataVersion', Copy) {
+    dependsOn tasks.createDataHash
+    from layout.buildDirectory.file('intermediates/datahash/espeakdata.zip.sha256')
+    rename { return 'espeakdata_version' }
+    into file("./src/main/res/raw")
+}
+
+project.afterEvaluate {
+    tasks.checkData.dependsOn(externalNativeBuildDebug)
+    tasks.createDataArchive.dependsOn(externalNativeBuildDebug)
+    javaPreCompileDebug.dependsOn(tasks.createDataVersion)
+    javaPreCompileRelease.dependsOn(tasks.createDataVersion)
+}

android/AndroidManifest.xml → android/app/src/main/AndroidManifest.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="20"
-    android:versionName="1.52-dev" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-feature
         android:name="android.hardware.touchscreen"

android/jni/CMakeLists.txt → android/app/src/main/cpp/CMakeLists.txt

@@ -2,13 +2,12 @@ cmake_minimum_required(VERSION 3.8)
 
 project(espeak-android)
 
-add_subdirectory(../../ espeakng)
-
+add_subdirectory(../../../../../ espeakng)
 add_custom_target(
         espeak-data
-        COMMAND ${CMAKE_COMMAND} -B${CMAKE_CURRENT_BINARY_DIR}/../espeak-data ${CMAKE_CURRENT_SOURCE_DIR}/../../
+        COMMAND ${CMAKE_COMMAND} -B${CMAKE_CURRENT_BINARY_DIR}/../espeak-data ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../
         COMMAND ${CMAKE_COMMAND} --build ${CMAKE_CURRENT_BINARY_DIR}/../espeak-data --target data
-        COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/../espeak-data/espeak-ng-data ${CMAKE_SOURCE_DIR}/../build/generated/espeak-ng-data
+        COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/../espeak-data/espeak-ng-data ${CMAKE_SOURCE_DIR}/../../../build/generated/espeak-ng-data
 )
 
 message(STATUS "Data: ${CMAKE_CURRENT_SOURCE_DIR}")

android/build.gradle

@@ -1,113 +1,4 @@
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
-    }
-}
 plugins {
-    id 'org.gradle.crypto.checksum' version '1.4.0'
-}
-
-import org.gradle.crypto.checksum.Checksum
-apply plugin: 'com.android.application'
-
-repositories {
-    google()
-    mavenCentral()
-}
-
-
-dependencies {
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'org.hamcrest:hamcrest-all:1.3'
-}
-
-android {
-    compileSdk 33
-    buildToolsVersion "33.0.2"
-    ndkVersion "25.2.9519653"
-    namespace "com.reecedunn.espeak"
-
-    defaultConfig {
-        minSdk 19
-        targetSdk 33
-        versionCode 22
-        versionName "1.52-dev"
-
-        externalNativeBuild {
-            cmake {
-                arguments "-DUSE_ASYNC:BOOL=OFF", "-DUSE_MBROLA:BOOL=OFF"
-                targets "ttsespeak", "espeak-data"
-            }
-        }
-    }
-
-    externalNativeBuild {
-        cmake {
-            path "jni/CMakeLists.txt"
-            version "3.22.1"
-        }
-    }
-
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            res.srcDirs = ['res']
-        }
-        androidTest.setRoot('eSpeakTests')
-        androidTest {
-            java.srcDirs = ['eSpeakTests/src']
-        }
-    }
-
-    lint {
-        abortOnError false
-    }
-}
-
-tasks.register('checkData') {
-    doFirst {
-        assert file("../espeak-ng-data/en_dict").exists()
-        assert file("../espeak-ng-data/intonations").exists()
-        assert file("../espeak-ng-data/phondata").exists()
-        assert file("../espeak-ng-data/phondata-manifest").exists()
-        assert file("../espeak-ng-data/phonindex").exists()
-        assert file("../espeak-ng-data/phontab").exists()
-    }
-}
-
-tasks.register('createDataArchive', Zip) {
-    preserveFileTimestamps = false
-    reproducibleFileOrder = true
-    archiveFileName = "espeakdata.zip"
-    destinationDirectory = file("res/raw")
-
-    from("build/generated/espeak-ng-data/") {
-        into "espeak-ng-data"
-    }
-}
-
-tasks.register('createDataHash', Checksum) {
-    dependsOn tasks.createDataArchive
-    checksumAlgorithm.set(Checksum.Algorithm.SHA256)
-    inputFiles.setFrom(file("./res/raw/espeakdata.zip"))
-    outputDirectory.set(layout.buildDirectory.dir('intermediates/datahash'))
-}
-
-tasks.register('createDataVersion', Copy) {
-    dependsOn tasks.createDataHash
-    from layout.buildDirectory.file('intermediates/datahash/espeakdata.zip.sha256')
-    rename { return 'espeakdata_version' }
-    into file("./res/raw")
-}
-
-project.afterEvaluate {
-    tasks.checkData.dependsOn(externalNativeBuildDebug)
-    tasks.createDataArchive.dependsOn(externalNativeBuildDebug)
-    javaPreCompileDebug.dependsOn(tasks.createDataVersion)
-    javaPreCompileRelease.dependsOn(tasks.createDataVersion)
+    id 'com.android.application' version '7.4.2' apply false
+    id 'com.android.library' version '7.4.2' apply false
 }

android/gradle.properties

@@ -0,0 +1,21 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+# android.useAndroidX=true
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=true

android/settings.gradle

@@ -1 +1,16 @@
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
 rootProject.name = 'espeak'
+include ':app'