mirror of
https://codeberg.org/Freeyourgadget/Gadgetbridge
synced 2024-07-22 06:41:06 +02:00
Fix Android Studio generated source directories
This commit is contained in:
parent
962efd51b4
commit
26999c863b
|
@ -312,10 +312,10 @@ task pmd(type: Pmd) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// this is just for spotbugs to let the plugin create the task
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
main {
|
main {
|
||||||
main.java.srcDirs += "${protobuf.generatedFilesBaseDir}/main/javalite"
|
main.java.srcDirs += "${protobuf.generatedFilesBaseDir}"
|
||||||
|
main.java.srcDirs += "build/generated/source/buildConfig"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -343,9 +343,6 @@ tasks.withType(SpotBugsTask) {
|
||||||
}
|
}
|
||||||
|
|
||||||
task cleanGenerated(type: Delete) {
|
task cleanGenerated(type: Delete) {
|
||||||
delete fileTree('src/main/java/nodomain/freeyourgadget/gadgetbridge/proto') {
|
|
||||||
include '**/*.java'
|
|
||||||
}
|
|
||||||
delete fileTree('src/main/java/nodomain/freeyourgadget/gadgetbridge/entities') {
|
delete fileTree('src/main/java/nodomain/freeyourgadget/gadgetbridge/entities') {
|
||||||
include '**/*.java'
|
include '**/*.java'
|
||||||
exclude '**/Abstract*.java'
|
exclude '**/Abstract*.java'
|
||||||
|
@ -363,9 +360,6 @@ protobuf {
|
||||||
task.builtins {
|
task.builtins {
|
||||||
java {
|
java {
|
||||||
option 'lite'
|
option 'lite'
|
||||||
// Uncomment this to get Android Studio to recognize the generated files
|
|
||||||
// this makes it think that all src files are generated though...
|
|
||||||
//outputSubDir = '../../../../../src/main/java/'
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
# This folder will contain auto-generated protobuf classes
|
|
||||||
*.java
|
|
Loading…
Reference in New Issue
Block a user