@@ -42,19 +42,6 @@ allprojects {
4242
4343subprojects {
4444
45- apply plugin : ' java'
46- apply plugin : ' com.google.protobuf'
47-
48- sourceCompatibility = 1.7
49- targetCompatibility = 1.7
50-
51- // Set Java home to point to JDK7 in gradle.properties file.
52- //
53- // For Mac OS X, it looks like this:
54- //
55- // # suppress inspection "UnusedProperty"
56- // org.gradle.java.home=/Library/Java/JavaVirtualMachines/jdk1.7.0_80.jdk/Contents/Home/
57-
5845 project. ext {
5946 SRC_DIR = " $projectDir /src"
6047 GEN_DIR = " $projectDir /generated"
@@ -70,8 +57,23 @@ subprojects {
7057 TEST_ARTIFACTS_PLUGIN_PATH = ' ../gradle/plugins/test-artifacts.gradle'
7158 GEN_DESCRIPTOR_SET_PLUGIN_PATH = ' ../gradle/plugins/generate-descriptor-set.gradle'
7259 GRPC_PLUGIN_PATH = ' ../gradle/plugins/grpc.gradle'
60+ JACOCO_PLUGIN_PATH = ' ../gradle/plugins/jacoco.gradle'
7361 }
7462
63+ apply plugin : ' java'
64+ apply plugin : ' com.google.protobuf'
65+ apply from : JACOCO_PLUGIN_PATH
66+
67+ sourceCompatibility = 1.7
68+ targetCompatibility = 1.7
69+
70+ // Set Java home to point to JDK7 in gradle.properties file.
71+ //
72+ // For Mac OS X, it looks like this:
73+ //
74+ // # suppress inspection "UnusedProperty"
75+ // org.gradle.java.home=/Library/Java/JavaVirtualMachines/jdk1.7.0_80.jdk/Contents/Home/
76+
7577 repositories {
7678 mavenLocal()
7779 mavenCentral()
@@ -132,15 +134,6 @@ subprojects {
132134 classifier " test"
133135 }
134136
135- jacocoTestReport {
136- reports {
137- xml. enabled = true
138- html. enabled = true
139- }
140- }
141-
142- check. dependsOn jacocoTestReport
143-
144137 idea. module. iml {
145138 beforeMerged { final module ->
146139 module. dependencies. clear()
0 commit comments