Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 02:39:05 +01:00
Code Issues Projects Releases Wiki Activity

Remove gradle-apt-plugin since it isn't stricly needed anymore

Browse Source 
Reference: 6b2ee87fbf/README.md
This commit is contained in:
Torsten Grote
2018-10-31 16:01:57 -03:00
parent 3a15e47ddd
commit e1f31ad381
4 changed files with 51 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bramble-core/build.gradle
View File

@@ -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)

20
bramble-java/build.gradle
View File

@@ -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'

20
briar-core/build.gradle
View File

@@ -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
}
}

1
build.gradle
View File

@@ -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')
}