From dad69556086fadb5544c712d6e728bcb25cc5aa8 Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Wed, 8 May 2024 07:27:18 +0700 Subject: [PATCH 1/5] chore(android/engine): Update dependencies --- android/KMEA/app/build.gradle | 14 +++++++------- .../com/keyman/engine/KeyboardPickerActivity.java | 1 + .../com/keyman/engine/ModelPickerActivity.java | 1 + android/KMEA/build.gradle | 4 ++-- .../KMEA/gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/android/KMEA/app/build.gradle b/android/KMEA/app/build.gradle index feed5dd66c7..c80a4fd66e9 100644 --- a/android/KMEA/app/build.gradle +++ b/android/KMEA/app/build.gradle @@ -55,17 +55,17 @@ android { dependencies { // 1.6.0-rc01 needed to resolve https://issuetracker.google.com/issues/238425626 - implementation 'androidx.appcompat:appcompat:1.6.0-rc01' // 1.5.1 + implementation 'androidx.appcompat:appcompat:1.6.1' // material:1.7.0 will need Gradle plugin 7.1.0+ - implementation 'com.google.android.material:material:1.6.0' - implementation 'commons-io:commons-io:2.6' - implementation 'io.sentry:sentry-android:6.9.2' - implementation 'androidx.preference:preference:1.2.0' + implementation 'com.google.android.material:material:1.12.0' + implementation 'commons-io:commons-io:2.13.0' + implementation 'io.sentry:sentry-android:7.8.0' + implementation 'androidx.preference:preference:1.2.1' // Robolectric testImplementation 'androidx.test:core:1.5.0' - testImplementation 'androidx.test.ext:junit:1.1.4' - testImplementation 'org.robolectric:robolectric:4.8.1' + testImplementation 'androidx.test.ext:junit:1.1.5' + testImplementation 'org.robolectric:robolectric:4.10.3' // Generate QR Codes implementation ('com.github.kenglxn.QRGen:android:3.0.1') { diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KeyboardPickerActivity.java b/android/KMEA/app/src/main/java/com/keyman/engine/KeyboardPickerActivity.java index 20d414aca8d..48295f7297b 100644 --- a/android/KMEA/app/src/main/java/com/keyman/engine/KeyboardPickerActivity.java +++ b/android/KMEA/app/src/main/java/com/keyman/engine/KeyboardPickerActivity.java @@ -290,6 +290,7 @@ public boolean onSupportNavigateUp() { @Override public void onBackPressed() { + super.onBackPressed(); finish(); } diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java b/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java index 8207c6e6d53..8b74e261a37 100644 --- a/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java +++ b/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java @@ -273,6 +273,7 @@ public boolean onSupportNavigateUp() { @Override public void onBackPressed() { + super.onBackPressed(); finish(); } diff --git a/android/KMEA/build.gradle b/android/KMEA/build.gradle index 8e6b39bd3e3..9aa2d0dcc7b 100644 --- a/android/KMEA/build.gradle +++ b/android/KMEA/build.gradle @@ -5,9 +5,9 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.0' + classpath 'com.android.tools.build:gradle:7.4.2' // io.sentry:sentry-android-gradle-plugin not available for library project - classpath 'io.sentry:sentry-android:6.9.2' + classpath 'io.sentry:sentry-android:7.8.0' classpath 'name.remal:gradle-plugins:1.5.0' } } diff --git a/android/KMEA/gradle/wrapper/gradle-wrapper.properties b/android/KMEA/gradle/wrapper/gradle-wrapper.properties index ae04661ee73..774fae87671 100644 --- a/android/KMEA/gradle/wrapper/gradle-wrapper.properties +++ b/android/KMEA/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 8bc0726f3264d825b625a90dd739e3b0873d53e4 Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Wed, 8 May 2024 07:48:50 +0700 Subject: [PATCH 2/5] chore(android/app): Update dependencies --- android/KMAPro/build.gradle | 4 ++-- .../KMAPro/gradle/wrapper/gradle-wrapper.properties | 2 +- android/KMAPro/kMAPro/build.gradle | 10 +++++----- .../java/com/tavultesoft/kmapro/BookmarksActivity.java | 1 + .../tavultesoft/kmapro/LanguageSettingsActivity.java | 1 + .../tavultesoft/kmapro/LanguagesSettingsActivity.java | 1 + .../java/com/tavultesoft/kmapro/PackageActivity.java | 1 + 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/android/KMAPro/build.gradle b/android/KMAPro/build.gradle index 7e49d3dc018..e22c4346f67 100644 --- a/android/KMAPro/build.gradle +++ b/android/KMAPro/build.gradle @@ -6,9 +6,9 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.0' + classpath 'com.android.tools.build:gradle:7.4.2' // sentry-android-gradle-plugin 2.1.5+ requires AGP 7.0 - classpath 'io.sentry:sentry-android-gradle-plugin:2.1.2' + classpath 'io.sentry:sentry-android-gradle-plugin:4.5.1' classpath 'name.remal:gradle-plugins:1.5.0' // From jcenter() which could be sunset in future diff --git a/android/KMAPro/gradle/wrapper/gradle-wrapper.properties b/android/KMAPro/gradle/wrapper/gradle-wrapper.properties index ae04661ee73..774fae87671 100644 --- a/android/KMAPro/gradle/wrapper/gradle-wrapper.properties +++ b/android/KMAPro/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/android/KMAPro/kMAPro/build.gradle b/android/KMAPro/kMAPro/build.gradle index 226e912fbe2..7eec37bcefa 100644 --- a/android/KMAPro/kMAPro/build.gradle +++ b/android/KMAPro/kMAPro/build.gradle @@ -2,7 +2,7 @@ plugins { id 'com.android.application' id 'io.sentry.android.gradle' // https://github.com/Triple-T/gradle-play-publisher/issues/947#issuecomment-843634852 - id 'com.github.triplet.play' version '3.8.1' apply false + id 'com.github.triplet.play' version '3.9.1' apply false id 'name.remal.default-plugins' } @@ -150,12 +150,12 @@ repositories { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.6.0-rc01' - implementation 'com.google.android.material:material:1.6.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.12.0' implementation 'com.stepstone.stepper:material-stepper:4.3.1' api(name: 'keyman-engine', ext: 'aar') - implementation 'io.sentry:sentry-android:6.9.2' - implementation 'androidx.preference:preference:1.2.0' + implementation 'io.sentry:sentry-android:7.8.0' + implementation 'androidx.preference:preference:1.2.1' implementation "com.android.installreferrer:installreferrer:2.2" // Add dependency for generating QR Codes diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/BookmarksActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/BookmarksActivity.java index 6c1e2eb90d7..c3faf91eeb4 100644 --- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/BookmarksActivity.java +++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/BookmarksActivity.java @@ -173,6 +173,7 @@ public void onClick(DialogInterface dialog, int which) { @Override public void onBackPressed() { + super.onBackPressed(); finish(); overridePendingTransition(0, android.R.anim.fade_out); } diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/LanguageSettingsActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/LanguageSettingsActivity.java index 004d096bac5..faa3e0efbf1 100644 --- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/LanguageSettingsActivity.java +++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/LanguageSettingsActivity.java @@ -292,6 +292,7 @@ public boolean onSupportNavigateUp() { @Override public void onBackPressed() { + super.onBackPressed(); finish(); } diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/LanguagesSettingsActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/LanguagesSettingsActivity.java index 8cc4ae8070c..7b621da4b7a 100644 --- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/LanguagesSettingsActivity.java +++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/LanguagesSettingsActivity.java @@ -152,6 +152,7 @@ public boolean onSupportNavigateUp() { @Override public void onBackPressed() { + super.onBackPressed(); finish(); } diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/PackageActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/PackageActivity.java index 5de23272f58..3806d5f4b87 100644 --- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/PackageActivity.java +++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/PackageActivity.java @@ -180,6 +180,7 @@ protected void onNewIntent(Intent intent) { @Override public void onBackPressed() { + super.onBackPressed(); finish(); overridePendingTransition(0, android.R.anim.fade_out); } From dd20ae30d09c20d26cbdfab45aaa641f700a17c4 Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Wed, 8 May 2024 07:58:58 +0700 Subject: [PATCH 3/5] chore(android/samples): Update dependencies --- android/README.md | 8 ++++---- android/Samples/KMSample1/app/build.gradle | 6 +++--- android/Samples/KMSample1/build.gradle | 2 +- .../KMSample1/gradle/wrapper/gradle-wrapper.properties | 2 +- android/Samples/KMSample2/app/build.gradle | 6 +++--- android/Samples/KMSample2/build.gradle | 2 +- .../KMSample2/gradle/wrapper/gradle-wrapper.properties | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/android/README.md b/android/README.md index 9b138ccfcea..2d1090574b1 100644 --- a/android/README.md +++ b/android/README.md @@ -135,7 +135,7 @@ Keyman Engine for Android library (**keyman-engine.aar**) is now ready to be imp 4. Check that the `android{}` object, includes the following: ```gradle android { - compileSdkVersion 33 + compileSdkVersion 34 // Don't compress kmp files so they can be copied via AssetManager aaptOptions { @@ -154,10 +154,10 @@ repositories { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.6.0-rc01' - implementation 'com.google.android.material:material:1.6.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.12.0' api (name:'keyman-engine', ext:'aar') - implementation 'androidx.preference:preference:1.2.0' + implementation 'androidx.preference:preference:1.2.1' // Include this if you want to have QR Codes displayed on Keyboard Info implementation ('com.github.kenglxn.QRGen:android:3.0.1') { diff --git a/android/Samples/KMSample1/app/build.gradle b/android/Samples/KMSample1/app/build.gradle index 4f5f778c356..51490c5ab2b 100644 --- a/android/Samples/KMSample1/app/build.gradle +++ b/android/Samples/KMSample1/app/build.gradle @@ -36,8 +36,8 @@ repositories { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.6.0-rc01' - implementation 'com.google.android.material:material:1.6.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.12.0' api(name: 'keyman-engine', ext: 'aar') - implementation 'androidx.preference:preference:1.2.0' + implementation 'androidx.preference:preference:1.2.1' } diff --git a/android/Samples/KMSample1/build.gradle b/android/Samples/KMSample1/build.gradle index d764f927ded..15824022e24 100644 --- a/android/Samples/KMSample1/build.gradle +++ b/android/Samples/KMSample1/build.gradle @@ -7,7 +7,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.0' + classpath 'com.android.tools.build:gradle:7.4.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/android/Samples/KMSample1/gradle/wrapper/gradle-wrapper.properties b/android/Samples/KMSample1/gradle/wrapper/gradle-wrapper.properties index 5da5e9c3736..98363a251c2 100644 --- a/android/Samples/KMSample1/gradle/wrapper/gradle-wrapper.properties +++ b/android/Samples/KMSample1/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip diff --git a/android/Samples/KMSample2/app/build.gradle b/android/Samples/KMSample2/app/build.gradle index 04e73b84057..71ab1dab034 100644 --- a/android/Samples/KMSample2/app/build.gradle +++ b/android/Samples/KMSample2/app/build.gradle @@ -35,8 +35,8 @@ repositories { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.6.0-rc01' - implementation 'com.google.android.material:material:1.6.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.12.0' api (name:'keyman-engine', ext:'aar') - implementation 'androidx.preference:preference:1.2.0' + implementation 'androidx.preference:preference:1.2.1' } diff --git a/android/Samples/KMSample2/build.gradle b/android/Samples/KMSample2/build.gradle index d764f927ded..15824022e24 100644 --- a/android/Samples/KMSample2/build.gradle +++ b/android/Samples/KMSample2/build.gradle @@ -7,7 +7,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.0' + classpath 'com.android.tools.build:gradle:7.4.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/android/Samples/KMSample2/gradle/wrapper/gradle-wrapper.properties b/android/Samples/KMSample2/gradle/wrapper/gradle-wrapper.properties index 820c8f35ed0..e63f95ce48b 100644 --- a/android/Samples/KMSample2/gradle/wrapper/gradle-wrapper.properties +++ b/android/Samples/KMSample2/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip From 0c955acb72eec5839e8b654fde3fe3433f74b48b Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Wed, 8 May 2024 08:22:47 +0700 Subject: [PATCH 4/5] chore(android/samples): Update dependencies --- android/Tests/KeyboardHarness/app/build.gradle | 10 +++------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- android/Tests/keycode/app/build.gradle | 11 +++++++---- android/Tests/keycode/build.gradle | 2 +- .../keycode/gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/android/Tests/KeyboardHarness/app/build.gradle b/android/Tests/KeyboardHarness/app/build.gradle index 61fe8a53fa5..5462622cfa3 100644 --- a/android/Tests/KeyboardHarness/app/build.gradle +++ b/android/Tests/KeyboardHarness/app/build.gradle @@ -13,10 +13,6 @@ android { aaptOptions { noCompress "kmp" } - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } defaultConfig { applicationId "com.keyman.android.tests.keyboardHarness" @@ -46,8 +42,8 @@ repositories { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.6.0-rc01' - implementation 'com.google.android.material:material:1.6.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.12.0' api (name:'keyman-engine', ext:'aar') - implementation 'androidx.preference:preference:1.2.0' + implementation 'androidx.preference:preference:1.2.1' } diff --git a/android/Tests/KeyboardHarness/gradle/wrapper/gradle-wrapper.properties b/android/Tests/KeyboardHarness/gradle/wrapper/gradle-wrapper.properties index 207d03ae62b..9a3c833761d 100644 --- a/android/Tests/KeyboardHarness/gradle/wrapper/gradle-wrapper.properties +++ b/android/Tests/KeyboardHarness/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip diff --git a/android/Tests/keycode/app/build.gradle b/android/Tests/keycode/app/build.gradle index 0db69e9da2b..ffba4c0cc4e 100644 --- a/android/Tests/keycode/app/build.gradle +++ b/android/Tests/keycode/app/build.gradle @@ -4,6 +4,7 @@ ext.rootPath = '../../../' apply from: "$rootPath/version.gradle" android { + compileSdk 34 namespace="com.keyman.android.tests.keycode" defaultConfig { @@ -26,9 +27,11 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.6.0-rc01' - implementation 'com.google.android.material:material:1.6.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.12.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'androidx.test:core:1.5.0' - testImplementation 'androidx.test.ext:junit:1.1.4' + testImplementation 'androidx.test.ext:junit:1.1.5' + testImplementation 'org.robolectric:robolectric:4.10.3' } diff --git a/android/Tests/keycode/build.gradle b/android/Tests/keycode/build.gradle index e67b0d3c179..47a85343bf9 100644 --- a/android/Tests/keycode/build.gradle +++ b/android/Tests/keycode/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.0' + classpath 'com.android.tools.build:gradle:7.4.2' // NOTE: Do not place your application dependencies here; they belong diff --git a/android/Tests/keycode/gradle/wrapper/gradle-wrapper.properties b/android/Tests/keycode/gradle/wrapper/gradle-wrapper.properties index 8fad3f5a98b..31cca491308 100644 --- a/android/Tests/keycode/gradle/wrapper/gradle-wrapper.properties +++ b/android/Tests/keycode/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 9f7357f1fc5314afbcd0d81a4107d39c881c1f8c Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Wed, 8 May 2024 08:31:18 +0700 Subject: [PATCH 5/5] chore(oem/fv/android): Update dependencies --- oem/firstvoices/android/app/build.gradle | 10 +++++----- .../keyboards/FVKeyboardSettingsActivity.java | 1 + .../com/firstvoices/keyboards/PackageActivity.java | 1 + oem/firstvoices/android/build.gradle | 4 ++-- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/oem/firstvoices/android/app/build.gradle b/oem/firstvoices/android/app/build.gradle index 43adc17265c..a0ccc015714 100644 --- a/oem/firstvoices/android/app/build.gradle +++ b/oem/firstvoices/android/app/build.gradle @@ -1,7 +1,7 @@ plugins { id 'com.android.application' id 'io.sentry.android.gradle' - id 'com.github.triplet.play' version '3.8.1' apply false + id 'com.github.triplet.play' version '3.9.1' apply false } ext.rootPath = '../../../../android' @@ -118,11 +118,11 @@ repositories { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.6.0-rc01' - implementation 'com.google.android.material:material:1.6.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.12.0' api(name: 'keyman-engine', ext: 'aar') - implementation 'io.sentry:sentry-android:6.9.2' - implementation 'androidx.preference:preference:1.2.0' + implementation 'io.sentry:sentry-android:7.8.0' + implementation 'androidx.preference:preference:1.2.1' } apply plugin: 'com.android.application' diff --git a/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVKeyboardSettingsActivity.java b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVKeyboardSettingsActivity.java index 73091153261..6aa7223602f 100644 --- a/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVKeyboardSettingsActivity.java +++ b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVKeyboardSettingsActivity.java @@ -405,6 +405,7 @@ public boolean onSupportNavigateUp() { @Override public void onBackPressed() { + super.onBackPressed(); finish(); } diff --git a/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/PackageActivity.java b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/PackageActivity.java index a34da65b417..21fc8765bff 100644 --- a/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/PackageActivity.java +++ b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/PackageActivity.java @@ -155,6 +155,7 @@ protected void onNewIntent(Intent intent) { @Override public void onBackPressed() { + super.onBackPressed(); finish(); overridePendingTransition(0, android.R.anim.fade_out); } diff --git a/oem/firstvoices/android/build.gradle b/oem/firstvoices/android/build.gradle index 50f3647165c..2a083bca94e 100644 --- a/oem/firstvoices/android/build.gradle +++ b/oem/firstvoices/android/build.gradle @@ -6,8 +6,8 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.4.0' - classpath 'io.sentry:sentry-android-gradle-plugin:2.1.2' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'io.sentry:sentry-android-gradle-plugin:4.5.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/oem/firstvoices/android/gradle/wrapper/gradle-wrapper.properties b/oem/firstvoices/android/gradle/wrapper/gradle-wrapper.properties index ae04661ee73..774fae87671 100644 --- a/oem/firstvoices/android/gradle/wrapper/gradle-wrapper.properties +++ b/oem/firstvoices/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists