Skip to content

Commit 6ca723c

Browse files
Merge branch 'java-8' into 'dev'
Require Java 8 and produce Java 8 byte code See merge request objectbox/objectbox-java!58
2 parents 9969a01 + 68fa40f commit 6ca723c

File tree

6 files changed

+19
-8
lines changed

6 files changed

+19
-8
lines changed

objectbox-java-api/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ apply plugin: 'java'
33
group = 'io.objectbox'
44
version= rootProject.version
55

6-
sourceCompatibility = 1.7
6+
sourceCompatibility = JavaVersion.VERSION_1_8
7+
targetCompatibility = JavaVersion.VERSION_1_8
78

89
task javadocJar(type: Jar, dependsOn: javadoc) {
910
classifier = 'javadoc'

objectbox-java/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ apply plugin: 'findbugs'
44
group = 'io.objectbox'
55
version= rootProject.version
66

7-
sourceCompatibility = '1.7'
7+
sourceCompatibility = JavaVersion.VERSION_1_8
8+
targetCompatibility = JavaVersion.VERSION_1_8
89

910
tasks.withType(FindBugs) {
1011
reports {

objectbox-kotlin/build.gradle

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,15 @@ buildscript {
2020
apply plugin: 'kotlin'
2121
apply plugin: 'org.jetbrains.dokka'
2222

23-
sourceCompatibility = 1.7
23+
sourceCompatibility = JavaVersion.VERSION_1_8
24+
targetCompatibility = JavaVersion.VERSION_1_8
25+
26+
// Produce Java 8 byte code, would default to Java 6.
27+
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
28+
kotlinOptions {
29+
jvmTarget = "1.8"
30+
}
31+
}
2432

2533
dokka {
2634
outputFormat = 'html'

objectbox-rxjava/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ apply plugin: 'java'
33
group = 'io.objectbox'
44
version= rootProject.version
55

6-
sourceCompatibility = 1.7
6+
sourceCompatibility = JavaVersion.VERSION_1_8
7+
targetCompatibility = JavaVersion.VERSION_1_8
78

89
dependencies {
910
compile project(':objectbox-java')

tests/objectbox-java-test/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apply plugin: 'java'
22

33
uploadArchives.enabled = false
44

5-
targetCompatibility = '1.8'
6-
sourceCompatibility = '1.8'
5+
sourceCompatibility = JavaVersion.VERSION_1_8
6+
targetCompatibility = JavaVersion.VERSION_1_8
77

88
repositories {
99
// Native lib might be deployed only in internal repo

tests/test-proguard/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apply plugin: 'java'
22

33
uploadArchives.enabled = false
44

5-
sourceCompatibility = 1.7
6-
targetCompatibility = 1.7
5+
sourceCompatibility = JavaVersion.VERSION_1_8
6+
targetCompatibility = JavaVersion.VERSION_1_8
77

88
repositories {
99
// Native lib might be deployed only in internal repo

0 commit comments

Comments
 (0)