From e1f31ad381d65e396e478a23023eaedcd3ba4fcd Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 31 Oct 2018 16:01:57 -0300
Subject: [PATCH] Remove gradle-apt-plugin since it isn't stricly needed
anymore
Reference: https://github.com/tbroyer/gradle-apt-plugin/blob/6b2ee87fbf52ee09f70fb585d37e1d834da5ae3e/README.md
---
bramble-core/build.gradle | 20 +++++++++++++++++---
bramble-java/build.gradle | 20 +++++++++++++++++---
briar-core/build.gradle | 20 +++++++++++++++++---
build.gradle | 1 -
4 files changed, 51 insertions(+), 10 deletions(-)
diff --git a/bramble-core/build.gradle b/bramble-core/build.gradle
index 54444b2a22..db6dad04be 100644
--- a/bramble-core/build.gradle
+++ b/bramble-core/build.gradle
@@ -3,7 +3,6 @@ sourceCompatibility = 1.8
targetCompatibility = 1.8
apply plugin: 'ru.vyarus.animalsniffer'
-apply plugin: 'net.ltgt.apt'
apply plugin: 'idea'
apply plugin: 'witness'
apply from: 'witness.gradle'
@@ -17,7 +16,7 @@ dependencies {
implementation 'org.whispersystems:curve25519-java:0.5.0'
implementation 'org.briarproject:jtorctl:0.3'
- apt 'com.google.dagger:dagger-compiler:2.19'
+ annotationProcessor 'com.google.dagger:dagger-compiler:2.19'
testImplementation project(path: ':bramble-api', configuration: 'testOutput')
testImplementation 'org.hsqldb:hsqldb:2.3.5' // The last version that supports Java 1.6
@@ -28,11 +27,26 @@ dependencies {
testImplementation "org.hamcrest:hamcrest-library:1.3"
testImplementation "org.hamcrest:hamcrest-core:1.3"
- testApt 'com.google.dagger:dagger-compiler:2.19'
+ testAnnotationProcessor 'com.google.dagger:dagger-compiler:2.19'
signature 'org.codehaus.mojo.signature:java16:1.1@signature'
}
+sourceSets.configureEach { sourceSet ->
+ tasks.named(sourceSet.compileJavaTaskName).configure {
+ options.annotationProcessorGeneratedSourcesDirectory = file("$buildDir/generated/source/apt/${sourceSet.name}")
+ }
+}
+
+idea {
+ module {
+ sourceDirs += compileJava.options.annotationProcessorGeneratedSourcesDirectory
+ generatedSourceDirs += compileJava.options.annotationProcessorGeneratedSourcesDirectory
+ testSourceDirs += compileTestJava.options.annotationProcessorGeneratedSourcesDirectory
+ generatedSourceDirs += compileTestJava.options.annotationProcessorGeneratedSourcesDirectory
+ }
+}
+
// needed to make test output available to bramble-java
configurations {
testOutput.extendsFrom(testCompile)
diff --git a/bramble-java/build.gradle b/bramble-java/build.gradle
index 8825b1b590..91a9b9b889 100644
--- a/bramble-java/build.gradle
+++ b/bramble-java/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'java-library'
sourceCompatibility = 1.8
targetCompatibility = 1.8
-apply plugin: 'net.ltgt.apt'
apply plugin: 'idea'
apply plugin: 'witness'
apply from: 'witness.gradle'
@@ -19,7 +18,7 @@ dependencies {
tor 'org.briarproject:tor:0.3.4.8@zip'
tor 'org.briarproject:obfs4proxy:0.0.7@zip'
- apt 'com.google.dagger:dagger-compiler:2.19'
+ annotationProcessor 'com.google.dagger:dagger-compiler:2.19'
testImplementation project(path: ':bramble-api', configuration: 'testOutput')
testImplementation project(path: ':bramble-core', configuration: 'testOutput')
@@ -30,7 +29,22 @@ dependencies {
testImplementation "org.hamcrest:hamcrest-library:1.3"
testImplementation "org.hamcrest:hamcrest-core:1.3"
- testApt 'com.google.dagger:dagger-compiler:2.19'
+ testAnnotationProcessor 'com.google.dagger:dagger-compiler:2.19'
+}
+
+sourceSets.configureEach { sourceSet ->
+ tasks.named(sourceSet.compileJavaTaskName).configure {
+ options.annotationProcessorGeneratedSourcesDirectory = file("$buildDir/generated/source/apt/${sourceSet.name}")
+ }
+}
+
+idea {
+ module {
+ sourceDirs += compileJava.options.annotationProcessorGeneratedSourcesDirectory
+ generatedSourceDirs += compileJava.options.annotationProcessorGeneratedSourcesDirectory
+ testSourceDirs += compileTestJava.options.annotationProcessorGeneratedSourcesDirectory
+ generatedSourceDirs += compileTestJava.options.annotationProcessorGeneratedSourcesDirectory
+ }
}
def torBinariesDir = 'src/main/resources'
diff --git a/briar-core/build.gradle b/briar-core/build.gradle
index 2c6e0f19a1..b044b804d6 100644
--- a/briar-core/build.gradle
+++ b/briar-core/build.gradle
@@ -3,7 +3,6 @@ sourceCompatibility = 1.8
targetCompatibility = 1.8
apply plugin: 'ru.vyarus.animalsniffer'
-apply plugin: 'net.ltgt.apt'
apply plugin: 'idea'
apply plugin: 'witness'
apply from: 'witness.gradle'
@@ -15,7 +14,7 @@ dependencies {
implementation 'com.squareup.okhttp3:okhttp:3.10.0'
implementation 'org.jsoup:jsoup:1.11.3'
- apt 'com.google.dagger:dagger-compiler:2.19'
+ annotationProcessor 'com.google.dagger:dagger-compiler:2.19'
testImplementation project(path: ':bramble-core', configuration: 'default')
testImplementation project(path: ':bramble-core', configuration: 'testOutput')
@@ -28,7 +27,22 @@ dependencies {
testImplementation "org.hamcrest:hamcrest-library:1.3"
testImplementation "org.hamcrest:hamcrest-core:1.3"
- testApt 'com.google.dagger:dagger-compiler:2.19'
+ testAnnotationProcessor 'com.google.dagger:dagger-compiler:2.19'
signature 'org.codehaus.mojo.signature:java16:1.1@signature'
}
+
+sourceSets.configureEach { sourceSet ->
+ tasks.named(sourceSet.compileJavaTaskName).configure {
+ options.annotationProcessorGeneratedSourcesDirectory = file("$buildDir/generated/source/apt/${sourceSet.name}")
+ }
+}
+
+idea {
+ module {
+ sourceDirs += compileJava.options.annotationProcessorGeneratedSourcesDirectory
+ generatedSourceDirs += compileJava.options.annotationProcessorGeneratedSourcesDirectory
+ testSourceDirs += compileTestJava.options.annotationProcessorGeneratedSourcesDirectory
+ generatedSourceDirs += compileTestJava.options.annotationProcessorGeneratedSourcesDirectory
+ }
+}
diff --git a/build.gradle b/build.gradle
index b8c2de1aa6..877e866671 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,6 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
- classpath 'net.ltgt.gradle:gradle-apt-plugin:0.18'
classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.4.6'
classpath files('libs/gradle-witness.jar')
}
--
GitLab