summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMikael Magnusson <mikma@users.sourceforge.net>2022-11-09 17:32:06 +0100
committerMikael Magnusson <mikma@users.sourceforge.net>2022-11-10 21:51:45 +0100
commitce7875ca97bfc6ca94b4eb84c96da8d679821ae7 (patch)
treed405a862caa5d5a82d8bf404ab1dcb3c149d81fa
parent88fff94a9444b90d368c5f4ffb4db018c561a54e (diff)
fix protobuf related build error and clean up
-rw-r--r--build.gradle7
-rw-r--r--tunnel/build.gradle8
2 files changed, 7 insertions, 8 deletions
diff --git a/build.gradle b/build.gradle
index faa30833..b9f54f9c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,13 +24,6 @@ buildscript {
groupName = 'com.wireguard.android'
}
-
- dependencies {
- classpath "com.google.protobuf:protobuf-gradle-plugin:$protobufGradleVersion"
- // gradle plugin 4.0.1 required for fixing bug:
- // https://stackoverflow.com/questions/62168227/getting-source-and-destination-must-be-different-error-while-building-project/62223434#62223434
- //classpath "com.android.tools.build:gradle:$gradleVersion"
- }
}
task clean(type: Delete) {
diff --git a/tunnel/build.gradle b/tunnel/build.gradle
index bb7d5111..6297c75a 100644
--- a/tunnel/build.gradle
+++ b/tunnel/build.gradle
@@ -1,6 +1,12 @@
+buildscript {
+ dependencies {
+ classpath "com.google.protobuf:protobuf-gradle-plugin:$protobufGradleVersion"
+ }
+}
+
plugins {
id 'com.android.library'
- id 'com.google.protobuf'
+ id 'com.google.protobuf' version "$protobufGradleVersion"
}
version wireguardVersionName