diff --git a/oem/firstvoices/android/app/build.gradle b/oem/firstvoices/android/app/build.gradle index 95bbcf2fa2..334ae2892d 100644 --- a/oem/firstvoices/android/app/build.gradle +++ b/oem/firstvoices/android/app/build.gradle @@ -11,6 +11,10 @@ android { compileSdk 34 namespace="com.firstvoices.keyboards" + buildFeatures { + buildConfig = true + } + defaultConfig { applicationId "com.firstvoices.keyboards" minSdkVersion 21 @@ -66,12 +70,6 @@ android { } } -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(11)) - } -} - // how to configure the sentry android gradle plugin task publishSentry { doLast { @@ -124,10 +122,10 @@ repositories { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'com.google.android.material:material:1.12.0' api(name: 'keyman-engine', ext: 'aar') - implementation 'io.sentry:sentry-android:6.9.2' + implementation 'io.sentry:sentry-android:7.8.0' implementation 'androidx.preference:preference:1.2.1' } diff --git a/oem/firstvoices/android/build.gradle b/oem/firstvoices/android/build.gradle index 4e544b7663..b4bbee2968 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.2' - classpath 'io.sentry:sentry-android-gradle-plugin:2.1.2' + classpath 'com.android.tools.build:gradle:8.9.2' + classpath 'io.sentry:sentry-android-gradle-plugin:4.6.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/oem/firstvoices/android/build.sh b/oem/firstvoices/android/build.sh index f7cb441f00..919c81572c 100755 --- a/oem/firstvoices/android/build.sh +++ b/oem/firstvoices/android/build.sh @@ -34,7 +34,7 @@ builder_parse "$@" if builder_is_debug_build; then builder_heading "### Debug config ####" CONFIG="debug" - BUILD_FLAGS="assembleDebug -x lint -x test" + BUILD_FLAGS="assembleDebug -x lintDebug -x testDebug" TEST_FLAGS="-x assembleDebug lintDebug testDebug" fi diff --git a/oem/firstvoices/android/gradle.properties b/oem/firstvoices/android/gradle.properties index c8e906dff4..6831edcea1 100644 --- a/oem/firstvoices/android/gradle.properties +++ b/oem/firstvoices/android/gradle.properties @@ -19,4 +19,8 @@ android.enableJetifier=true android.useAndroidX=true + +# AGP 8.0 generates R classes for resources defined in the current module only. +android.nonTransitiveRClass=false + org.gradle.jvmargs=-Xmx1024m diff --git a/oem/firstvoices/android/gradle/wrapper/gradle-wrapper.properties b/oem/firstvoices/android/gradle/wrapper/gradle-wrapper.properties index 3994438e22..d6e308a637 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.6.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists