diff --git a/app/build.gradle b/app/build.gradle index d94952b..2fcd8da 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,6 +18,23 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + splits { + abi { + enable true + reset() + include "arm64-v8a", "armeabi-v7a", "x86", "x86_64" + universalApk true + } + } + + android.applicationVariants.configureEach { variant -> + variant.outputs.configureEach { output -> +// output.outputFileName = "${variant.getFlavorName()}-${variant.buildType.name}-v${versionCode}_${versionName}-${new Date().format('ddMMMyyyy_HH-mm')}-${output.getFilter(com.android.build.OutputFile.ABI)}.apk" + var abi_name = output.getFilter(com.android.build.OutputFile.ABI) ? output.getFilter(com.android.build.OutputFile.ABI): "Universal" + output.outputFileName = "Sayboard-${versionName}_${abi_name}.apk" + } + } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -44,7 +61,7 @@ android { protobuf { protoc { - artifact = "com.google.protobuf:protoc:3.21.7" + artifact = "com.google.protobuf:protoc:3.24.4" } plugins { grpc { @@ -66,7 +83,7 @@ protobuf { dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'net.java.dev.jna:jna:5.9.0@aar' - implementation group: 'com.alphacephei', name: 'vosk-android', version: '0.3.32' + implementation 'com.alphacephei:vosk-android:0.3.32' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'com.google.android.material:material:1.10.0' implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2' @@ -77,7 +94,6 @@ dependencies { implementation 'org.greenrobot:eventbus:3.3.1' implementation 'dev.gustavoavila:java-android-websocket-client:2.0.1' - implementation 'io.grpc:grpc-okhttp:1.52.0' implementation 'io.grpc:grpc-protobuf-lite:1.52.0' implementation 'io.grpc:grpc-stub:1.52.0' @@ -90,7 +106,7 @@ dependencies { implementation 'dev.patrickgold.jetpref:jetpref-datastore-ui:0.1.0-beta14' implementation 'dev.patrickgold.jetpref:jetpref-material-ui:0.1.0-beta14' - def composeBom = platform('androidx.compose:compose-bom:2023.08.00') + def composeBom = platform('androidx.compose:compose-bom:2023.10.00') implementation composeBom androidTestImplementation composeBom