diff --git a/build.gradle b/build.gradle index 7353af102..d50e79e2f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,14 @@ plugins { - id 'com.android.application' version '8.0.2' - id 'org.jetbrains.kotlin.android' version '1.8.20' - id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.20' - id 'com.android.library' version '8.0.2' apply false + id 'com.android.application' version '8.2.0' + id 'org.jetbrains.kotlin.android' version '1.9.20' + id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.20' + id 'com.android.library' version '8.2.0' apply false } android { namespace 'org.futo.inputmethod.latin' - compileSdk 33 + compileSdk 34 // Required if using classes in android.test.runner useLibrary 'android.test.runner' @@ -21,7 +21,7 @@ android { defaultConfig { minSdk 24 - targetSdk 33 + targetSdk 34 versionName "1.0" applicationId 'org.futo.inputmethod.latin' @@ -136,26 +136,26 @@ android { mlModelBinding true } composeOptions { - kotlinCompilerExtensionVersion '1.4.6' + kotlinCompilerExtensionVersion '1.5.5' } } dependencies { - implementation 'androidx.core:core-ktx:1.10.1' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1' - implementation 'androidx.lifecycle:lifecycle-runtime:2.6.1' - implementation 'androidx.lifecycle:lifecycle-runtime-compose:2.6.1' - implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1' - implementation 'androidx.activity:activity-compose:1.7.2' + implementation 'androidx.core:core-ktx:1.12.0' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2' + implementation 'androidx.lifecycle:lifecycle-runtime:2.6.2' + implementation 'androidx.lifecycle:lifecycle-runtime-compose:2.6.2' + implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2' + implementation 'androidx.activity:activity-compose:1.8.2' implementation platform('androidx.compose:compose-bom:2022.10.00') implementation 'androidx.compose.ui:ui' implementation 'androidx.compose.ui:ui-graphics' implementation 'androidx.compose.ui:ui-tooling-preview' implementation 'androidx.compose.material3:material3' - implementation 'com.google.android.material:material:1.9.0' + implementation 'com.google.android.material:material:1.11.0' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'androidx.navigation:navigation-compose:2.6.0' + implementation 'androidx.navigation:navigation-compose:2.7.6' implementation 'com.google.code.findbugs:jsr305:3.0.2' @@ -169,7 +169,7 @@ dependencies { implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1' implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.5.1' - def work_version = "2.8.1" + def work_version = "2.9.0" implementation "androidx.work:work-runtime-ktx:$work_version" implementation "androidx.work:work-runtime:$work_version" @@ -182,8 +182,8 @@ dependencies { androidTestImplementation "org.mockito:mockito-core:1.9.5" androidTestImplementation 'com.google.dexmaker:dexmaker:1.2' androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test:rules:1.1.1' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test:rules:1.5.0' androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0' androidTestImplementation 'androidx.annotation:annotation:1.0.0' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index be17982be..fd9222b3a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Apr 25 15:39:21 CDT 2023 +#Thu Jan 11 22:02:57 EET 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/voiceinput-shared/build.gradle b/voiceinput-shared/build.gradle index 998e7cae4..ee7921021 100644 --- a/voiceinput-shared/build.gradle +++ b/voiceinput-shared/build.gradle @@ -1,15 +1,15 @@ plugins { - id 'com.android.library' version '8.0.2' - id 'org.jetbrains.kotlin.android' version '1.8.20' + id 'com.android.library' version '8.2.0' + id 'org.jetbrains.kotlin.android' version '1.9.20' } android { namespace 'org.futo.voiceinput.shared' - compileSdk 33 + compileSdk 34 defaultConfig { minSdk 24 - targetSdk 33 + targetSdk 34 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" @@ -35,26 +35,26 @@ android { mlModelBinding true } composeOptions { - kotlinCompilerExtensionVersion '1.4.6' + kotlinCompilerExtensionVersion '1.5.5' } } dependencies { - implementation 'androidx.core:core-ktx:1.10.1' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1' - implementation 'androidx.lifecycle:lifecycle-runtime:2.6.1' - implementation 'androidx.lifecycle:lifecycle-runtime-compose:2.6.1' - implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1' - implementation 'androidx.activity:activity-compose:1.7.2' + implementation 'androidx.core:core-ktx:1.12.0' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2' + implementation 'androidx.lifecycle:lifecycle-runtime:2.6.2' + implementation 'androidx.lifecycle:lifecycle-runtime-compose:2.6.2' + implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2' + implementation 'androidx.activity:activity-compose:1.8.2' implementation platform('androidx.compose:compose-bom:2022.10.00') implementation 'androidx.compose.ui:ui' implementation 'androidx.compose.ui:ui-graphics' implementation 'androidx.compose.ui:ui-tooling-preview' implementation 'androidx.compose.material3:material3' - implementation 'com.google.android.material:material:1.9.0' + implementation 'com.google.android.material:material:1.11.0' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'androidx.navigation:navigation-compose:2.6.0' + implementation 'androidx.navigation:navigation-compose:2.7.6' implementation 'androidx.datastore:datastore-preferences:1.0.0' implementation(name:'vad-release', ext:'aar')