Restructing external packs from LanguagePack

This is to support the fix for themes

17 files changed, 31 insertions, 10 deletions

diff --git a/app/build.gradle b/app/build.gradle
index ea8069d3b..391644dd0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -109,6 +109,8 @@ if (playStoreWhatsNewFile.text.length() > 500) {
 }
 
 dependencies {
+    implementation project(path: ':external:api')
+    implementation project(path: ':external:packs')
     implementation project(':base')
     implementation project(':base-rx')
     implementation project(':nextword')
@@ -119,7 +121,6 @@ dependencies {
     implementation project(':overlay')
     implementation project(':pixel')
 
-    implementation "com.anysoftkeyboard.api:api:$AnySoftKeyboardApiVersion"
     implementation "com.android.support:support-fragment:$supportLibVersion"
     implementation "com.android.support:appcompat-v7:$supportLibVersion"
     implementation "com.android.support:recyclerview-v7:$supportLibVersion"
@@ -134,10 +135,6 @@ dependencies {
         exclude group: 'com.android.support'
     }
 
-    //Language-packs to be included in main AnySoftKeyboard app
-    implementation 'com.anysoftkeybaord.languages:base:4.0.368@aar'
-    implementation 'com.anysoftkeybaord.languages.english:english:4.0.368@aar'
-
     testImplementation project(path: ':base-test')
     testImplementation 'com.github.triplet.simpleprovider:simpleprovider:1.1.0'
 }
diff --git a/base/build.gradle b/base/build.gradle
index 6d4e25236..7191fd955 100644
--- a/base/build.gradle
+++ b/base/build.gradle
@@ -4,7 +4,7 @@ apply from: "${rootDir}/gradle/android_general.gradle"
 
 dependencies {
     api 'com.getkeepsafe.relinker:relinker:1.3.1'
-    api "com.anysoftkeyboard.api:api:$AnySoftKeyboardApiVersion"
+    api project(path: ':external:api')
     api "com.android.support:support-v4:$supportLibVersion"
     //so I can use SuppressFBWarnings
     api('com.google.code.findbugs:annotations:3.0.0')
diff --git a/external/api/build.gradle b/external/api/build.gradle
new file mode 100644
index 000000000..dc0068431
--- /dev/null
+++ b/external/api/build.gradle
@@ -0,0 +1,9 @@
+apply plugin: 'com.android.library'
+
+apply from: "${rootDir}/gradle/android_general.gradle"
+
+dependencies {
+    //the files in this module were copied from LanguagePack with the command:
+    // ./gradlew copyAnySoftKeyboardBaseLib -PanysoftkeyboardPath=/Users/menny/dev/menny/AnySoftKeyboard
+    api fileTree(dir: 'libs', include: ['api.aar'])
+}
diff --git a/external/api/libs/api.aar b/external/api/libs/api.aar
new file mode 100644
index 000000000..525c748b6
--- /dev/null
+++ b/external/api/libs/api.aar
diff --git a/external/api/src/main/AndroidManifest.xml b/external/api/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..b52833bd8
--- /dev/null
+++ b/external/api/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.anysoftkeyboard.external.api" />
diff --git a/external/api/src/main/res/values/strings.xml b/external/api/src/main/res/values/strings.xml
new file mode 100644
index 000000000..854200555
--- /dev/null
+++ b/external/api/src/main/res/values/strings.xml
@@ -0,0 +1,2 @@
+<resources>
+</resources>
diff --git a/external/build.gradle b/external/build.gradle
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/external/build.gradle
diff --git a/external/packs/build.gradle b/external/packs/build.gradle
new file mode 100644
index 000000000..a1fa2b2ac
--- /dev/null
+++ b/external/packs/build.gradle
@@ -0,0 +1,9 @@
+apply plugin: 'com.android.library'
+
+apply from: "${rootDir}/gradle/android_general.gradle"
+
+dependencies {
+    //the files in this module were copied from LanguagePack with the command:
+    // ./gradlew copyAnySoftKeyboardBaseLib -PanysoftkeyboardPath=/Users/menny/dev/menny/AnySoftKeyboard
+    api fileTree(dir: 'libs', include: ['*.aar'])
+}
diff --git a/external/packs/libs/base.aar b/external/packs/libs/base.aar
new file mode 100644
index 000000000..22e3bc91e
--- /dev/null
+++ b/external/packs/libs/base.aar
diff --git a/external/packs/libs/languages-english-pack.aar b/external/packs/libs/languages-english-pack.aar
new file mode 100644
index 000000000..cb3b64388
--- /dev/null
+++ b/external/packs/libs/languages-english-pack.aar
diff --git a/external/packs/src/main/AndroidManifest.xml b/external/packs/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..930e1b927
--- /dev/null
+++ b/external/packs/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.anysoftkeyboard.external.packs" />
diff --git a/external/packs/src/main/res/values/strings.xml b/external/packs/src/main/res/values/strings.xml
new file mode 100644
index 000000000..854200555
--- /dev/null
+++ b/external/packs/src/main/res/values/strings.xml
@@ -0,0 +1,2 @@
+<resources>
+</resources>
diff --git a/gradle/root_all_projects_ext.gradle b/gradle/root_all_projects_ext.gradle
index 560ac0e23..9c3e93e7b 100644
--- a/gradle/root_all_projects_ext.gradle
+++ b/gradle/root_all_projects_ext.gradle
@@ -2,7 +2,6 @@ allprojects {
     project.ext {
         androidBuildTools = '28.0.3'
         supportLibVersion = '25.4.0'
-        AnySoftKeyboardApiVersion = '1.11.12'
         robolectricVersion = '4.2'
 
         sdkTargetVersion = 28
diff --git a/jnidictionaryv1/build.gradle b/jnidictionaryv1/build.gradle
index b1ebe03ac..8b6436ce6 100644
--- a/jnidictionaryv1/build.gradle
+++ b/jnidictionaryv1/build.gradle
@@ -12,7 +12,6 @@ android {
 
 dependencies {
     implementation project(':dictionaries')
-    implementation "com.anysoftkeyboard.api:api:$AnySoftKeyboardApiVersion"
     implementation project(':base')
     implementation "com.android.support:support-annotations:$supportLibVersion"
 }
diff --git a/jnidictionaryv2/build.gradle b/jnidictionaryv2/build.gradle
index b1ebe03ac..8b6436ce6 100644
--- a/jnidictionaryv2/build.gradle
+++ b/jnidictionaryv2/build.gradle
@@ -12,7 +12,6 @@ android {
 
 dependencies {
     implementation project(':dictionaries')
-    implementation "com.anysoftkeyboard.api:api:$AnySoftKeyboardApiVersion"
     implementation project(':base')
     implementation "com.android.support:support-annotations:$supportLibVersion"
 }
diff --git a/nextword/build.gradle b/nextword/build.gradle
index 18f6cd5c7..2a044de16 100644
--- a/nextword/build.gradle
+++ b/nextword/build.gradle
@@ -17,7 +17,6 @@ android {
 }
 
 dependencies {
-    implementation "com.anysoftkeyboard.api:api:$AnySoftKeyboardApiVersion"
     implementation "com.android.support:support-core-utils:$supportLibVersion"
     implementation project(':base')
     implementation project(':prefs')
diff --git a/settings.gradle b/settings.gradle
index f1cad14e7..ac65c899b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,3 @@
+include ':external:api', ':external:packs'
 include ':app', ':base', ':base-rx', ':dictionaries', ':jnidictionaryv1', ':jnidictionaryv2', ':nextword', ':prefs', ':base-test', ':pixel', ':overlay'
+