Skip to content

Commit 25dc7b9

Browse files
committed
Only need to specify compatibility level in one place.
1 parent 98446dd commit 25dc7b9

File tree

7 files changed

+2
-19
lines changed

7 files changed

+2
-19
lines changed

gradle/convention.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ subprojects { project ->
55

66
apply plugin: 'java' // Plugin as major conventions
77

8-
sourceCompatibility = 1.6
8+
sourceCompatibility = JavaVersion.VERSION_1_6
9+
targetCompatibility = JavaVersion.VERSION_1_6
910

1011
// Restore status after Java plugin
1112
status = rootProject.status

rxjava-contrib/rxjava-apache-http/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
apply plugin: 'osgi'
22

3-
sourceCompatibility = JavaVersion.VERSION_1_6
4-
targetCompatibility = JavaVersion.VERSION_1_6
5-
63
dependencies {
74
compile project(':rxjava-core')
85
compile 'org.apache.httpcomponents:httpclient:4.3'

rxjava-contrib/rxjava-async-util/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
apply plugin: 'osgi'
22

3-
sourceCompatibility = JavaVersion.VERSION_1_6
4-
targetCompatibility = JavaVersion.VERSION_1_6
5-
63
dependencies {
74
compile project(':rxjava-core')
85
testCompile project(":rxjava-core").sourceSets.test.output

rxjava-contrib/rxjava-computation-expressions/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
apply plugin: 'osgi'
22

3-
sourceCompatibility = JavaVersion.VERSION_1_6
4-
targetCompatibility = JavaVersion.VERSION_1_6
5-
63
dependencies {
74
compile project(':rxjava-core')
85
testCompile 'junit:junit-dep:4.10'

rxjava-contrib/rxjava-string/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
apply plugin: 'osgi'
22

3-
sourceCompatibility = JavaVersion.VERSION_1_6
4-
targetCompatibility = JavaVersion.VERSION_1_6
5-
63
dependencies {
74
compile project(':rxjava-core')
85
testCompile project(":rxjava-core").sourceSets.test.output

rxjava-contrib/rxjava-swing/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
apply plugin: 'osgi'
22

3-
sourceCompatibility = JavaVersion.VERSION_1_6
4-
targetCompatibility = JavaVersion.VERSION_1_6
5-
63
dependencies {
74
compile project(':rxjava-core')
85
provided 'junit:junit-dep:4.10'

rxjava-core/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
apply plugin: 'maven'
22
apply plugin: 'osgi'
33

4-
sourceCompatibility = JavaVersion.VERSION_1_6
5-
targetCompatibility = JavaVersion.VERSION_1_6
6-
74
dependencies {
85
provided 'junit:junit-dep:4.10'
96
provided 'org.mockito:mockito-core:1.8.5'

0 commit comments

Comments
 (0)