diff --git a/android/KMAPro/build.gradle b/android/KMAPro/build.gradle index 051f23297c..82b157b0e5 100644 --- a/android/KMAPro/build.gradle +++ b/android/KMAPro/build.gradle @@ -7,7 +7,6 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.5.2' - classpath 'com.google.gms:google-services:4.3.2' classpath 'io.sentry:sentry-android-gradle-plugin:1.7.31' classpath 'name.remal:gradle-plugins:1.0.157' } diff --git a/android/KMAPro/kMAPro/build.gradle b/android/KMAPro/kMAPro/build.gradle index 500ed8e619..ff618d48f8 100644 --- a/android/KMAPro/kMAPro/build.gradle +++ b/android/KMAPro/kMAPro/build.gradle @@ -30,18 +30,6 @@ android { //dumpProperties(project) // Use this to dump all external properties for debugging TeamCity integration //println "===END DUMP===" - String env_services_json_file = System.getenv('services_json_file') - - if (env_services_json_file != null) { - env_services_json_file = String.valueOf(env_services_json_file) - println "Copying production google-services.json and using at kMAPro/" - copy { - from env_services_json_file - include '*.json' - into './' - } - } - // VERSION_CODE and VERSION_NAME from version.gradle versionCode VERSION_CODE as Integer versionName VERSION_NAME @@ -157,5 +145,3 @@ dependencies { println it.properties.entrySet()*.toString() .sort().toString().replaceAll(", ","\n") }*/ - -apply plugin: 'com.google.gms.google-services' diff --git a/android/KMAPro/kMAPro/src/debug/google-services.json b/android/KMAPro/kMAPro/src/debug/google-services.json deleted file mode 100644 index 84a3b5b1de..0000000000 --- a/android/KMAPro/kMAPro/src/debug/google-services.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "project_info": { - "project_number": "681178123610", - "firebase_url": "https://kmapro-ee779.firebaseio.com", - "project_id": "kmapro-ee779", - "storage_bucket": "kmapro-ee779.appspot.com" - }, - "client": [ - { - "client_info": { - "mobilesdk_app_id": "1:681178123610:android:df408a26aaaf1c9e", - "android_client_info": { - "package_name": "com.tavultesoft.kmapro.debug" - } - }, - "oauth_client": [ - { - "client_id": "681178123610-6j7phpt5jqh1mf44oup6lt8mooomd1tn.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyDFeaVAFdwkrVfUq01aVoBQQ2g5bOUfUUI" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "appinvite_service": { - "status": 1, - "other_platform_oauth_client": [] - }, - "ads_service": { - "status": 2 - } - } - } - ], - "configuration_version": "1" -} \ No newline at end of file diff --git a/android/README.md b/android/README.md index 655ad91ab9..f371b09f8d 100644 --- a/android/README.md +++ b/android/README.md @@ -154,7 +154,21 @@ Keyman Engine for Android library (**keyman-engine.aar**) is now ready to be imp b. If you choose to use your own build of the Keyman Engine, get the library from **android/Samples/KMSample1/app/libs/keyman-engine.aar** 2. Open your project in Android Studio. 3. Open **build.gradle** (Module: app) in "Gradle Scripts". -4. After the `android {}` object, include the following: +4. Check that the `android{}` object, includes the following: +```gradle +android { + compileSdkVersion 29 + + // Don't compress kmp files so they can be copied via AssetManager + aaptOptions { + noCompress "kmp" + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } +``` +5. After the `android {}` object, include the following: ````gradle repositories { flatDir { @@ -165,15 +179,10 @@ repositories { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.1.1' - implementation 'com.google.android.material:material:1.0.0' - api (name:'keyman-engine', ext:'aar') - implementation "com.google.firebase:firebase-analytics:17.2.1" - implementation "com.google.firebase:firebase-messaging:20.0.1" - implementation "com.google.firebase:firebase-crash:16.2.1" - implementation('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') { - transitive = true - } + implementation 'androidx.appcompat:appcompat:1.2.0-alpha03' + implementation 'com.google.android.material:material:1.1.0' + api(name: 'keyman-engine', ext: 'aar') + implementation 'io.sentry:sentry-android:2.0.1' // Include this if you want to have QR Codes displayed on Keyboard Info implementation ('com.github.kenglxn.QRGen:android:2.6.0') { diff --git a/oem/firstvoices/android/app/build.gradle b/oem/firstvoices/android/app/build.gradle index 236e72d0c5..685ccbf84a 100644 --- a/oem/firstvoices/android/app/build.gradle +++ b/oem/firstvoices/android/app/build.gradle @@ -20,18 +20,6 @@ android { minSdkVersion 21 targetSdkVersion 29 - String env_services_json_file = System.getenv('oem_firstvoices_services_json_file') - - if (env_services_json_file != null) { - env_services_json_file = String.valueOf(env_services_json_file) - println "Copying production google-services.json and using for firstvoices" - copy { - from env_services_json_file - include '*.json' - into './' - } - } - // VERSION_CODE and VERSION_NAME from version.gradle versionCode VERSION_CODE as Integer versionName VERSION_NAME @@ -125,5 +113,4 @@ dependencies { implementation 'androidx.preference:preference:1.1.0' } -apply plugin: 'com.google.gms.google-services' apply plugin: 'com.android.application' diff --git a/oem/firstvoices/android/app/google-services.json b/oem/firstvoices/android/app/google-services.json deleted file mode 100644 index 0ad39e534c..0000000000 --- a/oem/firstvoices/android/app/google-services.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "project_info": { - "project_number": "207806011344", - "firebase_url": "https://keyman-for-firstvoices.firebaseio.com", - "project_id": "keyman-for-firstvoices", - "storage_bucket": "keyman-for-firstvoices.appspot.com" - }, - "client": [ - { - "client_info": { - "mobilesdk_app_id": "1:207806011344:android:24fc6473e17e4354", - "android_client_info": { - "package_name": "com.firstvoices.keyboards" - } - }, - "oauth_client": [ - { - "client_id": "207806011344-a8hhvioppu699pgq5d4i9csa5ou04kbi.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyDrAfZLNVdRIq6aB4YkcEpkWuYwxcDhZsw" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "207806011344-a8hhvioppu699pgq5d4i9csa5ou04kbi.apps.googleusercontent.com", - "client_type": 3 - } - ] - } - } - } - ], - "configuration_version": "1" -} \ No newline at end of file