mirror of
https://codeberg.org/Freeyourgadget/Gadgetbridge.git
synced 2025-01-25 16:15:55 +01:00
Use build tools version 31, bump protobuf-lite to 3.10
These changes where necessary to build on ARM64, hope it does not break anything protobuf-lite 3.0 said the architecture aarch64 is unsupported for the protobuf compiler, build tools 30 could not be installed via sdkmanager for an unknown reason.
This commit is contained in:
parent
2554435284
commit
127fec1013
@ -47,6 +47,7 @@ android {
|
|||||||
targetCompatibility JavaVersion.VERSION_1_7
|
targetCompatibility JavaVersion.VERSION_1_7
|
||||||
}
|
}
|
||||||
compileSdkVersion 29
|
compileSdkVersion 29
|
||||||
|
buildToolsVersion "31.0.0"
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "nodomain.freeyourgadget.gadgetbridge"
|
applicationId "nodomain.freeyourgadget.gadgetbridge"
|
||||||
@ -257,7 +258,7 @@ dependencies {
|
|||||||
implementation 'com.jaredrummler:colorpicker:1.0.2'
|
implementation 'com.jaredrummler:colorpicker:1.0.2'
|
||||||
// implementation project(":DaoCore")
|
// implementation project(":DaoCore")
|
||||||
implementation 'com.github.wax911:android-emojify:0.1.7'
|
implementation 'com.github.wax911:android-emojify:0.1.7'
|
||||||
implementation 'com.google.protobuf:protobuf-lite:3.0.1'
|
implementation 'com.google.protobuf:protobuf-javalite:3.10.0'
|
||||||
implementation "androidx.multidex:multidex:2.0.1"
|
implementation "androidx.multidex:multidex:2.0.1"
|
||||||
implementation 'com.android.volley:volley:1.2.1'
|
implementation 'com.android.volley:volley:1.2.1'
|
||||||
|
|
||||||
@ -348,22 +349,15 @@ tasks.withType(SpotBugsTask) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protobuf {
|
protobuf {
|
||||||
protoc {
|
protoc {
|
||||||
artifact = 'com.google.protobuf:protoc:3.0.0'
|
artifact = 'com.google.protobuf:protoc:3.10.0'
|
||||||
}
|
|
||||||
plugins {
|
|
||||||
javalite {
|
|
||||||
artifact = 'com.google.protobuf:protoc-gen-javalite:3.0.0'
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
generateProtoTasks {
|
generateProtoTasks {
|
||||||
all().each { task ->
|
all().each { task ->
|
||||||
task.builtins {
|
task.builtins {
|
||||||
remove java
|
java { option 'lite' }
|
||||||
}
|
|
||||||
task.plugins {
|
|
||||||
javalite { }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user